Bladeren bron

Merge changes I5d938601,I51d31046,Icdfc4937,I8e472338,I332add8c,I1061a37c,I1b0adc1d,I5b80583d,I67c975b7,I4c738b20,I9ffc3376,I39e704ca,Iae311bf0 into wlan-cmn.driver.lnx.2.0-dev

* changes:
  qcacmn: Fix Datapath kernel checkpatch warnings in cdp_txrx_cmn.h
  qcacmn: Fix Datapath kernel checkpatch warnings in cdp_txrx_flow_ctrl_legacy.h
  qcacmn: Fix Datapath kernel checkpatch warnings in cdp_txrx_flow_ctrl_v2.h
  qcacmn: Fix Datapath kernel checkpatch warnings in cdp_txrx_bus.h
  qcacmn: Fix Datapath kernel checkpatch warnings in cdp_txrx_raw.h
  qcacmn: Fix Datapath kernel checkpatch warnings in cdp_txrx_stats.h
  qcacmn: Fix Datapath kernel checkpatch warnings in cdp_txrx_peer_ops.h
  qcacmn: Fix Datapath kernel checkpatch warnings in cdp_txrx_mon.h
  qcacmn: Fix Datapath kernel checkpatch warnings in cdp_txrx_wds.h
  qcacmn: Fix Datapath kernel checkpatch warnings in cdp_txrx_tx_delay.h
  qcacmn: Fix Datapath kernel checkpatch warnings in cdp_txrx_host_stats.h
  qcacmn: Fix Datapath kernel checkpatch warnings in cdp_txrx_misc.h
  qcacmn: Fix Datapath kernel checkpatch warnings in cdp_txrx_pflow.h
Linux Build Service Account 7 jaren geleden
bovenliggende
commit
5be8e86cc7

+ 1 - 1
dp/inc/cdp_txrx_bus.h

@@ -24,7 +24,7 @@
  * under proprietary terms before Copyright ownership was assigned
  * to the Linux Foundation.
  */
- /**
+/**
  * @file cdp_txrx_bus.h
  * @brief Define the host data path bus related functions
  */

+ 11 - 11
dp/inc/cdp_txrx_cmn.h

@@ -24,7 +24,7 @@
  * under proprietary terms before Copyright ownership was assigned
  * to the Linux Foundation.
  */
