Merge remote-tracking branch 'origin/wlan-cld3.driver.lnx.1.1-dev' into wlan-cld3.driver.lnx.1.1-rel

Sync up wlan-cld3.driver.lnx.1.1-rel to SU#5.1.0.2 from SU#161 baseline

* origin/wlan-cld3.driver.lnx.1.1-dev: (292 commits)
  Release 5.1.0.2
  qcacld-3.0: Cleanup fastpath changes
  qcacld-3.0: add fastpath Rx support
  qcacld-3.0: Support multiple RX CEs for NAPI/LRO/FastPath
  Release 5.1.0.9GG
  qcacld-3.0: Support new build tree structure
  Release 5.1.0.9G
  qcacld-3.0: Increase Scan timeout for emulation platform
  qcacld-3.0: Re-indent function sap_select_channel
  qcacld-3.0: Re-indent lim_process_bt_amp_ap_mlm_del_sta_rsp
  qcacld-3.0: Re-indent lim_update_short_slot_time
  qcacld-3.0: Re-indent rrm_process_radio_measurement_request
  qcacld-3.0: Fix to set ptk_installed to true in 11R roaming
  qcacld-3.0: Fix Suspicious pointer dereference before NULL check
  qcacld-3.0: Re-indent rrm_process_beacon_report_xmit
  qcacld-3.0: Enable UAPSD only when device is in power save
  qcacld-3.0: Use pcl channel list for sap channel selection
  qcacld-3.0: Change name of routine is_roaming_offload_enabled
  qcacld-3.0: Enable compile time enable/disable for roaming
  qcacld-3.0: Isolate roaming related scan functionality
  ...

Change-Id: I2fa7b0376d8b10b77bc7b95f130fe9bab67067c9
CRs-Fixed: 987182 982728 992940 990987 972906 978014 961555 965800 991119 988325 978905 960105 989686 990954 967796 986079 865207 950762 983687 983914 954374 931451 930542 978660 961806 955178 944480 816177 985099 980863 985273 987178 981886 985763 983174 986060 987559 986202 986246 964291 983920 964262 967685 931250 979960 946161 966067 919617 766181 987362 968572 947086 975731 980689 980682 975903 974242 979523 856727 978800 962949 911696 953579 974918 865207 974299 975400 975352 966065 966054 966069 963651 961351 921117 960617 824222 968594 955557 970396 966580 975826 975414 938146 959683 978663 973773 973411 972184 924538 943078 971280 942260 973502 973006 973003 973463 972498 947880 972486 972479 973626 958729 922181 972007 970802 970794 969323 969307 970163 921373 971738 1000834 994638 982024 935300 969712 967765 976998 981188 981355 962169 962167 960961 962166 986480 978124 881090

1 files changed, 14 insertions, 13 deletions

diff --git a/uapi/linux/osapi_linux.h b/uapi/linux/osapi_linux.h
index 4fa05bbb57e9..21f8ff629ab1 100644
--- a/uapi/linux/osapi_linux.h
+++ b/uapi/linux/osapi_linux.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2015 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -72,11 +72,11 @@
 #define A_MEMCMP(addr1, addr2, len)     memcmp((addr1), (addr2), (len))
 
 #define A_LOGGER(mask, mod, args ...) \
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, ## args)
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, ## args)
 #define A_PRINTF(args ...) \
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, ## args)
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, ## args)
 #define A_PRINTF_LOG(args ...) \
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, ## args)
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, ## args)
 #define A_SNPRINTF(buf, len, args ...)   snprintf (buf, len, args)
 
 /*
@@ -132,13 +132,13 @@ typedef struct timer_list A_TIMER;
 extern unsigned int panic_on_assert;
 #define A_ASSERT(expr)	\
 	if (!(expr)) {	 \
-		printk(KERN_ALERT "Debug Assert Caught, File %s, Line: %d, Test:%s \n",__FILE__, __LINE__,# expr); \
+		printk(KERN_ALERT "Debug Assert Caught, File %s, Line: %d, Test:%s \n", __FILE__, __LINE__, # expr); \
 		if (panic_on_assert) panic(# expr);								  \
 	}
 #else
 #define A_ASSERT(expr)	\
 	if (!(expr)) {	 \
-		printk(KERN_ALERT "Debug Assert Caught, File %s, Line: %d, Test:%s \n",__FILE__, __LINE__,# expr); \
+		printk(KERN_ALERT "Debug Assert Caught, File %s, Line: %d, Test:%s \n", __FILE__, __LINE__, # expr); \
 	}
 #endif
 #else
@@ -170,13 +170,13 @@ typedef struct sk_buff_head A_NETBUF_QUEUE_T;
 	a_netbuf_push(bufPtr, len)
 #define A_NETBUF_PUT(bufPtr, len) \
 	a_netbuf_put(bufPtr, len)
-#define A_NETBUF_TRIM(bufPtr,len) \
+#define A_NETBUF_TRIM(bufPtr, len) \
 	a_netbuf_trim(bufPtr, len)
 #define A_NETBUF_PULL(bufPtr, len) \
 	a_netbuf_pull(bufPtr, len)
 #define A_NETBUF_HEADROOM(bufPtr) \
 	a_netbuf_headroom(bufPtr)
-#define A_NETBUF_SETLEN(bufPtr,len) \
+#define A_NETBUF_SETLEN(bufPtr, len) \
 	a_netbuf_setlen(bufPtr, len)
 
 /* Add data to end of a buffer  */
@@ -197,7 +197,7 @@ typedef struct sk_buff_head A_NETBUF_QUEUE_T;
 
 /* View data as "size" contiguous bytes of type "t" */
 #define A_NETBUF_VIEW_DATA(bufPtr, t, size) \
-	(t )( ((struct skbuf *)(bufPtr))->data)
+	(t)(((struct skbuf *)(bufPtr))->data)
 
 /* return the beginning of the headroom for the buffer */
 #define A_NETBUF_HEAD(bufPtr) \
@@ -231,21 +231,22 @@ void a_netbuf_queue_init(A_NETBUF_QUEUE_T *q);
 #include "ath_carr_pltfrm.h"
 #endif /* QCA_PARTNER_PLATFORM */
 
+#define SLOTS_PER_DATAPATH_TX 2
 #else                           /* __KERNEL__ */
 
 #ifdef __GNUC__
 #define __ATTRIB_PACK           __attribute__ ((packed))
 #define __ATTRIB_PRINTF         __attribute__ ((format (printf, 1, 2)))
 #define __ATTRIB_NORETURN       __attribute__ ((noreturn))
-#ifndef INLINE
-#define INLINE                  __inline__
+#ifndef inline
+#define inline                  __inline__
 #endif
 #else                           /* Not GCC */
 #define __ATTRIB_PACK
 #define __ATTRIB_PRINTF
 #define __ATTRIB_NORETURN
-#ifndef INLINE
-#define INLINE                  __inline
+#ifndef inline
+#define inline                  __inline
 #endif
 #endif /* End __GNUC__ */