From 6d760664eee7fc5dd0f3fe6c449049551ffa4cd3 Mon Sep 17 00:00:00 2001 From: Anurag Chouhan Date: Sat, 20 Feb 2016 16:05:43 +0530 Subject: qcacld-3.0: Add QDF types Replace CDF types with QDF types Change-Id: Idd6e65b148efb54f22d6951572957f1c6166465b CRs-Fixed: 981188 --- uapi/linux/osapi_linux.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'uapi/linux') diff --git a/uapi/linux/osapi_linux.h b/uapi/linux/osapi_linux.h index 4fa05bbb57e9..75c69b794e58 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) + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, ## args) #define A_PRINTF(args ...) \ - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, ## args) + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, ## args) #define A_PRINTF_LOG(args ...) \ - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, ## args) + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_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) \ -- cgit v1.2.3 From 2ed1fced922b3d372073149b3d2d7ef56d77f5c3 Mon Sep 17 00:00:00 2001 From: Anurag Chouhan Date: Mon, 22 Feb 2016 15:07:01 +0530 Subject: qcacld-3.0: Add QDF osdep changes Replace CDF osdep with QDF osdep Change-Id: Id2ba89c75df1fb8c4973a87219785353c3c2ff3c CRs-Fixed: 981188 --- uapi/linux/osapi_linux.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'uapi/linux') diff --git a/uapi/linux/osapi_linux.h b/uapi/linux/osapi_linux.h index 75c69b794e58..27f74f2f3662 100644 --- a/uapi/linux/osapi_linux.h +++ b/uapi/linux/osapi_linux.h @@ -237,15 +237,15 @@ void a_netbuf_queue_init(A_NETBUF_QUEUE_T *q); #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__ */ -- cgit v1.2.3 From b2dc16fefeed3acc78d721cd01c5891de43bd3b0 Mon Sep 17 00:00:00 2001 From: Anurag Chouhan Date: Thu, 25 Feb 2016 11:47:37 +0530 Subject: qcacld-3.0: Add QDF trace API's Replace CDF trace API's with QDF trace API's. Change-Id: I5b99dce73297f7de8f0755fa0b47dc3f84c78747 CRs-Fixed: 981188 --- uapi/linux/osapi_linux.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'uapi/linux') diff --git a/uapi/linux/osapi_linux.h b/uapi/linux/osapi_linux.h index 27f74f2f3662..a62b96d3f613 100644 --- a/uapi/linux/osapi_linux.h +++ b/uapi/linux/osapi_linux.h @@ -72,11 +72,11 @@ #define A_MEMCMP(addr1, addr2, len) memcmp((addr1), (addr2), (len)) #define A_LOGGER(mask, mod, args ...) \ - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, ## args) + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, ## args) #define A_PRINTF(args ...) \ - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, ## args) + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, ## args) #define A_PRINTF_LOG(args ...) \ - CDF_TRACE(QDF_MODULE_ID_QDF, 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) /* -- cgit v1.2.3 From 585178db34ffb93318da51f54c8cdf55d9cd0433 Mon Sep 17 00:00:00 2001 From: Manjunathappa Prakash Date: Thu, 14 Apr 2016 01:11:18 -0700 Subject: qcacld-3.0: Cleanup fastpath changes Do following cleanup on fastpath code changes: 1) Remove reaping of Tx HIF buffers in Rx handling, instead handle reaping in Tx fastpath itself. 2) In ce_per_engine_service_fast check for more Rx packets after packet processing. 3) Make stub functions as static inline for non-fastpath enabled case. Change-Id: If07c4344a424ce13b94128bf28931a24255b661a CRs-Fixed: 987182 --- uapi/linux/osapi_linux.h | 1 + 1 file changed, 1 insertion(+) (limited to 'uapi/linux') diff --git a/uapi/linux/osapi_linux.h b/uapi/linux/osapi_linux.h index a62b96d3f613..21f8ff629ab1 100644 --- a/uapi/linux/osapi_linux.h +++ b/uapi/linux/osapi_linux.h @@ -231,6 +231,7 @@ 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__ -- cgit v1.2.3