- /**
+/**
  * @file cdp_txrx_cmn.h
  * @brief Define the host data path converged API functions
  * called by the host control SW and the OS interface module
@@ -508,9 +508,9 @@ int cdp_txrx_stats(ol_txrx_soc_handle soc, struct cdp_vdev *vdev,
 }
 
 /**
-  * cdp_txrx_intr_attach(): function to attach and configure interrupt
-  * @soc: soc handle
-  */
+ * cdp_txrx_intr_attach(): function to attach and configure interrupt
+ * @soc: soc handle
+ */
 static inline QDF_STATUS cdp_txrx_intr_attach(ol_txrx_soc_handle soc)
 {
 	if (soc->ops->cmn_drv_ops->txrx_intr_attach)
@@ -520,9 +520,9 @@ static inline QDF_STATUS cdp_txrx_intr_attach(ol_txrx_soc_handle soc)
 }
 
 /**
-  * cdp_txrx_intr_detach(): function to detach interrupt
-  * @soc: soc handle
-  */
+ * cdp_txrx_intr_detach(): function to detach interrupt
+ * @soc: soc handle
+ */
 static inline void cdp_txrx_intr_detach(ol_txrx_soc_handle soc)
 {
 	if (soc->ops->cmn_drv_ops->txrx_intr_detach)
@@ -530,10 +530,10 @@ static inline void cdp_txrx_intr_detach(ol_txrx_soc_handle soc)
 }
 
 /**
-  * cdp_display_stats(): function to map to dump stats
-  * @soc: soc handle
-  * @value: statistics option
-  */
+ * cdp_display_stats(): function to map to dump stats
+ * @soc: soc handle
+ * @value: statistics option
+ */
 static inline QDF_STATUS
 cdp_display_stats(ol_txrx_soc_handle soc, uint16_t value)
 {

+ 1 - 1
dp/inc/cdp_txrx_flow_ctrl_legacy.h

@@ -24,7 +24,7 @@
  * under proprietary terms before Copyright ownership was assigned
  * to the Linux Foundation.
  */
- /**
+/**
  * @file cdp_txrx_flow_ctrl_legacy.h
  * @brief Define the host data path legacy flow control API
  * functions

+ 2 - 2
dp/inc/cdp_txrx_flow_ctrl_v2.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2017 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -24,7 +24,7 @@
  * under proprietary terms before Copyright ownership was assigned
  * to the Linux Foundation.
  */
- /**
+/**
  * @file cdp_txrx_flow_ctrl_v2.h
  * @brief Define the host data path flow control version 2 API
  * functions

+ 1 - 1
dp/inc/cdp_txrx_host_stats.h

@@ -24,7 +24,7 @@
  * under proprietary terms before Copyright ownership was assigned
  * to the Linux Foundation.
  */
- /**
+/**
  * @file cdp_txrx_host_stats.h
  * @brief Define the host data path stats API functions
  * called by the host control SW and the OS interface module

+ 1 - 2
dp/inc/cdp_txrx_misc.h

@@ -24,7 +24,7 @@
  * under proprietary terms before Copyright ownership was assigned
  * to the Linux Foundation.
  */
- /**
+/**
  * @file cdp_txrx_misc.h
  * @brief Define the host data path miscelleneous API functions
  * called by the host control SW and the OS interface module
@@ -461,4 +461,3 @@ static inline void cdp_pkt_log_con_service(ol_txrx_soc_handle soc,
 	return;
 }
 #endif /* _CDP_TXRX_MISC_H_ */
-

+ 1 - 1
dp/inc/cdp_txrx_mon.h

@@ -24,7 +24,7 @@
  * under proprietary terms before Copyright ownership was assigned
  * to the Linux Foundation.
  */
- /**
+/**
  * @file cdp_txrx_mon.h
  * @brief Define the monitor mode API functions
  * called by the host control SW and the OS interface module

+ 1 - 1
dp/inc/cdp_txrx_peer_ops.h

@@ -24,7 +24,7 @@
  * under proprietary terms before Copyright ownership was assigned
  * to the Linux Foundation.
  */
- /**
+/**
  * @file cdp_txrx_peer.h
  * @brief Define the host data path peer API functions
  * called by the host control SW and the OS interface module

+ 1 - 1
dp/inc/cdp_txrx_pflow.h

@@ -24,7 +24,7 @@
  * under proprietary terms before Copyright ownership was assigned
  * to the Linux Foundation.
  */
- /**
+/**
  * @file cdp_txrx_pflow.h
  * @brief Define the host data path peer flow API functions
  * called by the host control SW and the OS interface module

+ 1 - 1
dp/inc/cdp_txrx_raw.h

@@ -24,7 +24,7 @@
  * under proprietary terms before Copyright ownership was assigned
  * to the Linux Foundation.
  */
- /**
+/**
  * @file cdp_txrx_raw.h
  * @brief Define the host data path raw mode API functions
  * called by the host control SW and the OS interface module

+ 2 - 2
dp/inc/cdp_txrx_stats.h

@@ -24,7 +24,7 @@
  * under proprietary terms before Copyright ownership was assigned
  * to the Linux Foundation.
  */
- /**
+/**
  * @file cdp_txrx_stats.h
  * @brief Define the host data path statistics API functions
  * called by the host control SW and the OS interface module
@@ -43,7 +43,7 @@ cdp_clear_stats(ol_txrx_soc_handle soc, uint16_t bitmap)
 
 static inline int
 cdp_stats(ol_txrx_soc_handle soc, uint8_t vdev_id, char *buffer,
-		unsigned buf_len)
+		unsigned int buf_len)
 {
 	if (soc->ops->mob_stats_ops->stats)
 		return soc->ops->mob_stats_ops->stats(vdev_id, buffer, buf_len);

+ 1 - 1
dp/inc/cdp_txrx_tx_delay.h

@@ -24,7 +24,7 @@
  * under proprietary terms before Copyright ownership was assigned
  * to the Linux Foundation.
  */
- /**
+/**
  * @file cdp_txrx_tx_delay.h
  * @brief Define the host data path histogram API functions
  * called by the host control SW and the OS interface module

+ 1 - 1
dp/inc/cdp_txrx_wds.h

@@ -24,7 +24,7 @@
  * under proprietary terms before Copyright ownership was assigned
  * to the Linux Foundation.
  */
- /**
+/**
  * @file cdp_txrx_wds.h
  * @brief Define the host data path WDS API functions
  * called by the host control SW and the OS interface module