qcacld-3.0: Add QDF types

Replace CDF types with QDF types

Change-Id: Idd6e65b148efb54f22d6951572957f1c6166465b
CRs-Fixed: 981188

core/bmi/inc/ol_fw.h

@@ -29,7 +29,7 @@
 #define _OL_FW_H_
 
 #ifdef QCA_WIFI_FTM
-#include "cdf_types.h"
+#include "qdf_types.h"
 #endif
 #include "hif.h"
 

core/bmi/inc/ol_if_athvar.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -32,7 +32,7 @@
 #define _DEV_OL_ATH_ATHVAR_H
 
 #include <osapi_linux.h>
-#include "cdf_types.h"
+#include "qdf_types.h"
 #include "cdf_lock.h"
 #include "wmi_unified_api.h"
 #include "htc_api.h"

core/bmi/src/ol_fw.c

@@ -81,7 +81,7 @@ static int ol_check_fw_hash(const u8 *data, u32 fw_size, ATH_BIN_FILE file)
 		break;
 	case ATH_FIRMWARE_FILE:
 #ifdef QCA_WIFI_FTM
-		if (cds_get_conparam() == CDF_GLOBAL_FTM_MODE) {
+		if (cds_get_conparam() == QDF_GLOBAL_FTM_MODE) {
 			hash = fw_hash.utf;
 			break;
 		}
@@ -120,9 +120,9 @@ static int ol_check_fw_hash(const u8 *data, u32 fw_size, ATH_BIN_FILE file)
 
 	if (cdf_mem_compare(hash, digest, SHA256_DIGEST_SIZE) != 0) {
 		BMI_ERR("Hash Mismatch");
-		cdf_trace_hex_dump(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL,
+		cdf_trace_hex_dump(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL,
 				   digest, SHA256_DIGEST_SIZE);
-		cdf_trace_hex_dump(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL,
+		cdf_trace_hex_dump(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL,
 				   hash, SHA256_DIGEST_SIZE);
 		ret = QDF_STATUS_E_FAILURE;
 	}
@@ -179,7 +179,7 @@ __ol_transfer_bin_file(struct ol_context *ol_ctx, ATH_BIN_FILE file,
 			break;
 		}
 #ifdef QCA_WIFI_FTM
-		if (cds_get_conparam() == CDF_GLOBAL_FTM_MODE) {
+		if (cds_get_conparam() == QDF_GLOBAL_FTM_MODE) {
 #if defined(CONFIG_CNSS)
 			filename = bmi_ctx->fw_files.utf_file;
 #else
@@ -207,7 +207,7 @@ __ol_transfer_bin_file(struct ol_context *ol_ctx, ATH_BIN_FILE file,
 		return 0;
 	case ATH_BOARD_DATA_FILE:
 #ifdef QCA_WIFI_FTM
-		if (cds_get_conparam() == CDF_GLOBAL_FTM_MODE) {
+		if (cds_get_conparam() == QDF_GLOBAL_FTM_MODE) {
 #if defined(CONFIG_CNSS)
 			filename = bmi_ctx->fw_files.utf_board_data;
 #else
@@ -231,7 +231,7 @@ __ol_transfer_bin_file(struct ol_context *ol_ctx, ATH_BIN_FILE file,
 #endif
 		break;
 	case ATH_SETUP_FILE:
-		if (cds_get_conparam() != CDF_GLOBAL_FTM_MODE &&
+		if (cds_get_conparam() != QDF_GLOBAL_FTM_MODE &&
 		    !WLAN_IS_EPPING_ENABLED(cds_get_conparam())) {
 #ifdef CONFIG_CNSS
 			BMI_INFO("%s: no Setup file defined", __func__);

core/cdf/inc/cdf_lock.h

@@ -74,7 +74,7 @@ static inline void cdf_semaphore_init(cdf_semaphore_t *m)
  *
  * Return: None
  */
-static inline int cdf_semaphore_acquire(cdf_device_t osdev, cdf_semaphore_t *m)
+static inline int cdf_semaphore_acquire(qdf_device_t osdev, cdf_semaphore_t *m)
 {
 	return __cdf_semaphore_acquire(osdev, m);
 }
@@ -86,7 +86,7 @@ static inline int cdf_semaphore_acquire(cdf_device_t osdev, cdf_semaphore_t *m)
  * Return: None
  */
 static inline void
-cdf_semaphore_release(cdf_device_t osdev, cdf_semaphore_t *m)
+cdf_semaphore_release(qdf_device_t osdev, cdf_semaphore_t *m)
 {
 	__cdf_semaphore_release(osdev, m);
 }

core/cdf/inc/cdf_mc_timer.h

@@ -35,7 +35,7 @@
  */
 
 /* Include Files */
-#include <cdf_types.h>
+#include <qdf_types.h>
 #include <qdf_status.h>
 #include <cdf_lock.h>
 #include <i_cdf_mc_timer.h>
@@ -80,7 +80,7 @@ typedef struct cdf_mc_timer_s {
 	cdf_mc_timer_callback_t callback;
 	void *userData;
 	cdf_mutex_t lock;
-	CDF_TIMER_TYPE type;
+	QDF_TIMER_TYPE type;
 	CDF_TIMER_STATE state;
 } cdf_mc_timer_t;
 
@@ -158,12 +158,12 @@ CDF_TIMER_STATE cdf_mc_timer_get_current_state(cdf_mc_timer_t *pTimer);
 		__FILE__, __LINE__)
 
 QDF_STATUS cdf_mc_timer_init_debug(cdf_mc_timer_t *timer,
-				   CDF_TIMER_TYPE timerType,
+				   QDF_TIMER_TYPE timerType,
 				   cdf_mc_timer_callback_t callback,
 				   void *userData, char *fileName,
 				   uint32_t lineNum);
 #else
-QDF_STATUS cdf_mc_timer_init(cdf_mc_timer_t *timer, CDF_TIMER_TYPE timerType,
+QDF_STATUS cdf_mc_timer_init(cdf_mc_timer_t *timer, QDF_TIMER_TYPE timerType,
 			     cdf_mc_timer_callback_t callback,
 			     void *userData);
 #endif
@@ -237,7 +237,7 @@ QDF_STATUS cdf_mc_timer_stop(cdf_mc_timer_t *timer);
  *	The current system tick count (in 10msec intervals).  This
  *	function cannot fail.
  */
-v_TIME_t cdf_mc_timer_get_system_ticks(void);
+unsigned long cdf_mc_timer_get_system_ticks(void);
 
 /**
  * cdf_mc_timer_get_system_time() - Get the system time in milliseconds
@@ -248,6 +248,6 @@ v_TIME_t cdf_mc_timer_get_system_ticks(void);
  * Return:
  *	The current system time in milliseconds
  */
-v_TIME_t cdf_mc_timer_get_system_time(void);
+unsigned long cdf_mc_timer_get_system_time(void);
 
 #endif /* #if !defined __CDF_MC_TIMER_H */

core/cdf/inc/cdf_memory.h

@@ -35,7 +35,7 @@
  */
 
 /* Include Files */
-#include <cdf_types.h>
+#include <qdf_types.h>
 
 /**
  * struct cdf_mem_dma_page_t - Allocated dmaable page
@@ -46,7 +46,7 @@
 struct cdf_mem_dma_page_t {
 	char *page_v_addr_start;
 	char *page_v_addr_end;
-	cdf_dma_addr_t page_p_addr;
+	qdf_dma_addr_t page_p_addr;
 };
 
 /**
@@ -221,19 +221,19 @@ bool cdf_mem_compare(const void *pMemory1, const void *pMemory2,
 int32_t cdf_mem_compare2(const void *pMemory1, const void *pMemory2,
 			 uint32_t numBytes);
 
-void *cdf_os_mem_alloc_consistent(cdf_device_t osdev, cdf_size_t size,
-				  cdf_dma_addr_t *paddr,
-				  cdf_dma_context_t mctx);
+void *cdf_os_mem_alloc_consistent(qdf_device_t osdev, qdf_size_t size,
+				  qdf_dma_addr_t *paddr,
+				  qdf_dma_context_t mctx);
 void
-cdf_os_mem_free_consistent(cdf_device_t osdev,
-			   cdf_size_t size,
+cdf_os_mem_free_consistent(qdf_device_t osdev,
+			   qdf_size_t size,
 			   void *vaddr,
-			   cdf_dma_addr_t paddr, cdf_dma_context_t memctx);
+			   qdf_dma_addr_t paddr, qdf_dma_context_t memctx);
 
 void
-cdf_os_mem_dma_sync_single_for_device(cdf_device_t osdev,
-				      cdf_dma_addr_t bus_addr,
-				      cdf_size_t size,
+cdf_os_mem_dma_sync_single_for_device(qdf_device_t osdev,
+				      qdf_dma_addr_t bus_addr,
+				      qdf_size_t size,
 				      enum dma_data_direction direction);
 
 /**
@@ -248,15 +248,15 @@ static inline int32_t cdf_str_len(const char *str)
 	return strlen(str);
 }
 
-void cdf_mem_multi_pages_alloc(cdf_device_t osdev,
+void cdf_mem_multi_pages_alloc(qdf_device_t osdev,
 				struct cdf_mem_multi_page_t *pages,
 				size_t element_size,
 				uint16_t element_num,
-				cdf_dma_context_t memctxt,
+				qdf_dma_context_t memctxt,
 				bool cacheable);
 
-void cdf_mem_multi_pages_free(cdf_device_t osdev,
+void cdf_mem_multi_pages_free(qdf_device_t osdev,
 				struct cdf_mem_multi_page_t *pages,
-				cdf_dma_context_t memctxt,
+				qdf_dma_context_t memctxt,
 				bool cacheable);
 #endif /* __CDF_MEMORY_H */

core/cdf/inc/cdf_nbuf.h

@@ -33,7 +33,7 @@
 #ifndef _CDF_NBUF_H
 #define _CDF_NBUF_H
 #include <cdf_util.h>
-#include <cdf_types.h>
+#include <qdf_types.h>
 #include <cdf_net_types.h>
 #include <cdf_lock.h>
 #include <i_cdf_nbuf.h>
@@ -74,7 +74,7 @@ typedef __cdf_nbuf_t cdf_nbuf_t;
  * @cdf_dma_map_cb_t - Dma map callback prototype
  */
 typedef void (*cdf_dma_map_cb_t)(void *arg, cdf_nbuf_t buf,
-				 cdf_dma_map_t dmap);
+				 qdf_dma_map_t dmap);
 
 /**
  * @__CDF_NBUF_NULL - invalid handle
@@ -96,7 +96,7 @@ typedef __cdf_nbuf_queue_t cdf_nbuf_queue_t;
  * Return: Status of the operation
  */
 static inline QDF_STATUS
-cdf_nbuf_map(cdf_device_t osdev, cdf_nbuf_t buf, cdf_dma_dir_t dir)
+cdf_nbuf_map(qdf_device_t osdev, cdf_nbuf_t buf, qdf_dma_dir_t dir)
 {
 	return __cdf_nbuf_map(osdev, buf, dir);
 }
@@ -110,7 +110,7 @@ cdf_nbuf_map(cdf_device_t osdev, cdf_nbuf_t buf, cdf_dma_dir_t dir)
  * Return: none
  */
 static inline void
-cdf_nbuf_unmap(cdf_device_t osdev, cdf_nbuf_t buf, cdf_dma_dir_t dir)
+cdf_nbuf_unmap(qdf_device_t osdev, cdf_nbuf_t buf, qdf_dma_dir_t dir)
 {
 	__cdf_nbuf_unmap(osdev, buf, dir);
 }
@@ -124,7 +124,7 @@ cdf_nbuf_unmap(cdf_device_t osdev, cdf_nbuf_t buf, cdf_dma_dir_t dir)
  * Return: Status of the operation
  */
 static inline QDF_STATUS
-cdf_nbuf_map_single(cdf_device_t osdev, cdf_nbuf_t buf, cdf_dma_dir_t dir)
+cdf_nbuf_map_single(qdf_device_t osdev, cdf_nbuf_t buf, qdf_dma_dir_t dir)
 {
 	return __cdf_nbuf_map_single(osdev, buf, dir);
 }
@@ -138,7 +138,7 @@ cdf_nbuf_map_single(cdf_device_t osdev, cdf_nbuf_t buf, cdf_dma_dir_t dir)
  * Return: none
  */
 static inline void
-cdf_nbuf_unmap_single(cdf_device_t osdev, cdf_nbuf_t buf, cdf_dma_dir_t dir)
+cdf_nbuf_unmap_single(qdf_device_t osdev, cdf_nbuf_t buf, qdf_dma_dir_t dir)
 {
 	__cdf_nbuf_unmap_single(osdev, buf, dir);
 }
@@ -339,7 +339,7 @@ void cdf_net_buf_debug_release_skb(cdf_nbuf_t net_buf);
 #define cdf_nbuf_alloc(d, s, r, a, p)			\
 	cdf_nbuf_alloc_debug(d, s, r, a, p, __FILE__, __LINE__)
 static inline cdf_nbuf_t
-cdf_nbuf_alloc_debug(cdf_device_t osdev, cdf_size_t size, int reserve,
+cdf_nbuf_alloc_debug(qdf_device_t osdev, qdf_size_t size, int reserve,
 		     int align, int prio, uint8_t *file_name,
 		     uint32_t line_num)
 {
@@ -392,8 +392,8 @@ static inline void cdf_net_buf_debug_release_skb(cdf_nbuf_t net_buf)
  * Return: new cdf_nbuf instance or NULL if there's not enough memory.
  */
 static inline cdf_nbuf_t
-cdf_nbuf_alloc(cdf_device_t osdev,
-	       cdf_size_t size, int reserve, int align, int prio)
+cdf_nbuf_alloc(qdf_device_t osdev,
+	       qdf_size_t size, int reserve, int align, int prio)
 {
 	return __cdf_nbuf_alloc(osdev, size, reserve, align, prio);
 }
@@ -533,7 +533,7 @@ static inline uint32_t cdf_nbuf_tailroom(cdf_nbuf_t buf)
  * Return: New data pointer of this buf after data has been pushed,
  *	   or NULL if there is not enough room in this buf.
  */
-static inline uint8_t *cdf_nbuf_push_head(cdf_nbuf_t buf, cdf_size_t size)
+static inline uint8_t *cdf_nbuf_push_head(cdf_nbuf_t buf, qdf_size_t size)
 {
 	return __cdf_nbuf_push_head(buf, size);
 }
@@ -546,7 +546,7 @@ static inline uint8_t *cdf_nbuf_push_head(cdf_nbuf_t buf, cdf_size_t size)
  * Return: Data pointer of this buf where new data has to be
  *	   put, or NULL if there is not enough room in this buf.
  */
-static inline uint8_t *cdf_nbuf_put_tail(cdf_nbuf_t buf, cdf_size_t size)
+static inline uint8_t *cdf_nbuf_put_tail(cdf_nbuf_t buf, qdf_size_t size)
 {
 	return __cdf_nbuf_put_tail(buf, size);
 }
@@ -559,7 +559,7 @@ static inline uint8_t *cdf_nbuf_put_tail(cdf_nbuf_t buf, cdf_size_t size)
  * Return: New data pointer of this buf after data has been popped,
  *	   or NULL if there is not sufficient data to pull.
  */
-static inline uint8_t *cdf_nbuf_pull_head(cdf_nbuf_t buf, cdf_size_t size)
+static inline uint8_t *cdf_nbuf_pull_head(cdf_nbuf_t buf, qdf_size_t size)
 {
 	return __cdf_nbuf_pull_head(buf, size);
 }
@@ -571,7 +571,7 @@ static inline uint8_t *cdf_nbuf_pull_head(cdf_nbuf_t buf, cdf_size_t size)
  *
  * Return: none
  */
-static inline void cdf_nbuf_trim_tail(cdf_nbuf_t buf, cdf_size_t size)
+static inline void cdf_nbuf_trim_tail(cdf_nbuf_t buf, qdf_size_t size)
 {
 	__cdf_nbuf_trim_tail(buf, size);
 }
@@ -582,7 +582,7 @@ static inline void cdf_nbuf_trim_tail(cdf_nbuf_t buf, cdf_size_t size)
  *
  * Return: total length of this buf.
  */
-static inline cdf_size_t cdf_nbuf_len(cdf_nbuf_t buf)
+static inline qdf_size_t cdf_nbuf_len(cdf_nbuf_t buf)
 {
 	return __cdf_nbuf_len(buf);
 }
@@ -606,7 +606,7 @@ static inline void cdf_nbuf_set_pktlen(cdf_nbuf_t buf, uint32_t len)
  *
  * Return: none
  */
-static inline void cdf_nbuf_reserve(cdf_nbuf_t buf, cdf_size_t size)
+static inline void cdf_nbuf_reserve(cdf_nbuf_t buf, qdf_size_t size)
 {
 	__cdf_nbuf_reserve(buf, size);
 }
@@ -818,7 +818,7 @@ static inline cdf_nbuf_t cdf_nbuf_next_ext(cdf_nbuf_t buf)
  */
 static inline void
 cdf_nbuf_append_ext_list(cdf_nbuf_t head_buf, cdf_nbuf_t ext_list,
-			 cdf_size_t ext_len)
+			 qdf_size_t ext_len)
 {
 	__cdf_nbuf_append_ext_list(head_buf, ext_list, ext_len);
 }
@@ -1033,8 +1033,8 @@ static inline bool cdf_nbuf_is_tso(cdf_nbuf_t nbuf)
  *
  * Return: number of TSO segments
  */
-static inline uint32_t cdf_nbuf_get_tso_info(cdf_device_t osdev,
-		 cdf_nbuf_t nbuf, struct cdf_tso_info_t *tso_info)
+static inline uint32_t cdf_nbuf_get_tso_info(qdf_device_t osdev,
+		 cdf_nbuf_t nbuf, struct qdf_tso_info_t *tso_info)
 {
 	return __cdf_nbuf_get_tso_info(osdev, nbuf, tso_info);
 }

core/cdf/inc/cdf_net_types.h

@@ -33,7 +33,7 @@
 #ifndef _CDF_NET_TYPES_H
 #define _CDF_NET_TYPES_H
 
-#include <cdf_types.h>          /* uint8_t, etc. */
+#include <qdf_types.h>          /* uint8_t, etc. */
 
 #define ADF_NET_MAC_ADDR_MAX_LEN 6
 #define ADF_NET_IF_NAME_SIZE    64

core/cdf/inc/cdf_trace.h

@@ -38,12 +38,12 @@
  */
 
 /* Include Files */
-#include  <cdf_types.h>         /* For CDF_MODULE_ID... */
+#include  <qdf_types.h>         /* For QDF_MODULE_ID... */
 #include  <stdarg.h>            /* For va_list... */
 #include  <qdf_status.h>
 #include  <cdf_nbuf.h>
 #include  <cds_packet.h>
-#include  <i_cdf_types.h>
+#include  <i_qdf_types.h>
 
 /* Type declarations */
 
@@ -240,7 +240,7 @@ struct s_cdf_dp_trace_data {
  *
  * Return:  nothing
  */
-void cdf_trace_set_level(CDF_MODULE_ID module, CDF_TRACE_LEVEL level);
+void cdf_trace_set_level(QDF_MODULE_ID module, CDF_TRACE_LEVEL level);
 
 /**
  * cdf_trace_get_level() - get the trace level
@@ -259,11 +259,11 @@ void cdf_trace_set_level(CDF_MODULE_ID module, CDF_TRACE_LEVEL level);
  *  false - the specified trace level for the specified module is OFF
  *  true - the specified trace level for the specified module is ON
  */
-bool cdf_trace_get_level(CDF_MODULE_ID module, CDF_TRACE_LEVEL level);
+bool cdf_trace_get_level(QDF_MODULE_ID module, CDF_TRACE_LEVEL level);
 
 typedef void (*tp_cdf_trace_cb)(void *pMac, tp_cdf_trace_record, uint16_t);
 void cdf_trace(uint8_t module, uint8_t code, uint16_t session, uint32_t data);
-void cdf_trace_register(CDF_MODULE_ID, tp_cdf_trace_cb);
+void cdf_trace_register(QDF_MODULE_ID, tp_cdf_trace_cb);
 QDF_STATUS cdf_trace_spin_lock_init(void);
 void cdf_trace_init(void);
 void cdf_trace_enable(uint32_t, uint8_t enable);

core/cdf/inc/cdf_types.h

@@ -1,521 +0,0 @@
-/*
- * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved.
- *
- * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
- *
- *
- * Permission to use, copy, modify, and/or distribute this software for
- * any purpose with or without fee is hereby granted, provided that the
- * above copyright notice and this permission notice appear in all
- * copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
- * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*
- * This file was originally distributed by Qualcomm Atheros, Inc.
- * under proprietary terms before Copyright ownership was assigned
- * to the Linux Foundation.
- */
-
-#if !defined(__CDF_TYPES_H)
-#define __CDF_TYPES_H
-/**
- * DOC: cdf_types.h
- *
- * Connectivity driver framework (CDF) basic type definitions
- */
-
-/* Include Files */
-#include "i_cdf_types.h"
-#include <string.h>
-
-/* Preprocessor definitions and constants */
-
-/**
- * CDF_MAX - get maximum of two values
- * @_x: 1st arguement
- * @_y: 2nd arguement
- */
-#define CDF_MAX(_x, _y) (((_x) > (_y)) ? (_x) : (_y))
-
-/**
- * CDF_MIN - get minimum of two values
- * @_x: 1st arguement
- * @_y: 2nd arguement
- */
-#define CDF_MIN(_x, _y) (((_x) < (_y)) ? (_x) : (_y))
-
-/**
- * CDF_SWAP_U16 - swap input u16 value
- * @_x: variable to swap
- */
-#define CDF_SWAP_U16(_x) \
-	((((_x) << 8) & 0xFF00) | (((_x) >> 8) & 0x00FF))
-
-/**
- * CDF_SWAP_U32 - swap input u32 value
- * @_x: variable to swap
- */
-#define CDF_SWAP_U32(_x) \
-	(((((_x) << 24) & 0xFF000000) | (((_x) >> 24) & 0x000000FF)) | \
-	 ((((_x) << 8) & 0x00FF0000) | (((_x) >> 8) & 0x0000FF00)))
-
-#define CDF_TICKS_PER_SECOND        (1000)
-
-/**
- * CDF_ARRAY_SIZE - get array size
- * @_arr: array variable name
- */
-#define CDF_ARRAY_SIZE(_arr) (sizeof(_arr) / sizeof((_arr)[0]))
-
-/* endian operations for Big Endian and Small Endian modes */
-#ifdef ANI_LITTLE_BYTE_ENDIAN
-
-#define cdf_be16_to_cpu(_x) CDF_SWAP_U16(_x)
-
-#endif
-
-#ifdef ANI_BIG_BYTE_ENDIAN
-
-#define cdf_be16_to_cpu(_x) (_x)
-
-#endif
-
-#ifndef __ahdecl
-#ifdef __i386__
-#define __ahdecl   __attribute__((regparm(0)))
-#else
-#define __ahdecl
-#endif
-#endif
-
-#define CDF_OS_MAX_SCATTER  __CDF_OS_MAX_SCATTER
-
-/**
- * @brief denotes structure is packed.
- */
-#define cdf_packed __cdf_packed
-
-/**
- * typedef cdf_handle_t - handles opaque to each other
- */
-typedef void *cdf_handle_t;
-
-/**
- * typedef cdf_device_t - Platform/bus generic handle.
- *			  Used for bus specific functions.
- */
-typedef __cdf_device_t cdf_device_t;
-
-/**
- * typedef cdf_size_t - size of an object
- */
-typedef __cdf_size_t cdf_size_t;
-
-/**
- * typedef cdf_dma_map_t - DMA mapping object.
- */
-typedef __cdf_dma_map_t cdf_dma_map_t;
-
-/**
- * typedef cdf_dma_addr_t - DMA address.
- */
-typedef __cdf_dma_addr_t cdf_dma_addr_t;
-
-/**
- * tyepdef cdf_dma_context_t - DMA context.
- */
-typedef __cdf_dma_context_t cdf_dma_context_t;
-
-
-#define cdf_iomem_t   __cdf_iomem_t;
-/**
- * typedef enum CDF_TIMER_TYPE - CDF timer type
- * @CDF_TIMER_TYPE_SW: Deferrable SW timer it will not cause CPU to wake up
- *			on expiry
- * @CDF_TIMER_TYPE_WAKE_APPS:  Non deferrable timer which will cause CPU to
- *				wake up on expiry
- */
-typedef enum {
-	CDF_TIMER_TYPE_SW,
-	CDF_TIMER_TYPE_WAKE_APPS
-} CDF_TIMER_TYPE;
-
-/**
- * tyepdef cdf_resource_type_t - hw resources
- *
- * @CDF_RESOURCE_TYPE_MEM: memory resource
- * @CDF_RESOURCE_TYPE_IO: io resource
- *
- * Define the hw resources the OS has allocated for the device
- * Note that start defines a mapped area.
- */
-typedef enum {
-	CDF_RESOURCE_TYPE_MEM,
-	CDF_RESOURCE_TYPE_IO,
-} cdf_resource_type_t;
-
-/**
- * tyepdef cdf_resource_t - representation of a h/w resource.
- *
- * @start: start
- * @end: end
- * @type: resource type
- */
-typedef struct {
-	uint64_t start;
-	uint64_t end;
-	cdf_resource_type_t type;
-} cdf_resource_t;
-
-/**
- * typedef cdf_dma_dir_t - DMA directions
- *
- * @CDF_DMA_BIDIRECTIONAL: bidirectional data
- * @CDF_DMA_TO_DEVICE: data going from device to memory
- * @CDF_DMA_FROM_DEVICE: data going from memory to device
- */
-typedef enum {
-	CDF_DMA_BIDIRECTIONAL = __CDF_DMA_BIDIRECTIONAL,
-	CDF_DMA_TO_DEVICE = __CDF_DMA_TO_DEVICE,
-	CDF_DMA_FROM_DEVICE = __CDF_DMA_FROM_DEVICE,
-} cdf_dma_dir_t;
-
-/* work queue(kernel thread)/DPC function callback */
-typedef void (*cdf_defer_fn_t)(void *);
-
-/* Prototype of the critical region function that is to be
- * executed with spinlock held and interrupt disalbed
- */
-typedef bool (*cdf_irqlocked_func_t)(void *);
-
-/* Prototype of timer function */
-typedef void (*cdf_softirq_timer_func_t)(void *);
-
-#define cdf_offsetof(type, field) offsetof(type, field)
-
-/**
- * typedef CDF_MODULE_ID - CDF Module IDs
- *
- * @CDF_MODULE_ID_TLSHIM: TLSHIM module ID
- * @CDF_MODULE_ID_WMI: WMI module ID
- * @CDF_MODULE_ID_HTT: HTT module ID
- * @CDF_MODULE_ID_RSV4: Reserved
- * @CDF_MODULE_ID_HDD: HDD module ID
- * @CDF_MODULE_ID_SME: SME module ID
- * @CDF_MODULE_ID_PE: PE module ID
- * @CDF_MODULE_ID_WMA: WMA module ID
- * @CDF_MODULE_ID_SYS: SYS module ID
- * @CDF_MODULE_ID_CDF: CDF module ID
- * @CDF_MODULE_ID_SAP: SAP module ID
- * @CDF_MODULE_ID_HDD_SOFTAP: HDD SAP module ID
- * @CDF_MODULE_ID_HDD_DATA: HDD DATA module ID
- * @CDF_MODULE_ID_HDD_SAP_DATA: HDD SAP DATA module ID
- * @CDF_MODULE_ID_HIF: HIF module ID
- * @CDF_MODULE_ID_HTC: HTC module ID
- * @CDF_MODULE_ID_TXRX: TXRX module ID
- * @CDF_MODULE_ID_CDF_DEVICE: CDF DEVICE module ID
- * @CDF_MODULE_ID_CFG: CFG module ID
- * @CDF_MODULE_ID_BMI: BMI module ID
- * @CDF_MODULE_ID_EPPING: EPPING module ID
- * @CDF_MODULE_ID_MAX: Max place holder module ID
- *
- * These are generic IDs that identify the various modules in the software
- * system
- * 0 is unused for historical purposes
- * 3 & 4 are unused for historical purposes
- */
-typedef enum {
-	CDF_MODULE_ID_TLSHIM = 1,
-	CDF_MODULE_ID_WMI = 2,
-	CDF_MODULE_ID_HTT = 3,
-	CDF_MODULE_ID_RSV4 = 4,
-	CDF_MODULE_ID_HDD = 5,
-	CDF_MODULE_ID_SME = 6,
-	CDF_MODULE_ID_PE = 7,
-	CDF_MODULE_ID_WMA = 8,
-	CDF_MODULE_ID_SYS = 9,
-	CDF_MODULE_ID_CDF = 10,
-	CDF_MODULE_ID_SAP = 11,
-	CDF_MODULE_ID_HDD_SOFTAP = 12,
-	CDF_MODULE_ID_HDD_DATA = 14,
-	CDF_MODULE_ID_HDD_SAP_DATA = 15,
-
-	CDF_MODULE_ID_HIF = 16,
-	CDF_MODULE_ID_HTC = 17,
-	CDF_MODULE_ID_TXRX = 18,
-	CDF_MODULE_ID_CDF_DEVICE = 19,
-	CDF_MODULE_ID_CFG = 20,
-	CDF_MODULE_ID_BMI = 21,
-	CDF_MODULE_ID_EPPING = 22,
-
-	CDF_MODULE_ID_MAX
-} CDF_MODULE_ID;
-
-#define cdf_print(args...) \
-	CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, ## args)
-#define cdf_vprint        __cdf_vprint
-#define cdf_snprint       __cdf_snprint
-
-/**
- * enum tCDF_ADAPTER_MODE - adapter role.
- *
- * @CDF_STA_MODE: STA mode
- * @CDF_SAP_MODE: SAP mode
- * @CDF_P2P_CLIENT_MODE: P2P client mode
- * @CDF_P2P_GO_MODE: P2P GO mode
- * @CDF_FTM_MODE: FTM mode
- * @CDF_IBSS_MODE: IBSS mode
- * @CDF_P2P_DEVICE_MODE: P2P device mode
- * @CDF_EPPING_MODE: EPPING device mode
- * @CDF_OCB_MODE: OCB device mode
- * @CDF_MAX_NO_OF_MODE: Max place holder
- *
- * These are generic IDs that identify the various roles
- * in the software system
- */
-enum tCDF_ADAPTER_MODE {
-	CDF_STA_MODE = 0,
-	CDF_SAP_MODE = 1,
-	CDF_P2P_CLIENT_MODE,
-	CDF_P2P_GO_MODE,
-	CDF_FTM_MODE,
-	CDF_IBSS_MODE,
-	CDF_P2P_DEVICE_MODE,
-	CDF_EPPING_MODE,
-	CDF_OCB_MODE,
-	CDF_MAX_NO_OF_MODE
-};
-
-/**
- * enum tCDF_GLOBAL_CON_MODE - global config mode when
- * driver is loaded.
- *
- * @CDF_GLOBAL_MISSION_MODE: mission mode (STA, SAP...)
- * @CDF_GLOBAL_FTM_MODE: FTM mode
- * @CDF_GLOBAL_EPPING_MODE: EPPING mode
- * @CDF_GLOBAL_MAX_MODE: Max place holder
- */
-enum tCDF_GLOBAL_CON_MODE {
-	CDF_GLOBAL_MISSION_MODE,
-	CDF_GLOBAL_FTM_MODE = 5,
-	CDF_GLOBAL_EPPING_MODE = 8,
-	CDF_GLOBAL_MAX_MODE
-};
-
-
-#ifdef WLAN_OPEN_P2P_INTERFACE
-/* This should match with WLAN_MAX_INTERFACES */
-#define CDF_MAX_CONCURRENCY_PERSONA    (4)
-#else
-#define CDF_MAX_CONCURRENCY_PERSONA    (3)
-#endif
-
-#define CDF_STA_MASK (1 << CDF_STA_MODE)
-#define CDF_SAP_MASK (1 << CDF_SAP_MODE)
-#define CDF_P2P_CLIENT_MASK (1 << CDF_P2P_CLIENT_MODE)
-#define CDF_P2P_GO_MASK (1 << CDF_P2P_GO_MODE)
-
-#ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH
-typedef enum {
-	CDF_MCC_TO_SCC_SWITCH_DISABLE = 0,
-	CDF_MCC_TO_SCC_SWITCH_ENABLE,
-	CDF_MCC_TO_SCC_SWITCH_FORCE,
-	CDF_MCC_TO_SCC_SWITCH_MAX
-} tCDF_MCC_TO_SCC_SWITCH_MODE;
-#endif
-
-#if !defined(NULL)
-#ifdef __cplusplus
-#define NULL    0
-#else
-#define NULL    ((void *)0)
-#endif
-#endif
-
-/* 'Time' type */
-typedef unsigned long v_TIME_t;
-
-/* typedef for CDF Context... */
-typedef void *v_CONTEXT_t;
-
-#define CDF_MAC_ADDR_SIZE (6)
-
-/**
- * struct cdf_mac_addr - mac address array
- * @bytes: MAC address bytes
- */
-struct cdf_mac_addr {
-	uint8_t bytes[CDF_MAC_ADDR_SIZE];
-};
-
-/* This macro is used to initialize a CDF MacAddress to the broadcast
- * MacAddress.  It is used like this...
- * struct cdf_mac_addr macAddress = CDF_MAC_ADDR_BROADCAST_INITIALIZER
- */
-#define CDF_MAC_ADDR_BROADCAST_INITIALIZER { { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff } }
-
-/* This macro is used to initialize a CDF MacAddress to zero
- * It is used like this...
- * struct cdf_mac_addr macAddress = CDF_MAC_ADDR_ZERO_INITIALIZER
- */
-#define CDF_MAC_ADDR_ZERO_INITIALIZER { { 0, 0, 0, 0, 0, 0 } }
-
-#define CDF_IPV4_ADDR_SIZE (4)
-#define CDF_IPV6_ADDR_SIZE (16)
-
-/**
- * struct cdf_tso_frag_t - fragments of a single TCP segment
- * @paddr_low_32:	Lower 32 bits of the buffer pointer
- * @paddr_upper_16:	upper 16 bits of the buffer pointer
- * @length:	length of the buffer
- * @vaddr:	virtual address
- *
- * This structure holds the fragments of a single TCP segment of a
- * given jumbo TSO network buffer
- */
-struct cdf_tso_frag_t {
-	uint32_t paddr_low_32;
-	uint32_t paddr_upper_16:16,
-		     length:16;
-	unsigned char *vaddr;
-};
-
-#define FRAG_NUM_MAX 6
-
-/**
- * struct cdf_tso_flags_t - TSO specific flags
- * @tso_enable: Enable transmit segmentation offload
- * @tcp_flags_mask: Tcp_flag is inserted into the header based
- * on the mask
- * @l2_len: L2 length for the msdu
- * @ip_len: IP length for the msdu
- * @tcp_seq_num: TCP sequence number
- * @ip_id: IP identification number
- *
- * This structure holds the TSO specific flags extracted from the TSO network
- * buffer for a given TCP segment
- */
-struct cdf_tso_flags_t {
-	u_int32_t tso_enable:1,
-			reserved_0a:6,
-			fin:1,
-			syn:1,
-			rst:1,
-			psh:1,
-			ack:1,
-			urg:1,
-			ece:1,
-			cwr:1,
-			ns:1,
-			tcp_flags_mask:9,
-			reserved_0b:7;
-/* ------------------------------------------------------------------- */
-
-	u_int32_t l2_len:16,
-			ip_len:16;
-/* ------------------------------------------------------------------- */
-
-	u_int32_t tcp_seq_num;
-/* ------------------------------------------------------------------- */
-
-	u_int32_t ip_id:16,
-			ipv4_checksum_en:1,
-			udp_ipv4_checksum_en:1,
-			udp_ipv6_checksum_en:1,
-			tcp_ipv4_checksum_en:1,
-			tcp_ipv6_checksum_en:1,
-			partial_checksum_en:1,
-			reserved_3a:10;
-/* ------------------------------------------------------------------- */
-
-	u_int32_t checksum_offset:14,
-			reserved_4a:2,
-			payload_start_offset:14,
-			reserved_4b:2;
-/* ------------------------------------------------------------------- */
-
-	u_int32_t payload_end_offset:14,
-			reserved_5:18;
-};
-
-/**
- * struct cdf_tso_seg_t - single TSO segment
- * @tso_flags:	TSO flags
- * @num_frags:	number of fragments
- * @tso_frags:	array holding the fragments
- *
- * This structure holds the information of a single TSO segment of a jumbo
- * TSO network buffer
- */
-struct cdf_tso_seg_t {
-	struct cdf_tso_flags_t tso_flags;
-/* ------------------------------------------------------------------- */
-	uint32_t num_frags;
-	struct cdf_tso_frag_t tso_frags[FRAG_NUM_MAX];
-};
-
-struct cdf_tso_seg_elem_t {
-	struct cdf_tso_seg_t seg;
-	struct cdf_tso_seg_elem_t *next;
-};
-
-/**
- * struct cdf_tso_info_t - TSO information extracted
- * @is_tso: is this is a TSO frame
- * @num_segs: number of segments
- * @total_len: total length of the packet
- * @tso_seg_list: list of TSO segments for this jumbo packet
- * @curr_seg: segment that is currently being processed
- *
- * This structure holds the TSO information extracted after parsing the TSO
- * jumbo network buffer. It contains a chain of the TSO segments belonging to
- * the jumbo packet
- */
-struct cdf_tso_info_t {
-	uint8_t is_tso;
-	uint32_t num_segs;
-	uint32_t total_len;
-	struct cdf_tso_seg_elem_t *tso_seg_list;
-	struct cdf_tso_seg_elem_t *curr_seg;
-};
-
-/**
- * Used to set classify bit in CE desc.
- */
-#define CDF_CE_TX_CLASSIFY_BIT_S	5
-
-/**
- * 2 bits starting at bit 6 in CE desc.
- */
-#define CDF_CE_TX_PKT_TYPE_BIT_S	6
-
-/**
- * 12 bits --> 16-27, in the CE desciptor, the length of HTT/HTC descriptor
- */
-#define CDF_CE_TX_PKT_OFFSET_BIT_S	16
-
-/**
- * Mask for packet offset in the CE descriptor.
- */
-#define CDF_CE_TX_PKT_OFFSET_BIT_M	0x0fff0000
-
-/**
- * enum cdf_suspend_type - type of suspend
- * CDF_SYSTEM_SUSPEND: System suspend triggered wlan suspend
- * CDF_RUNTIME_SUSPEND: Runtime pm inactivity timer triggered wlan suspend
- */
-enum cdf_suspend_type {
-	CDF_SYSTEM_SUSPEND,
-	CDF_RUNTIME_SUSPEND
-};
-
-#endif /* if !defined __CDF_TYPES_H */

core/cdf/inc/cdf_util.h

@@ -48,7 +48,7 @@
  */
 #define cdf_likely(_expr)       __cdf_likely(_expr)
 
-CDF_INLINE_FN int cdf_status_to_os_return(QDF_STATUS status)
+static inline int cdf_status_to_os_return(QDF_STATUS status)
 {
 	return __cdf_status_to_os_return(status);
 }
@@ -125,15 +125,15 @@ CDF_INLINE_FN int cdf_status_to_os_return(QDF_STATUS status)
  * Return: true if the MacAddress's are equal
  *	not true if the MacAddress's are not equal
  */
-CDF_INLINE_FN bool cdf_is_macaddr_equal(struct cdf_mac_addr *pMacAddr1,
-					struct cdf_mac_addr *pMacAddr2)
+static inline bool cdf_is_macaddr_equal(struct qdf_mac_addr *pMacAddr1,
+					struct qdf_mac_addr *pMacAddr2)
 {
-	return 0 == memcmp(pMacAddr1, pMacAddr2, CDF_MAC_ADDR_SIZE);
+	return 0 == memcmp(pMacAddr1, pMacAddr2, QDF_MAC_ADDR_SIZE);
 }
 
 /**
  * cdf_is_macaddr_zero() - check for a MacAddress of all zeros.
- * @pMacAddr - pointer to the struct cdf_mac_addr to check.
+ * @pMacAddr - pointer to the struct qdf_mac_addr to check.
  *
  * This function returns a bool that tells if a MacAddress is made up of
  * all zeros.
@@ -143,24 +143,24 @@ CDF_INLINE_FN bool cdf_is_macaddr_equal(struct cdf_mac_addr *pMacAddr1,
  *	false if the MacAddress is not all Zeros.
  *
  */
-CDF_INLINE_FN bool cdf_is_macaddr_zero(struct cdf_mac_addr *pMacAddr)
+static inline bool cdf_is_macaddr_zero(struct qdf_mac_addr *pMacAddr)
 {
-	struct cdf_mac_addr zeroMacAddr = CDF_MAC_ADDR_ZERO_INITIALIZER;
+	struct qdf_mac_addr zeroMacAddr = QDF_MAC_ADDR_ZERO_INITIALIZER;
 
 	return cdf_is_macaddr_equal(pMacAddr, &zeroMacAddr);
 }
 
 /**
  * cdf_zero_macaddr() - zero out a MacAddress
- * @pMacAddr: pointer to the struct cdf_mac_addr to zero.
+ * @pMacAddr: pointer to the struct qdf_mac_addr to zero.
  *
  * This function zeros out a CDF MacAddress type.
  *
  * Return: nothing
  */
-CDF_INLINE_FN void cdf_zero_macaddr(struct cdf_mac_addr *pMacAddr)
+static inline void cdf_zero_macaddr(struct qdf_mac_addr *pMacAddr)
 {
-	memset(pMacAddr, 0, CDF_MAC_ADDR_SIZE);
+	memset(pMacAddr, 0, QDF_MAC_ADDR_SIZE);
 }
 
 /**
@@ -175,7 +175,7 @@ CDF_INLINE_FN void cdf_zero_macaddr(struct cdf_mac_addr *pMacAddr)
  * Return:  true if the input MacAddress is a Group address
  *	false if the input MacAddress is not a Group address
  */
-CDF_INLINE_FN bool cdf_is_macaddr_group(struct cdf_mac_addr *pMacAddr)
+static inline bool cdf_is_macaddr_group(struct qdf_mac_addr *pMacAddr)
 {
 	return pMacAddr->bytes[0] & 0x01;
 }
@@ -191,10 +191,10 @@ CDF_INLINE_FN bool cdf_is_macaddr_group(struct cdf_mac_addr *pMacAddr)
  * Return:  true if the input MacAddress is a broadcast address
  *	false if the input MacAddress is not a broadcast address
  */
-CDF_INLINE_FN bool cdf_is_macaddr_broadcast(struct cdf_mac_addr *pMacAddr)
+static inline bool cdf_is_macaddr_broadcast(struct qdf_mac_addr *pMacAddr)
 {
-	struct cdf_mac_addr broadcastMacAddr =
-					CDF_MAC_ADDR_BROADCAST_INITIALIZER;
+	struct qdf_mac_addr broadcastMacAddr =
+					QDF_MAC_ADDR_BROADCAST_INITIALIZER;
 
 	return cdf_is_macaddr_equal(pMacAddr, &broadcastMacAddr);
 }
@@ -209,8 +209,8 @@ CDF_INLINE_FN bool cdf_is_macaddr_broadcast(struct cdf_mac_addr *pMacAddr)
  *
  * Return: nothing
  */
-CDF_INLINE_FN void cdf_copy_macaddr(struct cdf_mac_addr *pDst,
-				    struct cdf_mac_addr *pSrc)
+static inline void cdf_copy_macaddr(struct qdf_mac_addr *pDst,
+				    struct qdf_mac_addr *pSrc)
 {
 	*pDst = *pSrc;
 }
@@ -224,9 +224,9 @@ CDF_INLINE_FN void cdf_copy_macaddr(struct cdf_mac_addr *pDst,
  *
  * Return: nothing
  */
-CDF_INLINE_FN void cdf_set_macaddr_broadcast(struct cdf_mac_addr *pMacAddr)
+static inline void cdf_set_macaddr_broadcast(struct qdf_mac_addr *pMacAddr)
 {
-	memset(pMacAddr, 0xff, CDF_MAC_ADDR_SIZE);
+	memset(pMacAddr, 0xff, QDF_MAC_ADDR_SIZE);
 }
 
 #if defined(ANI_LITTLE_BYTE_ENDIAN)
@@ -237,7 +237,7 @@ CDF_INLINE_FN void cdf_set_macaddr_broadcast(struct cdf_mac_addr *pMacAddr)
  *
  * Return: converted network byte order
  */
-CDF_INLINE_FN unsigned long i_cdf_htonl(unsigned long ul)
+static inline unsigned long i_cdf_htonl(unsigned long ul)
 {
 	return ((ul & 0x000000ff) << 24) |
 		((ul & 0x0000ff00) << 8) |
@@ -250,7 +250,7 @@ CDF_INLINE_FN unsigned long i_cdf_htonl(unsigned long ul)
  *
  * Return: converted host byte order
  */
-CDF_INLINE_FN unsigned long i_cdf_ntohl(unsigned long ul)
+static inline unsigned long i_cdf_ntohl(unsigned long ul)
 {
 	return i_cdf_htonl(ul);
 }
@@ -268,7 +268,7 @@ CDF_INLINE_FN unsigned long i_cdf_ntohl(unsigned long ul)
  * Return: The address to the byte after the assignment. This may or may not
  *	be valid. Caller to verify.
  */
-CDF_INLINE_FN uint8_t *cdf_set_u16(uint8_t *ptr, uint16_t value)
+static inline uint8_t *cdf_set_u16(uint8_t *ptr, uint16_t value)
 {
 #if defined(ANI_BIG_BYTE_ENDIAN)
 	*(ptr) = (uint8_t) (value >> 8);
@@ -293,7 +293,7 @@ CDF_INLINE_FN uint8_t *cdf_set_u16(uint8_t *ptr, uint16_t value)
  * Return: The address to the byte after the assignment. This may or may not
  *	be valid. Caller to verify.
  */
-CDF_INLINE_FN uint8_t *cdf_get_u16(uint8_t *ptr, uint16_t *pValue)
+static inline uint8_t *cdf_get_u16(uint8_t *ptr, uint16_t *pValue)
 {
 #if defined(ANI_BIG_BYTE_ENDIAN)
 	*pValue = (((uint16_t) (*ptr << 8)) | ((uint16_t) (*(ptr + 1))));
@@ -316,7 +316,7 @@ CDF_INLINE_FN uint8_t *cdf_get_u16(uint8_t *ptr, uint16_t *pValue)
  * Return: The address to the byte after the assignment. This may or may not
  *		be valid. Caller to verify.
  */
-CDF_INLINE_FN uint8_t *cdf_get_u32(uint8_t *ptr, uint32_t *pValue)
+static inline uint8_t *cdf_get_u32(uint8_t *ptr, uint32_t *pValue)
 {
 #if defined(ANI_BIG_BYTE_ENDIAN)
 	*pValue = ((uint32_t) (*(ptr) << 24) |
@@ -338,7 +338,7 @@ CDF_INLINE_FN uint8_t *cdf_get_u32(uint8_t *ptr, uint32_t *pValue)
  *
  * Return: Power of 2 integer
  */
-CDF_INLINE_FN int cdf_get_pwr2(int value)
+static inline int cdf_get_pwr2(int value)
 {
 	int log2;
 	if (CDF_IS_PWR2(value))

core/cdf/inc/osdep.h

@@ -28,7 +28,7 @@
 #ifndef _OSDEP_H
 #define _OSDEP_H
 
-#include <cdf_types.h>
+#include <qdf_types.h>
 #include <cdf_memory.h>
 #include <cdf_lock.h>
 #include <qdf_time.h>

core/cdf/src/cdf_lock.c

@@ -39,7 +39,7 @@
 #include "cdf_lock.h"
 #include "cdf_memory.h"
 #include "cdf_trace.h"
-#include <cdf_types.h>
+#include <qdf_types.h>
 #ifdef CONFIG_CNSS
 #include <net/cnss.h>
 #endif
@@ -89,19 +89,19 @@ QDF_STATUS cdf_mutex_init(cdf_mutex_t *lock)
 {
 	/* check for invalid pointer */
 	if (lock == NULL) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s: NULL pointer passed in", __func__);
 		return QDF_STATUS_E_FAULT;
 	}
 	/* check for 'already initialized' lock */
 	if (LINUX_LOCK_COOKIE == lock->cookie) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s: already initialized lock", __func__);
 		return QDF_STATUS_E_BUSY;
 	}
 
 	if (in_interrupt()) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s cannot be called from interrupt context!!!",
 			  __func__);
 		return QDF_STATUS_E_FAULT;
@@ -135,21 +135,21 @@ QDF_STATUS cdf_mutex_acquire(cdf_mutex_t *lock)
 	int rc;
 	/* check for invalid pointer */
 	if (lock == NULL) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s: NULL pointer passed in", __func__);
 		CDF_ASSERT(0);
 		return QDF_STATUS_E_FAULT;
 	}
 	/* check if lock refers to an initialized object */
 	if (LINUX_LOCK_COOKIE != lock->cookie) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s: uninitialized lock", __func__);
 		CDF_ASSERT(0);
 		return QDF_STATUS_E_INVAL;
 	}
 
 	if (in_interrupt()) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s cannot be called from interrupt context!!!",
 			  __func__);
 		CDF_ASSERT(0);
@@ -159,7 +159,7 @@ QDF_STATUS cdf_mutex_acquire(cdf_mutex_t *lock)
 		(lock->state == LOCK_ACQUIRED)) {
 		lock->refcount++;
 #ifdef CDF_NESTED_LOCK_DEBUG
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO,
 			  "%s: %x %d %d", __func__, lock, current->pid,
 			  lock->refcount);
 #endif
@@ -169,13 +169,13 @@ QDF_STATUS cdf_mutex_acquire(cdf_mutex_t *lock)
 	mutex_lock(&lock->m_lock);
 	rc = mutex_is_locked(&lock->m_lock);
 	if (rc == 0) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s: unable to lock mutex (rc = %d)", __func__, rc);
 		CDF_ASSERT(0);
 		return QDF_STATUS_E_FAILURE;
 	}
 #ifdef CDF_NESTED_LOCK_DEBUG
-	CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO,
+	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO,
 		  "%s: %x %d", __func__, lock, current->pid);
 #endif
 	if (LOCK_DESTROYED != lock->state) {
@@ -185,7 +185,7 @@ QDF_STATUS cdf_mutex_acquire(cdf_mutex_t *lock)
 		return QDF_STATUS_SUCCESS;
 	} else {
 		/* lock is already destroyed */
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s: Lock is already destroyed", __func__);
 		mutex_unlock(&lock->m_lock);
 		CDF_ASSERT(0);
@@ -211,7 +211,7 @@ QDF_STATUS cdf_mutex_release(cdf_mutex_t *lock)
 {
 	/* check for invalid pointer */
 	if (lock == NULL) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s: NULL pointer passed in", __func__);
 		CDF_ASSERT(0);
 		return QDF_STATUS_E_FAULT;
@@ -219,14 +219,14 @@ QDF_STATUS cdf_mutex_release(cdf_mutex_t *lock)
 
 	/* check if lock refers to an uninitialized object */
 	if (LINUX_LOCK_COOKIE != lock->cookie) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s: uninitialized lock", __func__);
 		CDF_ASSERT(0);
 		return QDF_STATUS_E_INVAL;
 	}
 
 	if (in_interrupt()) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s cannot be called from interrupt context!!!",
 			  __func__);
 		CDF_ASSERT(0);
@@ -238,11 +238,11 @@ QDF_STATUS cdf_mutex_release(cdf_mutex_t *lock)
 	 * of the thread which acquire the lock
 	 */
 	if (lock->processID != current->pid) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s: current task pid does not match original task pid!!",
 			  __func__);
 #ifdef CDF_NESTED_LOCK_DEBUG
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO,
 			  "%s: Lock held by=%d being released by=%d",
 			  __func__, lock->processID, current->pid);
 #endif
@@ -255,7 +255,7 @@ QDF_STATUS cdf_mutex_release(cdf_mutex_t *lock)
 			lock->refcount--;
 	}
 #ifdef CDF_NESTED_LOCK_DEBUG
-	CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO,
+	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO,
 		  "%s: %x %d %d", __func__, lock, lock->processID,
 		  lock->refcount);
 #endif
@@ -268,7 +268,7 @@ QDF_STATUS cdf_mutex_release(cdf_mutex_t *lock)
 	/* release a Lock */
 	mutex_unlock(&lock->m_lock);
 #ifdef CDF_NESTED_LOCK_DEBUG
-	CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO,
+	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO,
 		  "%s: Freeing lock %x %d %d", lock, lock->processID,
 		  lock->refcount);
 #endif
@@ -298,19 +298,19 @@ QDF_STATUS cdf_mutex_destroy(cdf_mutex_t *lock)
 {
 	/* check for invalid pointer */
 	if (NULL == lock) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s: NULL pointer passed in", __func__);
 		return QDF_STATUS_E_FAULT;
 	}
 
 	if (LINUX_LOCK_COOKIE != lock->cookie) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s: uninitialized lock", __func__);
 		return QDF_STATUS_E_INVAL;
 	}
 
 	if (in_interrupt()) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s cannot be called from interrupt context!!!",
 			  __func__);
 		return QDF_STATUS_E_FAULT;
@@ -318,7 +318,7 @@ QDF_STATUS cdf_mutex_destroy(cdf_mutex_t *lock)
 
 	/* check if lock is released */
 	if (!mutex_trylock(&lock->m_lock)) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s: lock is not released", __func__);
 		return QDF_STATUS_E_BUSY;
 	}
@@ -509,11 +509,11 @@ QDF_STATUS cdf_runtime_pm_get(void)
 	void *ol_sc;
 	int ret;
 
-	ol_sc = cds_get_context(CDF_MODULE_ID_HIF);
+	ol_sc = cds_get_context(QDF_MODULE_ID_HIF);
 
 	if (ol_sc == NULL) {
 		CDF_ASSERT(0);
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 				"%s: HIF context is null!", __func__);
 		return QDF_STATUS_E_INVAL;
 	}
@@ -541,11 +541,11 @@ QDF_STATUS cdf_runtime_pm_put(void)
 	void *ol_sc;
 	int ret;
 
-	ol_sc = cds_get_context(CDF_MODULE_ID_HIF);
+	ol_sc = cds_get_context(QDF_MODULE_ID_HIF);
 
 	if (ol_sc == NULL) {
 		CDF_ASSERT(0);
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 				"%s: HIF context is null!", __func__);
 		return QDF_STATUS_E_INVAL;
 	}
@@ -571,11 +571,11 @@ QDF_STATUS cdf_runtime_pm_prevent_suspend(cdf_runtime_lock_t lock)
 	void *ol_sc;
 	int ret;
 
-	ol_sc = cds_get_context(CDF_MODULE_ID_HIF);
+	ol_sc = cds_get_context(QDF_MODULE_ID_HIF);
 
 	if (ol_sc == NULL) {
 		CDF_ASSERT(0);
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 				"%s: HIF context is null!", __func__);
 		return QDF_STATUS_E_INVAL;
 	}
@@ -601,11 +601,11 @@ QDF_STATUS cdf_runtime_pm_allow_suspend(cdf_runtime_lock_t lock)
 	void *ol_sc;
 	int ret;
 
-	ol_sc = cds_get_context(CDF_MODULE_ID_HIF);
+	ol_sc = cds_get_context(QDF_MODULE_ID_HIF);
 
 	if (ol_sc == NULL) {
 		CDF_ASSERT(0);
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 				"%s: HIF context is null!", __func__);
 		return QDF_STATUS_E_INVAL;
 	}

core/cdf/src/cdf_mc_timer.c

@@ -61,9 +61,9 @@ static cdf_mutex_t persistent_timer_count_lock;
  *
  * Return: none
  */
-static void try_allowing_sleep(CDF_TIMER_TYPE type)
+static void try_allowing_sleep(QDF_TIMER_TYPE type)
 {
-	if (CDF_TIMER_TYPE_WAKE_APPS == type) {
+	if (QDF_TIMER_TYPE_WAKE_APPS == type) {
 		/* cdf_mutex_acquire(&persistent_timer_count_lock); */
 		persistent_timer_count--;
 		if (0 == persistent_timer_count) {
@@ -102,12 +102,12 @@ static void cdf_linux_timer_callback(unsigned long data)
 	cdf_mc_timer_callback_t callback = NULL;
 	void *userData = NULL;
 	int threadId;
-	CDF_TIMER_TYPE type = CDF_TIMER_TYPE_SW;
+	QDF_TIMER_TYPE type = QDF_TIMER_TYPE_SW;
 
 	CDF_ASSERT(timer);
 
 	if (timer == NULL) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s Null pointer passed in!", __func__);
 		return;
 	}
@@ -158,7 +158,7 @@ static void cdf_linux_timer_callback(unsigned long data)
 	spin_unlock_irqrestore(&timer->platformInfo.spinlock, flags);
 
 	if (QDF_STATUS_SUCCESS != vStatus) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "TIMER callback called in a wrong state=%d",
 			  timer->state);
 		return;
@@ -168,12 +168,12 @@ static void cdf_linux_timer_callback(unsigned long data)
 
 	if (callback == NULL) {
 		CDF_ASSERT(0);
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s: No TIMER callback, Could not enqueue timer to any queue",
 			  __func__);
 		return;
 	}
-	CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO,
+	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO,
 		  "TIMER callback: running on MC thread");
 
 	/* serialize to the MC thread */
@@ -185,7 +185,7 @@ static void cdf_linux_timer_callback(unsigned long data)
 	if (cds_mq_post_message(CDS_MQ_ID_SYS, &msg) == QDF_STATUS_SUCCESS)
 		return;
 
-	CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 		  "%s: Could not enqueue timer to any queue", __func__);
 	CDF_ASSERT(0);
 }
@@ -226,7 +226,7 @@ CDF_TIMER_STATE cdf_mc_timer_get_current_state(cdf_mc_timer_t *pTimer)
  */
 void cdf_timer_module_init(void)
 {
-	CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO,
+	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO,
 		  "Initializing the CDF timer module");
 	cdf_mutex_init(&persistent_timer_count_lock);
 }
@@ -271,7 +271,7 @@ static void cdf_timer_clean(void)
 		QDF_STATUS qdf_status;
 
 		cdf_mc_timer_node_t *ptimerNode;
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s: List is not Empty. listSize %d ",
 			  __func__, (int)listSize);
 
@@ -282,7 +282,7 @@ static void cdf_timer_clean(void)
 			cdf_spin_unlock_irqrestore(&cdf_timer_list_lock);
 			if (QDF_STATUS_SUCCESS == qdf_status) {
 				ptimerNode = (cdf_mc_timer_node_t *) pNode;
-				CDF_TRACE(CDF_MODULE_ID_CDF,
+				CDF_TRACE(QDF_MODULE_ID_QDF,
 					  CDF_TRACE_LEVEL_FATAL,
 					  "Timer Leak@ File %s, @Line %d",
 					  ptimerNode->fileName,
@@ -340,7 +340,7 @@ void cdf_mc_timer_exit(void)
  */
 #ifdef TIMER_MANAGER
 QDF_STATUS cdf_mc_timer_init_debug(cdf_mc_timer_t *timer,
-				   CDF_TIMER_TYPE timerType,
+				   QDF_TIMER_TYPE timerType,
 				   cdf_mc_timer_callback_t callback,
 				   void *userData, char *fileName,
 				   uint32_t lineNum)
@@ -349,7 +349,7 @@ QDF_STATUS cdf_mc_timer_init_debug(cdf_mc_timer_t *timer,
 
 	/* check for invalid pointer */
 	if ((timer == NULL) || (callback == NULL)) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s: Null params being passed", __func__);
 		CDF_ASSERT(0);
 		return QDF_STATUS_E_FAULT;
@@ -358,7 +358,7 @@ QDF_STATUS cdf_mc_timer_init_debug(cdf_mc_timer_t *timer,
 	timer->ptimerNode = cdf_mem_malloc(sizeof(cdf_mc_timer_node_t));
 
 	if (timer->ptimerNode == NULL) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s: Not able to allocate memory for timeNode",
 			  __func__);
 		CDF_ASSERT(0);
@@ -376,7 +376,7 @@ QDF_STATUS cdf_mc_timer_init_debug(cdf_mc_timer_t *timer,
 					   &timer->ptimerNode->pNode);
 	cdf_spin_unlock_irqrestore(&cdf_timer_list_lock);
 	if (QDF_STATUS_SUCCESS != qdf_status) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s: Unable to insert node into List qdf_status %d",
 			  __func__, qdf_status);
 	}
@@ -385,7 +385,7 @@ QDF_STATUS cdf_mc_timer_init_debug(cdf_mc_timer_t *timer,
 	 * with arguments passed or with default values
 	 */
 	spin_lock_init(&timer->platformInfo.spinlock);
-	if (CDF_TIMER_TYPE_SW == timerType)
+	if (QDF_TIMER_TYPE_SW == timerType)
 		init_timer_deferrable(&(timer->platformInfo.Timer));
 	else
 		init_timer(&(timer->platformInfo.Timer));
@@ -401,13 +401,13 @@ QDF_STATUS cdf_mc_timer_init_debug(cdf_mc_timer_t *timer,
 	return QDF_STATUS_SUCCESS;
 }
 #else
-QDF_STATUS cdf_mc_timer_init(cdf_mc_timer_t *timer, CDF_TIMER_TYPE timerType,
+QDF_STATUS cdf_mc_timer_init(cdf_mc_timer_t *timer, QDF_TIMER_TYPE timerType,
 			     cdf_mc_timer_callback_t callback,
 			     void *userData)
 {
 	/* check for invalid pointer */
 	if ((timer == NULL) || (callback == NULL)) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s: Null params being passed", __func__);
 		CDF_ASSERT(0);
 		return QDF_STATUS_E_FAULT;
@@ -417,7 +417,7 @@ QDF_STATUS cdf_mc_timer_init(cdf_mc_timer_t *timer, CDF_TIMER_TYPE timerType,
 	 * with arguments passed or with default values
 	 */
 	spin_lock_init(&timer->platformInfo.spinlock);
-	if (CDF_TIMER_TYPE_SW == timerType)
+	if (QDF_TIMER_TYPE_SW == timerType)
 		init_timer_deferrable(&(timer->platformInfo.Timer));
 	else
 		init_timer(&(timer->platformInfo.Timer));
@@ -463,7 +463,7 @@ QDF_STATUS cdf_mc_timer_destroy(cdf_mc_timer_t *timer)
 
 	/* check for invalid pointer */
 	if (NULL == timer) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s: Null timer pointer being passed", __func__);
 		CDF_ASSERT(0);
 		return QDF_STATUS_E_FAULT;
@@ -471,7 +471,7 @@ QDF_STATUS cdf_mc_timer_destroy(cdf_mc_timer_t *timer)
 
 	/* Check if timer refers to an uninitialized object */
 	if (LINUX_TIMER_COOKIE != timer->platformInfo.cookie) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s: Cannot destroy uninitialized timer", __func__);
 		CDF_ASSERT(0);
 		return QDF_STATUS_E_INVAL;
@@ -522,7 +522,7 @@ QDF_STATUS cdf_mc_timer_destroy(cdf_mc_timer_t *timer)
 
 	spin_unlock_irqrestore(&timer->platformInfo.spinlock, flags);
 
-	CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 		  "%s: Cannot destroy timer in state = %d", __func__,
 		  timer->state);
 	CDF_ASSERT(0);
@@ -560,7 +560,7 @@ QDF_STATUS cdf_mc_timer_destroy(cdf_mc_timer_t *timer)
 
 	/* check for invalid pointer */
 	if (NULL == timer) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s: Null timer pointer being passed", __func__);
 		CDF_ASSERT(0);
 		return QDF_STATUS_E_FAULT;
@@ -568,7 +568,7 @@ QDF_STATUS cdf_mc_timer_destroy(cdf_mc_timer_t *timer)
 
 	/* check if timer refers to an uninitialized object */
 	if (LINUX_TIMER_COOKIE != timer->platformInfo.cookie) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s: Cannot destroy uninitialized timer", __func__);
 		CDF_ASSERT(0);
 		return QDF_STATUS_E_INVAL;
@@ -609,7 +609,7 @@ QDF_STATUS cdf_mc_timer_destroy(cdf_mc_timer_t *timer)
 
 	spin_unlock_irqrestore(&timer->platformInfo.spinlock, flags);
 
-	CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 		  "%s: Cannot destroy timer in state = %d", __func__,
 		  timer->state);
 	CDF_ASSERT(0);
@@ -639,12 +639,12 @@ QDF_STATUS cdf_mc_timer_start(cdf_mc_timer_t *timer, uint32_t expirationTime)
 {
 	unsigned long flags;
 
-	CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH,
+	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH,
 		  "Timer Addr inside cds_enable : 0x%p ", timer);
 
 	/* check for invalid pointer */
 	if (NULL == timer) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s Null timer pointer being passed", __func__);
 		CDF_ASSERT(0);
 		return QDF_STATUS_E_INVAL;
@@ -652,7 +652,7 @@ QDF_STATUS cdf_mc_timer_start(cdf_mc_timer_t *timer, uint32_t expirationTime)
 
 	/* check if timer refers to an uninitialized object */
 	if (LINUX_TIMER_COOKIE != timer->platformInfo.cookie) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s: Cannot start uninitialized timer", __func__);
 		CDF_ASSERT(0);
 
@@ -661,7 +661,7 @@ QDF_STATUS cdf_mc_timer_start(cdf_mc_timer_t *timer, uint32_t expirationTime)
 
 	/* check if timer has expiration time less than 10 ms */
 	if (expirationTime < 10) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s: Cannot start a timer with expiration less than 10 ms",
 			  __func__);
 		CDF_ASSERT(0);
@@ -674,7 +674,7 @@ QDF_STATUS cdf_mc_timer_start(cdf_mc_timer_t *timer, uint32_t expirationTime)
 	/* ensure if the timer can be started */
 	if (CDF_TIMER_STATE_STOPPED != timer->state) {
 		spin_unlock_irqrestore(&timer->platformInfo.spinlock, flags);
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH,
 			  "%s: Cannot start timer in state = %d ", __func__,
 			  timer->state);
 		return QDF_STATUS_E_ALREADY;
@@ -689,7 +689,7 @@ QDF_STATUS cdf_mc_timer_start(cdf_mc_timer_t *timer, uint32_t expirationTime)
 	/* get the thread ID on which the timer is being started */
 	timer->platformInfo.threadID = current->pid;
 
-	if (CDF_TIMER_TYPE_WAKE_APPS == timer->type) {
+	if (QDF_TIMER_TYPE_WAKE_APPS == timer->type) {
 		persistent_timer_count++;
 		if (1 == persistent_timer_count) {
 			/* since we now have one persistent timer,
@@ -721,12 +721,12 @@ QDF_STATUS cdf_mc_timer_stop(cdf_mc_timer_t *timer)
 {
 	unsigned long flags;
 
-	CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH,
+	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: Timer Addr inside cds_disable : 0x%p", __func__, timer);
 
 	/* check for invalid pointer */
 	if (NULL == timer) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s Null timer pointer being passed", __func__);
 		CDF_ASSERT(0);
 		return QDF_STATUS_E_INVAL;
@@ -734,7 +734,7 @@ QDF_STATUS cdf_mc_timer_stop(cdf_mc_timer_t *timer)
 
 	/* check if timer refers to an uninitialized object */
 	if (LINUX_TIMER_COOKIE != timer->platformInfo.cookie) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s: Cannot stop uninitialized timer", __func__);
 		CDF_ASSERT(0);
 
@@ -746,7 +746,7 @@ QDF_STATUS cdf_mc_timer_stop(cdf_mc_timer_t *timer)
 
 	if (CDF_TIMER_STATE_RUNNING != timer->state) {
 		spin_unlock_irqrestore(&timer->platformInfo.spinlock, flags);
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH,
 			  "%s: Cannot stop timer in state = %d",
 			  __func__, timer->state);
 		return QDF_STATUS_SUCCESS;
@@ -775,7 +775,7 @@ QDF_STATUS cdf_mc_timer_stop(cdf_mc_timer_t *timer)
  *	The current system tick count (in 10msec intervals).  This
  *	function cannot fail.
  */
-v_TIME_t cdf_mc_timer_get_system_ticks(void)
+unsigned long cdf_mc_timer_get_system_ticks(void)
 {
 	return jiffies_to_msecs(jiffies) / 10;
 }
@@ -789,7 +789,7 @@ v_TIME_t cdf_mc_timer_get_system_ticks(void)
  * Return:
  *	The current system time in milliseconds
  */
-v_TIME_t cdf_mc_timer_get_system_time(void)
+unsigned long cdf_mc_timer_get_system_time(void)
 {
 	struct timeval tv;
 	do_gettimeofday(&tv);

core/cdf/src/cdf_memory.c

@@ -111,7 +111,7 @@ static inline void cdf_mem_save_stack_trace(struct s_cdf_mem_struct *mem_struct)
 static inline void cdf_mem_print_stack_trace(struct s_cdf_mem_struct
 					     *mem_struct)
 {
-	CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL,
+	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL,
 		  "Call stack for the source of leaked memory:");
 
 	print_stack_trace(&mem_struct->trace, 1);
@@ -164,7 +164,7 @@ void cdf_mem_clean(void)
 		unsigned int prev_mleak_sz = 0;
 		unsigned int mleak_cnt = 0;
 
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s: List is not Empty. listSize %d ",
 			  __func__, (int)listSize);
 
@@ -182,7 +182,7 @@ void cdf_mem_clean(void)
 					memStruct->lineNum)
 				    || (prev_mleak_sz != memStruct->size)) {
 					if (mleak_cnt != 0) {
-						CDF_TRACE(CDF_MODULE_ID_CDF,
+						CDF_TRACE(QDF_MODULE_ID_QDF,
 							  CDF_TRACE_LEVEL_FATAL,
 							  "%d Time Memory Leak@ File %s, @Line %d, size %d",
 							  mleak_cnt,
@@ -203,7 +203,7 @@ void cdf_mem_clean(void)
 
 		/* Print last memory leak from the module */
 		if (mleak_cnt) {
-			CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL,
+			CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL,
 				  "%d Time memory Leak@ File %s, @Line %d, size %d",
 				  mleak_cnt, prev_mleak_file,
 				  prev_mleak_lineNum, prev_mleak_sz);
@@ -252,7 +252,7 @@ void *cdf_mem_malloc_debug(size_t size, char *fileName, uint32_t lineNum)
 	unsigned long  time_before_kzalloc;
 
 	if (size > (1024 * 1024) || size == 0) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s: called with invalid arg; passed in %zu !!!",
 			  __func__, size);
 		return NULL;
@@ -281,7 +281,7 @@ void *cdf_mem_malloc_debug(size_t size, char *fileName, uint32_t lineNum)
 	 */
 	if (cdf_mc_timer_get_system_time() - time_before_kzalloc >=
 					  CDF_GET_MEMORY_TIME_THRESHOLD)
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			 "%s: kzalloc took %lu msec for size %zu called from %pS at line %d",
 			 __func__,
 			 cdf_mc_timer_get_system_time() - time_before_kzalloc,
@@ -306,7 +306,7 @@ void *cdf_mem_malloc_debug(size_t size, char *fileName, uint32_t lineNum)
 						   &memStruct->pNode);
 		cdf_spin_unlock_irqrestore(&cdf_mem_list_lock);
 		if (QDF_STATUS_SUCCESS != qdf_status) {
-			CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+			CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 				  "%s: Unable to insert node into List qdf_status %d",
 				  __func__, qdf_status);
 		}
@@ -347,7 +347,7 @@ void cdf_mem_free(void *ptr)
 			if (0 == cdf_mem_compare(memStruct->header,
 						 &WLAN_MEM_HEADER[0],
 						 sizeof(WLAN_MEM_HEADER))) {
-				CDF_TRACE(CDF_MODULE_ID_CDF,
+				CDF_TRACE(QDF_MODULE_ID_QDF,
 					  CDF_TRACE_LEVEL_FATAL,
 					  "Memory Header is corrupted. MemInfo: Filename %s, LineNum %d",
 					  memStruct->fileName,
@@ -358,7 +358,7 @@ void cdf_mem_free(void *ptr)
 			    cdf_mem_compare((uint8_t *) ptr + memStruct->size,
 					    &WLAN_MEM_TAIL[0],
 					    sizeof(WLAN_MEM_TAIL))) {
-				CDF_TRACE(CDF_MODULE_ID_CDF,
+				CDF_TRACE(QDF_MODULE_ID_QDF,
 					  CDF_TRACE_LEVEL_FATAL,
 					  "Memory Trailer is corrupted. MemInfo: Filename %s, LineNum %d",
 					  memStruct->fileName,
@@ -367,7 +367,7 @@ void cdf_mem_free(void *ptr)
 			}
 			kfree((void *)memStruct);
 		} else {
-			CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL,
+			CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL,
 				  "%s: Unallocated memory (double free?)",
 				  __func__);
 			CDF_BUG(0);
@@ -396,7 +396,7 @@ void *cdf_mem_malloc(size_t size)
 	unsigned long  time_before_kzalloc;
 
 	if (size > (1024 * 1024) || size == 0) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s: called with invalid arg; passed in %zu !!",
 			  __func__, size);
 		return NULL;
@@ -423,7 +423,7 @@ void *cdf_mem_malloc(size_t size)
 	 */
 	if (cdf_mc_timer_get_system_time() - time_before_kzalloc >=
 					   CDF_GET_MEMORY_TIME_THRESHOLD)
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			 "%s: kzalloc took %lu msec for size %zu called from %pS",
 			 __func__,
 			 cdf_mc_timer_get_system_time() - time_before_kzalloc,
@@ -471,11 +471,11 @@ void cdf_mem_free(void *ptr)
  *
  * Return: None
  */
-void cdf_mem_multi_pages_alloc(cdf_device_t osdev,
+void cdf_mem_multi_pages_alloc(qdf_device_t osdev,
 				struct cdf_mem_multi_page_t *pages,
 				size_t element_size,
 				uint16_t element_num,
-				cdf_dma_context_t memctxt,
+				qdf_dma_context_t memctxt,
 				bool cacheable)
 {
 	uint16_t page_idx;
@@ -487,7 +487,7 @@ void cdf_mem_multi_pages_alloc(cdf_device_t osdev,
 
 	pages->num_element_per_page = PAGE_SIZE / element_size;
 	if (!pages->num_element_per_page) {
-		cdf_print("Invalid page %d or element size %d",
+		qdf_print("Invalid page %d or element size %d",
 			(int)PAGE_SIZE, (int)element_size);
 		goto out_fail;
 	}
@@ -501,7 +501,7 @@ void cdf_mem_multi_pages_alloc(cdf_device_t osdev,
 		pages->cacheable_pages = cdf_mem_malloc(
 			pages->num_pages * sizeof(pages->cacheable_pages));
 		if (!pages->cacheable_pages) {
-			cdf_print("Cacheable page storage alloc fail");
+			qdf_print("Cacheable page storage alloc fail");
 			goto out_fail;
 		}
 
@@ -509,7 +509,7 @@ void cdf_mem_multi_pages_alloc(cdf_device_t osdev,
 		for (page_idx = 0; page_idx < pages->num_pages; page_idx++) {
 			cacheable_pages[page_idx] = cdf_mem_malloc(PAGE_SIZE);
 			if (!cacheable_pages[page_idx]) {
-				cdf_print("cacheable page alloc fail, pi %d",
+				qdf_print("cacheable page alloc fail, pi %d",
 					page_idx);
 				goto page_alloc_fail;
 			}
@@ -519,7 +519,7 @@ void cdf_mem_multi_pages_alloc(cdf_device_t osdev,
 		pages->dma_pages = cdf_mem_malloc(
 			pages->num_pages * sizeof(struct cdf_mem_dma_page_t));
 		if (!pages->dma_pages) {
-			cdf_print("dmaable page storage alloc fail");
+			qdf_print("dmaable page storage alloc fail");
 			goto out_fail;
 		}
 
@@ -529,7 +529,7 @@ void cdf_mem_multi_pages_alloc(cdf_device_t osdev,
 				cdf_os_mem_alloc_consistent(osdev, PAGE_SIZE,
 					&dma_pages->page_p_addr, memctxt);
 			if (!dma_pages->page_v_addr_start) {
-				cdf_print("dmaable page alloc fail pi %d",
+				qdf_print("dmaable page alloc fail pi %d",
 					page_idx);
 				goto page_alloc_fail;
 			}
@@ -575,9 +575,9 @@ out_fail:
  *
  * Return: None
  */
-void cdf_mem_multi_pages_free(cdf_device_t osdev,
+void cdf_mem_multi_pages_free(qdf_device_t osdev,
 				struct cdf_mem_multi_page_t *pages,
-				cdf_dma_context_t memctxt,
+				qdf_dma_context_t memctxt,
 				bool cacheable)
 {
 	unsigned int page_idx;
@@ -618,7 +618,7 @@ void cdf_mem_multi_pages_free(cdf_device_t osdev,
 void cdf_mem_set(void *ptr, uint32_t numBytes, uint32_t value)
 {
 	if (ptr == NULL) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s called with NULL parameter ptr", __func__);
 		return;
 	}
@@ -646,7 +646,7 @@ void cdf_mem_zero(void *ptr, uint32_t numBytes)
 	}
 
 	if (ptr == NULL) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s called with NULL parameter ptr", __func__);
 		return;
 	}
@@ -678,7 +678,7 @@ void cdf_mem_copy(void *pDst, const void *pSrc, uint32_t numBytes)
 	}
 
 	if ((pDst == NULL) || (pSrc == NULL)) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s called with NULL parameter, source:%p destination:%p",
 			  __func__, pSrc, pDst);
 		CDF_ASSERT(0);
@@ -708,7 +708,7 @@ void cdf_mem_move(void *pDst, const void *pSrc, uint32_t numBytes)
 	}
 
 	if ((pDst == NULL) || (pSrc == NULL)) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s called with NULL parameter, source:%p destination:%p",
 			  __func__, pSrc, pDst);
 		CDF_ASSERT(0);
@@ -740,7 +740,7 @@ bool cdf_mem_compare(const void *pMemory1, const void *pMemory2,
 	}
 
 	if ((pMemory1 == NULL) || (pMemory2 == NULL)) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s called with NULL parameter, p1:%p p2:%p",
 			  __func__, pMemory1, pMemory2);
 		CDF_ASSERT(0);
@@ -779,9 +779,9 @@ int32_t cdf_mem_compare2(const void *pMemory1, const void *pMemory2,
  *
  * Return: pointer of allocated memory or null if memory alloc fails
  */
-inline void *cdf_os_mem_alloc_consistent(cdf_device_t osdev, cdf_size_t size,
-					 cdf_dma_addr_t *paddr,
-					 cdf_dma_context_t memctx)
+inline void *cdf_os_mem_alloc_consistent(qdf_device_t osdev, qdf_size_t size,
+					 qdf_dma_addr_t *paddr,
+					 qdf_dma_context_t memctx)
 {
 #if defined(A_SIMOS_DEVHOST)
 	static int first = 1;
@@ -792,7 +792,7 @@ inline void *cdf_os_mem_alloc_consistent(cdf_device_t osdev, cdf_size_t size,
 		pr_err("Warning: bypassing %s\n", __func__);
 	}
 	vaddr = cdf_mem_malloc(size);
-	*paddr = ((cdf_dma_addr_t) vaddr);
+	*paddr = ((qdf_dma_addr_t) vaddr);
 	return vaddr;
 #else
 	int flags = GFP_KERNEL;
@@ -819,10 +819,10 @@ inline void *cdf_os_mem_alloc_consistent(cdf_device_t osdev, cdf_size_t size,
  * Return: none
  */
 inline void
-cdf_os_mem_free_consistent(cdf_device_t osdev,
-			   cdf_size_t size,
+cdf_os_mem_free_consistent(qdf_device_t osdev,
+			   qdf_size_t size,
 			   void *vaddr,
-			   cdf_dma_addr_t paddr, cdf_dma_context_t memctx)
+			   qdf_dma_addr_t paddr, qdf_dma_context_t memctx)
 {
 #if defined(A_SIMOS_DEVHOST)
 	static int first = 1;
@@ -853,9 +853,9 @@ cdf_os_mem_free_consistent(cdf_device_t osdev,
  */
 
 inline void
-cdf_os_mem_dma_sync_single_for_device(cdf_device_t osdev,
-				      cdf_dma_addr_t bus_addr,
-				      cdf_size_t size,
+cdf_os_mem_dma_sync_single_for_device(qdf_device_t osdev,
+				      qdf_dma_addr_t bus_addr,
+				      qdf_size_t size,
 				      enum dma_data_direction direction)
 {
 	dma_sync_single_for_device(osdev->dev, bus_addr,  size, direction);

core/cdf/src/cdf_nbuf.c

@@ -40,7 +40,7 @@
 #include <linux/if_vlan.h>
 #include <linux/ip.h>
 #endif /* FEATURE_TSO */
-#include <cdf_types.h>
+#include <qdf_types.h>
 #include <cdf_nbuf.h>
 #include <cdf_memory.h>
 #include <cdf_trace.h>
@@ -58,9 +58,9 @@ static uint32_t nbuf_tx_data[NBUF_TX_PKT_STATE_MAX];
  */
 void cdf_nbuf_tx_desc_count_display(void)
 {
-	cdf_print("Current Snapshot of the Driver:\n");
-	cdf_print("Data Packets:\n");
-	cdf_print("HDD %d TXRX_Q %d TXRX %d HTT %d",
+	qdf_print("Current Snapshot of the Driver:\n");
+	qdf_print("Data Packets:\n");
+	qdf_print("HDD %d TXRX_Q %d TXRX %d HTT %d",
 		nbuf_tx_data[NBUF_TX_PKT_HDD] -
 		(nbuf_tx_data[NBUF_TX_PKT_TXRX] +
 		nbuf_tx_data[NBUF_TX_PKT_TXRX_ENQUEUE] -
@@ -69,13 +69,13 @@ void cdf_nbuf_tx_desc_count_display(void)
 		nbuf_tx_data[NBUF_TX_PKT_TXRX_DEQUEUE],
 		nbuf_tx_data[NBUF_TX_PKT_TXRX] - nbuf_tx_data[NBUF_TX_PKT_HTT],
 		nbuf_tx_data[NBUF_TX_PKT_HTT]  - nbuf_tx_data[NBUF_TX_PKT_HTC]);
-	cdf_print(" HTC %d  HIF %d CE %d TX_COMP %d\n",
+	qdf_print(" HTC %d  HIF %d CE %d TX_COMP %d\n",
 		nbuf_tx_data[NBUF_TX_PKT_HTC]  - nbuf_tx_data[NBUF_TX_PKT_HIF],
 		nbuf_tx_data[NBUF_TX_PKT_HIF]  - nbuf_tx_data[NBUF_TX_PKT_CE],
 		nbuf_tx_data[NBUF_TX_PKT_CE]   - nbuf_tx_data[NBUF_TX_PKT_FREE],
 		nbuf_tx_data[NBUF_TX_PKT_FREE]);
-	cdf_print("Mgmt Packets:\n");
-	cdf_print("TXRX_Q %d TXRX %d HTT %d HTC %d HIF %d CE %d TX_COMP %d\n",
+	qdf_print("Mgmt Packets:\n");
+	qdf_print("TXRX_Q %d TXRX %d HTT %d HTC %d HIF %d CE %d TX_COMP %d\n",
 		nbuf_tx_mgmt[NBUF_TX_PKT_TXRX_ENQUEUE] -
 		nbuf_tx_mgmt[NBUF_TX_PKT_TXRX_DEQUEUE],
 		nbuf_tx_mgmt[NBUF_TX_PKT_TXRX] - nbuf_tx_mgmt[NBUF_TX_PKT_HTT],
@@ -164,7 +164,7 @@ cdf_nbuf_trace_update_t trace_update_cb;
  *
  * Return: nbuf or %NULL if no memory
  */
-struct sk_buff *__cdf_nbuf_alloc(cdf_device_t osdev, size_t size, int reserve,
+struct sk_buff *__cdf_nbuf_alloc(qdf_device_t osdev, size_t size, int reserve,
 				 int align, int prio)
 {
 	struct sk_buff *skb;
@@ -233,13 +233,13 @@ void __cdf_nbuf_free(struct sk_buff *skb)
  * Return: QDF_STATUS
  */
 QDF_STATUS
-__cdf_nbuf_map(cdf_device_t osdev, struct sk_buff *skb, cdf_dma_dir_t dir)
+__cdf_nbuf_map(qdf_device_t osdev, struct sk_buff *skb, qdf_dma_dir_t dir)
 {
 #ifdef CDF_OS_DEBUG
 	struct skb_shared_info *sh = skb_shinfo(skb);
 #endif
-	cdf_assert((dir == CDF_DMA_TO_DEVICE)
-		   || (dir == CDF_DMA_FROM_DEVICE));
+	cdf_assert((dir == QDF_DMA_TO_DEVICE)
+		   || (dir == QDF_DMA_FROM_DEVICE));
 
 	/*
 	 * Assume there's only a single fragment.
@@ -264,13 +264,13 @@ __cdf_nbuf_map(cdf_device_t osdev, struct sk_buff *skb, cdf_dma_dir_t dir)
  * Return: none
  */
 void
-__cdf_nbuf_unmap(cdf_device_t osdev, struct sk_buff *skb, cdf_dma_dir_t dir)
+__cdf_nbuf_unmap(qdf_device_t osdev, struct sk_buff *skb, qdf_dma_dir_t dir)
 {
-	cdf_assert((dir == CDF_DMA_TO_DEVICE)
-		   || (dir == CDF_DMA_FROM_DEVICE));
+	cdf_assert((dir == QDF_DMA_TO_DEVICE)
+		   || (dir == QDF_DMA_FROM_DEVICE));
 
-	cdf_assert(((dir == CDF_DMA_TO_DEVICE)
-		    || (dir == CDF_DMA_FROM_DEVICE)));
+	cdf_assert(((dir == QDF_DMA_TO_DEVICE)
+		    || (dir == QDF_DMA_FROM_DEVICE)));
 	/*
 	 * Assume there's a single fragment.
 	 * If this is not true, the assertion in __cdf_nbuf_map will catch it.
@@ -287,7 +287,7 @@ __cdf_nbuf_unmap(cdf_device_t osdev, struct sk_buff *skb, cdf_dma_dir_t dir)
  * Return: QDF_STATUS
  */
 QDF_STATUS
-__cdf_nbuf_map_single(cdf_device_t osdev, cdf_nbuf_t buf, cdf_dma_dir_t dir)
+__cdf_nbuf_map_single(qdf_device_t osdev, cdf_nbuf_t buf, qdf_dma_dir_t dir)
 {
 	cdf_dma_addr_t paddr;
 
@@ -315,7 +315,7 @@ __cdf_nbuf_map_single(cdf_device_t osdev, cdf_nbuf_t buf, cdf_dma_dir_t dir)
  * Return: none
  */
 void
-__cdf_nbuf_unmap_single(cdf_device_t osdev, cdf_nbuf_t buf, cdf_dma_dir_t dir)
+__cdf_nbuf_unmap_single(qdf_device_t osdev, cdf_nbuf_t buf, qdf_dma_dir_t dir)
 {
 #if !defined(A_SIMOS_DEVHOST)
 	dma_unmap_single(osdev->dev, NBUF_CB_PADDR(buf),
@@ -536,7 +536,7 @@ void cdf_net_buf_debug_exit(void)
 		while (p_node) {
 			p_prev = p_node;
 			p_node = p_node->p_next;
-			CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL,
+			CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL,
 				  "SKB buf memory Leak@ File %s, @Line %d, size %zu\n",
 				  p_prev->file_name, p_prev->line_num,
 				  p_prev->size);
@@ -632,7 +632,7 @@ void cdf_net_buf_debug_add_node(cdf_nbuf_t net_buf, size_t size,
 	p_node = cdf_net_buf_debug_look_up(net_buf);
 
 	if (p_node) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "Double allocation of skb ! Already allocated from %s %d",
 			  p_node->file_name, p_node->line_num);
 		CDF_ASSERT(0);
@@ -647,7 +647,7 @@ void cdf_net_buf_debug_add_node(cdf_nbuf_t net_buf, size_t size,
 			p_node->p_next = gp_cdf_net_buf_track_tbl[i];
 			gp_cdf_net_buf_track_tbl[i] = p_node;
 		} else {
-			CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+			CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 				  "Mem alloc failed ! Could not track skb from %s %d of size %zu",
 				  file_name, line_num, size);
 			CDF_ASSERT(0);
@@ -706,7 +706,7 @@ void cdf_net_buf_debug_delete_node(cdf_nbuf_t net_buf)
 
 done:
 	if (!found) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "Unallocated buffer ! Double free of net_buf %p ?",
 			  net_buf);
 		CDF_ASSERT(0);
@@ -771,7 +771,7 @@ uint8_t __cdf_nbuf_get_tso_cmn_seg_info(struct sk_buff *skb,
 		tso_info->ipv4_csum_en = 1;
 		tso_info->tcp_ipv4_csum_en = 1;
 		if (cdf_unlikely(ipv4_hdr->protocol != IPPROTO_TCP)) {
-			cdf_print("TSO IPV4 proto 0x%x not TCP\n",
+			qdf_print("TSO IPV4 proto 0x%x not TCP\n",
 				 ipv4_hdr->protocol);
 			return 1;
 		}
@@ -779,7 +779,7 @@ uint8_t __cdf_nbuf_get_tso_cmn_seg_info(struct sk_buff *skb,
 		/* for IPv6, enable TCP csum. No IP ID or IP csum */
 		tso_info->tcp_ipv6_csum_en = 1;
 	} else {
-		cdf_print("TSO: ethertype 0x%x is not supported!\n",
+		qdf_print("TSO: ethertype 0x%x is not supported!\n",
 			 tso_info->ethproto);
 		return 1;
 	}
@@ -826,8 +826,8 @@ static inline void cdf_dmaaddr_to_32s(cdf_dma_addr_t dmaaddr,
  *
  * Return: number of TSO segments
  */
-uint32_t __cdf_nbuf_get_tso_info(cdf_device_t osdev, struct sk_buff *skb,
-		struct cdf_tso_info_t *tso_info)
+uint32_t __cdf_nbuf_get_tso_info(qdf_device_t osdev, struct sk_buff *skb,
+		struct qdf_tso_info_t *tso_info)
 {
 	/* common accross all segments */
 	struct cdf_tso_cmn_seg_info_t tso_cmn_info;
@@ -848,7 +848,7 @@ uint32_t __cdf_nbuf_get_tso_info(cdf_device_t osdev, struct sk_buff *skb,
 	memset(&tso_cmn_info, 0x0, sizeof(tso_cmn_info));
 
 	if (cdf_unlikely(__cdf_nbuf_get_tso_cmn_seg_info(skb, &tso_cmn_info))) {
-		cdf_print("TSO: error getting common segment info\n");
+		qdf_print("TSO: error getting common segment info\n");
 		return 0;
 	}
 	curr_seg = tso_info->tso_seg_list;

core/cdf/src/cdf_trace.c

@@ -70,23 +70,23 @@ typedef struct {
  * information.  This includes the trace level for the module and
  * the 3 character 'name' of the module for marking the trace logs
  */
-moduleTraceInfo g_cdf_trace_info[CDF_MODULE_ID_MAX] = {
-	[CDF_MODULE_ID_TLSHIM] = {CDF_DEFAULT_TRACE_LEVEL, "DP"},
-	[CDF_MODULE_ID_WMI] = {CDF_DEFAULT_TRACE_LEVEL, "WMI"},
-	[CDF_MODULE_ID_HDD] = {CDF_DEFAULT_TRACE_LEVEL, "HDD"},
-	[CDF_MODULE_ID_SME] = {CDF_DEFAULT_TRACE_LEVEL, "SME"},
-	[CDF_MODULE_ID_PE] = {CDF_DEFAULT_TRACE_LEVEL, "PE "},
-	[CDF_MODULE_ID_WMA] = {CDF_DEFAULT_TRACE_LEVEL, "WMA"},
-	[CDF_MODULE_ID_SYS] = {CDF_DEFAULT_TRACE_LEVEL, "SYS"},
-	[CDF_MODULE_ID_CDF] = {CDF_DEFAULT_TRACE_LEVEL, "CDF"},
-	[CDF_MODULE_ID_SAP] = {CDF_DEFAULT_TRACE_LEVEL, "SAP"},
-	[CDF_MODULE_ID_HDD_SOFTAP] = {CDF_DEFAULT_TRACE_LEVEL, "HSP"},
-	[CDF_MODULE_ID_HDD_DATA] = {CDF_DEFAULT_TRACE_LEVEL, "HDP"},
-	[CDF_MODULE_ID_HDD_SAP_DATA] = {CDF_DEFAULT_TRACE_LEVEL, "SDP"},
-	[CDF_MODULE_ID_BMI] = {CDF_DEFAULT_TRACE_LEVEL, "BMI"},
-	[CDF_MODULE_ID_HIF] = {CDF_DEFAULT_TRACE_LEVEL, "HIF"},
-	[CDF_MODULE_ID_TXRX] = {CDF_DEFAULT_TRACE_LEVEL, "TRX"},
-	[CDF_MODULE_ID_HTT] = {CDF_DEFAULT_TRACE_LEVEL, "HTT"},
+moduleTraceInfo g_cdf_trace_info[QDF_MODULE_ID_MAX] = {
+	[QDF_MODULE_ID_TLSHIM] = {CDF_DEFAULT_TRACE_LEVEL, "DP"},
+	[QDF_MODULE_ID_WMI] = {CDF_DEFAULT_TRACE_LEVEL, "WMI"},
+	[QDF_MODULE_ID_HDD] = {CDF_DEFAULT_TRACE_LEVEL, "HDD"},
+	[QDF_MODULE_ID_SME] = {CDF_DEFAULT_TRACE_LEVEL, "SME"},
+	[QDF_MODULE_ID_PE] = {CDF_DEFAULT_TRACE_LEVEL, "PE "},
+	[QDF_MODULE_ID_WMA] = {CDF_DEFAULT_TRACE_LEVEL, "WMA"},
+	[QDF_MODULE_ID_SYS] = {CDF_DEFAULT_TRACE_LEVEL, "SYS"},
+	[QDF_MODULE_ID_QDF] = {CDF_DEFAULT_TRACE_LEVEL, "CDF"},
+	[QDF_MODULE_ID_SAP] = {CDF_DEFAULT_TRACE_LEVEL, "SAP"},
+	[QDF_MODULE_ID_HDD_SOFTAP] = {CDF_DEFAULT_TRACE_LEVEL, "HSP"},
+	[QDF_MODULE_ID_HDD_DATA] = {CDF_DEFAULT_TRACE_LEVEL, "HDP"},
+	[QDF_MODULE_ID_HDD_SAP_DATA] = {CDF_DEFAULT_TRACE_LEVEL, "SDP"},
+	[QDF_MODULE_ID_BMI] = {CDF_DEFAULT_TRACE_LEVEL, "BMI"},
+	[QDF_MODULE_ID_HIF] = {CDF_DEFAULT_TRACE_LEVEL, "HIF"},
+	[QDF_MODULE_ID_TXRX] = {CDF_DEFAULT_TRACE_LEVEL, "TRX"},
+	[QDF_MODULE_ID_HTT] = {CDF_DEFAULT_TRACE_LEVEL, "HTT"},
 };
 
 /* Static and Global variables */
@@ -103,8 +103,8 @@ static t_cdf_trace_data g_cdf_trace_data;
  * cdf_trace_cb_table, we can certainly retrieve all the call back functions
  * back from Restore Table
  */
-static tp_cdf_trace_cb cdf_trace_cb_table[CDF_MODULE_ID_MAX];
-static tp_cdf_trace_cb cdf_trace_restore_cb_table[CDF_MODULE_ID_MAX];
+static tp_cdf_trace_cb cdf_trace_cb_table[QDF_MODULE_ID_MAX];
+static tp_cdf_trace_cb cdf_trace_restore_cb_table[QDF_MODULE_ID_MAX];
 
 /* Static and Global variables */
 static spinlock_t l_dp_trace_lock;
@@ -135,7 +135,7 @@ static tp_cdf_dp_trace_cb cdf_dp_trace_cb_table[CDF_DP_TRACE_MAX];
  *
  * Return:  nothing
  */
-void cdf_trace_set_level(CDF_MODULE_ID module, CDF_TRACE_LEVEL level)
+void cdf_trace_set_level(QDF_MODULE_ID module, CDF_TRACE_LEVEL level)
 {
 	/* make sure the caller is passing in a valid LEVEL */
 	if (level >= CDF_TRACE_LEVEL_MAX) {
@@ -167,16 +167,16 @@ void cdf_trace_set_level(CDF_MODULE_ID module, CDF_TRACE_LEVEL level)
  *
  * Return: None
  */
-void cdf_trace_set_module_trace_level(CDF_MODULE_ID module, uint32_t level)
+void cdf_trace_set_module_trace_level(QDF_MODULE_ID module, uint32_t level)
 {
-	if (module < 0 || module >= CDF_MODULE_ID_MAX) {
+	if (module < 0 || module >= QDF_MODULE_ID_MAX) {
 		pr_err("%s: Invalid module id %d passed\n", __func__, module);
 		return;
 	}
 	g_cdf_trace_info[module].moduleTraceLevel = level;
 }
 
-void cdf_trace_set_value(CDF_MODULE_ID module, CDF_TRACE_LEVEL level,
+void cdf_trace_set_value(QDF_MODULE_ID module, CDF_TRACE_LEVEL level,
 			 uint8_t on)
 {
 	/* make sure the caller is passing in a valid LEVEL */
@@ -187,7 +187,7 @@ void cdf_trace_set_value(CDF_MODULE_ID module, CDF_TRACE_LEVEL level,
 	}
 
 	/* make sure the caller is passing in a valid module */
-	if (module < 0 || module >= CDF_MODULE_ID_MAX) {
+	if (module < 0 || module >= QDF_MODULE_ID_MAX) {
 		pr_err("%s: Invalid module id %d passed in!\n", __func__,
 		       module);
 		return;
@@ -234,7 +234,7 @@ void cdf_trace_set_value(CDF_MODULE_ID module, CDF_TRACE_LEVEL level,
  *      false - the specified trace level for the specified module is OFF
  *      true - the specified trace level for the specified module is ON
  */
-bool cdf_trace_get_level(CDF_MODULE_ID module, CDF_TRACE_LEVEL level)
+bool cdf_trace_get_level(QDF_MODULE_ID module, CDF_TRACE_LEVEL level)
 {
 	bool traceOn = false;
 
@@ -262,7 +262,7 @@ void cdf_snprintf(char *strBuffer, unsigned int size, char *strFormat, ...)
 
 /**
  * cdf_trace_msg() - externally called trace function
- * @module : Module identifier a member of the CDF_MODULE_ID
+ * @module : Module identifier a member of the QDF_MODULE_ID
  *	enumeration that identifies the module issuing the trace message.
  * @level : Trace level a member of the CDF_TRACE_LEVEL enumeration
  *	indicating the severity of the condition causing the trace message
@@ -276,7 +276,7 @@ void cdf_snprintf(char *strBuffer, unsigned int size, char *strFormat, ...)
  *  Return:  nothing
  *
  */
-void cdf_trace_msg(CDF_MODULE_ID module, CDF_TRACE_LEVEL level,
+void cdf_trace_msg(QDF_MODULE_ID module, CDF_TRACE_LEVEL level,
 		   char *strFormat, ...)
 {
 	char strBuffer[CDF_TRACE_BUFFER_SIZE];
@@ -322,11 +322,11 @@ void cdf_trace_msg(CDF_MODULE_ID module, CDF_TRACE_LEVEL level,
 
 void cdf_trace_display(void)
 {
-	CDF_MODULE_ID moduleId;
+	QDF_MODULE_ID moduleId;
 
 	pr_err
 		("     1)FATAL  2)ERROR  3)WARN  4)INFO  5)INFO_H  6)INFO_M  7)INFO_L 8)DEBUG\n");
-	for (moduleId = 0; moduleId < CDF_MODULE_ID_MAX; ++moduleId) {
+	for (moduleId = 0; moduleId < QDF_MODULE_ID_MAX; ++moduleId) {
 		pr_err
 			("%2d)%s    %s        %s       %s       %s        %s         %s         %s        %s\n",
 			(int)moduleId, g_cdf_trace_info[moduleId].moduleNameStr,
@@ -363,7 +363,7 @@ void cdf_trace_display(void)
 
 /**
  * cdf_trace_hex_dump() - externally called hex dump function
- * @module : Module identifier a member of the CDF_MODULE_ID enumeration that
+ * @module : Module identifier a member of the QDF_MODULE_ID enumeration that
  *	     identifies the module issuing the trace message.
  * @level : Trace level a member of the CDF_TRACE_LEVEL enumeration indicating
  *	    the severity of the condition causing the trace message to be
@@ -375,7 +375,7 @@ void cdf_trace_display(void)
  *
  *  Return :  nothing
  */
-void cdf_trace_hex_dump(CDF_MODULE_ID module, CDF_TRACE_LEVEL level,
+void cdf_trace_hex_dump(QDF_MODULE_ID module, CDF_TRACE_LEVEL level,
 			void *data, int buf_len)
 {
 	const u8 *ptr = data;
@@ -423,7 +423,7 @@ void cdf_trace_enable(uint32_t bitmask_of_moduleId, uint8_t enable)
 {
 	int i;
 	if (bitmask_of_moduleId) {
-		for (i = 0; i < CDF_MODULE_ID_MAX; i++) {
+		for (i = 0; i < QDF_MODULE_ID_MAX; i++) {
 			if (((bitmask_of_moduleId >> i) & 1)) {
 				if (enable) {
 					if (NULL !=
@@ -440,14 +440,14 @@ void cdf_trace_enable(uint32_t bitmask_of_moduleId, uint8_t enable)
 		}
 	} else {
 		if (enable) {
-			for (i = 0; i < CDF_MODULE_ID_MAX; i++) {
+			for (i = 0; i < QDF_MODULE_ID_MAX; i++) {
 				if (NULL != cdf_trace_restore_cb_table[i]) {
 					cdf_trace_cb_table[i] =
 						cdf_trace_restore_cb_table[i];
 				}
 			}
 		} else {
-			for (i = 0; i < CDF_MODULE_ID_MAX; i++) {
+			for (i = 0; i < QDF_MODULE_ID_MAX; i++) {
 				cdf_trace_restore_cb_table[i] =
 					cdf_trace_cb_table[i];
 				cdf_trace_cb_table[i] = NULL;
@@ -474,7 +474,7 @@ void cdf_trace_init(void)
 	g_cdf_trace_data.dumpCount = DEFAULT_CDF_TRACE_DUMP_COUNT;
 	g_cdf_trace_data.numSinceLastDump = 0;
 
-	for (i = 0; i < CDF_MODULE_ID_MAX; i++) {
+	for (i = 0; i < QDF_MODULE_ID_MAX; i++) {
 		cdf_trace_cb_table[i] = NULL;
 		cdf_trace_restore_cb_table[i] = NULL;
 	}
@@ -574,7 +574,7 @@ QDF_STATUS cdf_trace_spin_lock_init(void)
  *
  * Return : nothing
  */
-void cdf_trace_register(CDF_MODULE_ID moduleID,
+void cdf_trace_register(QDF_MODULE_ID moduleID,
 			tp_cdf_trace_cb cdf_trace_callback)
 {
 	cdf_trace_cb_table[moduleID] = cdf_trace_callback;
@@ -607,12 +607,12 @@ void cdf_trace_dump_all(void *pMac, uint8_t code, uint8_t session,
 	int32_t i, tail;
 
 	if (!g_cdf_trace_data.enable) {
-		CDF_TRACE(CDF_MODULE_ID_SYS,
+		CDF_TRACE(QDF_MODULE_ID_SYS,
 			  CDF_TRACE_LEVEL_ERROR, "Tracing Disabled");
 		return;
 	}
 
-	CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO,
+	CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO,
 		  "Total Records: %d, Head: %d, Tail: %d",
 		  g_cdf_trace_data.num, g_cdf_trace_data.head,
 		  g_cdf_trace_data.tail);
@@ -780,10 +780,10 @@ static void dump_hex_trace(uint8_t *buf, uint8_t buf_len)
 {
 	uint8_t i = 0;
 	/* Dump the bytes in the last line */
-	cdf_print("DATA: ");
+	qdf_print("DATA: ");
 	for (i = 0; i < buf_len; i++)
-		cdf_print("%02x ", buf[i]);
-	cdf_print("\n");
+		qdf_print("%02x ", buf[i]);
+	qdf_print("\n");
 }
 
 /**
@@ -796,23 +796,23 @@ static void dump_hex_trace(uint8_t *buf, uint8_t buf_len)
 void cdf_dp_display_record(struct cdf_dp_trace_record_s *pRecord,
 				uint16_t recIndex)
 {
-	cdf_print("INDEX: %04d TIME: %012llu CODE: %02d\n", recIndex,
+	qdf_print("INDEX: %04d TIME: %012llu CODE: %02d\n", recIndex,
 						pRecord->time, pRecord->code);
 	switch (pRecord->code) {
 	case  CDF_DP_TRACE_HDD_TX_TIMEOUT:
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 						"HDD TX Timeout\n");
 		break;
 	case  CDF_DP_TRACE_HDD_SOFTAP_TX_TIMEOUT:
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 						"HDD SoftAP TX Timeout\n");
 		break;
 	case  CDF_DP_TRACE_VDEV_PAUSE:
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 						"VDEV Pause\n");
 		break;
 	case  CDF_DP_TRACE_VDEV_UNPAUSE:
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 						"VDEV UnPause\n");
 		break;
 	default:
@@ -960,12 +960,12 @@ void cdf_dp_trace_dump_all(uint32_t count)
 	int32_t i, tail;
 
 	if (!g_cdf_dp_trace_data.enable) {
-		CDF_TRACE(CDF_MODULE_ID_SYS,
+		CDF_TRACE(QDF_MODULE_ID_SYS,
 			  CDF_TRACE_LEVEL_ERROR, "Tracing Disabled");
 		return;
 	}
 
-	CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR,
+	CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR,
 		  "Total Records: %d, Head: %d, Tail: %d",
 		  g_cdf_dp_trace_data.num, g_cdf_dp_trace_data.head,
 		  g_cdf_dp_trace_data.tail);

core/cdf/src/i_cdf_lock.h

@@ -36,7 +36,7 @@
  */
 
 /* Include Files */
-#include <cdf_types.h>
+#include <qdf_types.h>
 #include <linux/mutex.h>
 #include <linux/spinlock.h>
 #include <linux/sched.h>
@@ -116,7 +116,7 @@ static inline QDF_STATUS __cdf_semaphore_init(struct semaphore *m)
  * Return: 0
  */
 static inline int
-__cdf_semaphore_acquire(cdf_device_t osdev, struct semaphore *m)
+__cdf_semaphore_acquire(qdf_device_t osdev, struct semaphore *m)
 {
 	down(m);
 	return 0;
@@ -129,7 +129,7 @@ __cdf_semaphore_acquire(cdf_device_t osdev, struct semaphore *m)
  * Return: result of UP operation in integer
  */
 static inline void
-__cdf_semaphore_release(cdf_device_t osdev, struct semaphore *m)
+__cdf_semaphore_release(qdf_device_t osdev, struct semaphore *m)
 {
 	up(m);
 }

core/cdf/src/i_cdf_mc_timer.h

@@ -36,7 +36,7 @@
 
 /* Include Files */
 #include <cdf_mc_timer.h>
-#include <cdf_types.h>
+#include <qdf_types.h>
 #include <linux/timer.h>
 #include <linux/time.h>
 #include <linux/jiffies.h>

core/cdf/src/i_cdf_nbuf.h

@@ -37,7 +37,7 @@
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/dma-mapping.h>
-#include <cdf_types.h>
+#include <qdf_types.h>
 #include <qdf_status.h>
 
 /*
@@ -331,17 +331,17 @@ typedef void (*cdf_nbuf_trace_update_t)(char *);
 /*
  * prototypes. Implemented in cdf_nbuf.c
  */
-__cdf_nbuf_t __cdf_nbuf_alloc(__cdf_device_t osdev, size_t size, int reserve,
+__cdf_nbuf_t __cdf_nbuf_alloc(__qdf_device_t osdev, size_t size, int reserve,
 			      int align, int prio);
 void __cdf_nbuf_free(struct sk_buff *skb);
-QDF_STATUS __cdf_nbuf_map(__cdf_device_t osdev,
-			  struct sk_buff *skb, cdf_dma_dir_t dir);
-void __cdf_nbuf_unmap(__cdf_device_t osdev,
-		      struct sk_buff *skb, cdf_dma_dir_t dir);
-QDF_STATUS __cdf_nbuf_map_single(__cdf_device_t osdev,
-				 struct sk_buff *skb, cdf_dma_dir_t dir);
-void __cdf_nbuf_unmap_single(__cdf_device_t osdev,
-			     struct sk_buff *skb, cdf_dma_dir_t dir);
+QDF_STATUS __cdf_nbuf_map(__qdf_device_t osdev,
+			  struct sk_buff *skb, qdf_dma_dir_t dir);
+void __cdf_nbuf_unmap(__qdf_device_t osdev,
+		      struct sk_buff *skb, qdf_dma_dir_t dir);
+QDF_STATUS __cdf_nbuf_map_single(__qdf_device_t osdev,
+				 struct sk_buff *skb, qdf_dma_dir_t dir);
+void __cdf_nbuf_unmap_single(__qdf_device_t osdev,
+			     struct sk_buff *skb, qdf_dma_dir_t dir);
 void __cdf_nbuf_reg_trace_cb(cdf_nbuf_trace_update_t cb_func_ptr);
 
 #ifdef QCA_PKT_PROTO_TRACE
@@ -825,8 +825,8 @@ __cdf_nbuf_set_protocol(struct sk_buff *skb, uint16_t protocol)
 	NBUF_CB_TX_HL_HTT2_FRM(skb)
 
 #if defined(FEATURE_TSO)
-uint32_t __cdf_nbuf_get_tso_info(cdf_device_t osdev, struct sk_buff *skb,
-	struct cdf_tso_info_t *tso_info);
+uint32_t __cdf_nbuf_get_tso_info(qdf_device_t osdev, struct sk_buff *skb,
+	struct qdf_tso_info_t *tso_info);
 
 uint32_t __cdf_nbuf_get_tso_num_seg(struct sk_buff *skb);
 

core/cdf/src/i_cdf_trace.h

@@ -43,7 +43,7 @@
 
 /**
  * cdf_trace_msg()- logging API
- * @module: Module identifier. A member of the CDF_MODULE_ID enumeration that
+ * @module: Module identifier. A member of the QDF_MODULE_ID enumeration that
  *	    identifies the module issuing the trace message.
  * @level: Trace level. A member of the CDF_TRACE_LEVEL enumeration indicating
  *	   the severity of the condition causing the trace message to be issued.
@@ -59,18 +59,18 @@
  * Return: nothing
  *
  */
-void __printf(3, 4) cdf_trace_msg(CDF_MODULE_ID module, CDF_TRACE_LEVEL level,
+void __printf(3, 4) cdf_trace_msg(QDF_MODULE_ID module, CDF_TRACE_LEVEL level,
 				  char *strFormat, ...);
 
-void cdf_trace_hex_dump(CDF_MODULE_ID module, CDF_TRACE_LEVEL level,
+void cdf_trace_hex_dump(QDF_MODULE_ID module, CDF_TRACE_LEVEL level,
 			void *data, int buf_len);
 
 void cdf_trace_display(void);
 
-void cdf_trace_set_value(CDF_MODULE_ID module, CDF_TRACE_LEVEL level,
+void cdf_trace_set_value(QDF_MODULE_ID module, CDF_TRACE_LEVEL level,
 			 uint8_t on);
 
-void cdf_trace_set_module_trace_level(CDF_MODULE_ID module, uint32_t level);
+void cdf_trace_set_module_trace_level(QDF_MODULE_ID module, uint32_t level);
 
 /* CDF_TRACE is the macro invoked to add trace messages to code.  See the
  * documenation for cdf_trace_msg() for the parameters etc. for this function.
@@ -110,7 +110,7 @@ void __printf(3, 4) cdf_snprintf(char *strBuffer, unsigned int size,
 
 /* This code will be used for compilation if tracing is to be compiled out */
 /* of the code so these functions/macros are 'do nothing' */
-CDF_INLINE_FN void cdf_trace_msg(CDF_MODULE_ID module, ...)
+static inline void cdf_trace_msg(QDF_MODULE_ID module, ...)
 {
 }
 

core/cdf/src/i_cdf_types.h

@@ -1,234 +0,0 @@
-/*
- * Copyright (c) 2014-2015 The Linux Foundation. All rights reserved.
- *
- * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
- *
- *
- * Permission to use, copy, modify, and/or distribute this software for
- * any purpose with or without fee is hereby granted, provided that the
- * above copyright notice and this permission notice appear in all
- * copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
- * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*
- * This file was originally distributed by Qualcomm Atheros, Inc.
- * under proprietary terms before Copyright ownership was assigned
- * to the Linux Foundation.
- */
-
-/**
- * DOC: i_cdf_types.h
- *
- * Connectivity driver framework (CDF) types
- */
-
-#if !defined(__I_CDF_TYPES_H)
-#define __I_CDF_TYPES_H
-#include <linux/list.h>
-#include <linux/mutex.h>
-#include <linux/types.h>
-#include <linux/sched.h>
-#include <linux/completion.h>
-#include <linux/string.h>
-#include <linux/slab.h>
-#include <linux/interrupt.h>
-#include <linux/version.h>
-#include <asm/div64.h>
-
-#ifndef __KERNEL__
-#define __iomem
-#endif
-#include <asm/types.h>
-#include <asm/byteorder.h>
-#include <linux/version.h>
-
-#ifdef __KERNEL__
-#include <generated/autoconf.h>
-#include <linux/compiler.h>
-#include <linux/dma-mapping.h>
-#include <linux/wireless.h>
-#include <linux/if.h>
-#else
-
-/*
- * Hack - coexist with prior defs of dma_addr_t.
- * Eventually all other defs of dma_addr_t should be removed.
- * At that point, the "already_defined" wrapper can be removed.
- */
-#ifndef __dma_addr_t_already_defined__
-#define __dma_addr_t_already_defined__
-typedef unsigned long dma_addr_t;
-#endif
-
-#define SIOCGIWAP       0
-#define IWEVCUSTOM      0
-#define IWEVREGISTERED  0
-#define IWEVEXPIRED     0
-#define SIOCGIWSCAN     0
-#define DMA_TO_DEVICE   0
-#define DMA_FROM_DEVICE 0
-#define __iomem
-#endif /* __KERNEL__ */
-
-/**
- * max sg that we support
- */
-#define __CDF_OS_MAX_SCATTER        1
-
-#if defined(__LITTLE_ENDIAN_BITFIELD)
-#define CDF_LITTLE_ENDIAN_MACHINE
-#elif defined (__BIG_ENDIAN_BITFIELD)
-#define CDF_BIG_ENDIAN_MACHINE
-#else
-#error  "Please fix <asm/byteorder.h>"
-#endif
-
-#define __cdf_packed          __attribute__ ((packed))
-
-typedef int (*__cdf_os_intr)(void *);
-/**
- * Private definitions of general data types
- */
-typedef dma_addr_t __cdf_dma_addr_t;
-typedef dma_addr_t __cdf_dma_context_t;
-
-#define cdf_dma_mem_context(context) dma_addr_t context
-#define cdf_get_dma_mem_context(var, field)   ((cdf_dma_context_t)(var->field))
-
-/**
- * typedef struct __cdf_resource_t - cdf resource type
- * @paddr: Physical address
- * @paddr: Virtual address
- * @len: Length
- */
-typedef struct __cdf_os_resource {
-	unsigned long paddr;
-	void __iomem *vaddr;
-	unsigned long len;
-} __cdf_resource_t;
-
-/**
- * struct __cdf_device - generic cdf device type
- * @drv: Pointer to driver
- * @drv_hdl: Pointer to driver handle
- * @drv_name: Pointer to driver name
- * @irq: IRQ
- * @dev: Pointer to device
- * @res: CDF resource
- * @func: Interrupt handler
- */
-struct __cdf_device {
-	void *drv;
-	void *drv_hdl;
-	char *drv_name;
-	int irq;
-	struct device *dev;
-	__cdf_resource_t res;
-	__cdf_os_intr func;
-};
-
-typedef struct __cdf_device *__cdf_device_t;
-
-typedef size_t __cdf_size_t;
-typedef uint8_t __iomem *__cdf_iomem_t;
-
-/**
- * typedef struct __cdf_segment_t - cdf segment
- * @daddr: DMA address
- * @len: Length
- */
-typedef struct __cdf_segment {
-	dma_addr_t daddr;
-	uint32_t len;
-} __cdf_segment_t;
-
-/**
- * struct __cdf_dma_map - dma map
- * @mapped: dma is mapped or not
- * @nsegs: Number of segments
- * @coherent: Coherent
- * @seg: Segment array
- */
-struct __cdf_dma_map {
-	uint32_t mapped;
-	uint32_t nsegs;
-	uint32_t coherent;
-	__cdf_segment_t seg[__CDF_OS_MAX_SCATTER];
-};
-typedef struct __cdf_dma_map *__cdf_dma_map_t;
-typedef uint32_t ath_dma_addr_t;
-
-#define __cdf_print               printk
-#define __cdf_vprint              vprintk
-#define __cdf_snprint             snprintf
-#define __cdf_vsnprint            vsnprintf
-
-#define __CDF_DMA_BIDIRECTIONAL  DMA_BIDIRECTIONAL
-#define __CDF_DMA_TO_DEVICE      DMA_TO_DEVICE
-#define __CDF_DMA_FROM_DEVICE    DMA_FROM_DEVICE
-#define __cdf_inline             inline
-
-/*
- * 1. GNU C/C++ Compiler
- *
- * How to detect gcc : __GNUC__
- * How to detect gcc version :
- *   major version : __GNUC__ (2 = 2.x, 3 = 3.x, 4 = 4.x)
- *   minor version : __GNUC_MINOR__
- *
- * 2. Microsoft C/C++ Compiler
- *
- * How to detect msc : _MSC_VER
- * How to detect msc version :
- *   _MSC_VER (1200 = MSVC 6.0, 1300 = MSVC 7.0, ...)
- *
- */
-
-/* MACROs to help with compiler and OS specifics. May need to get a little
- * more sophisticated than this and define these to specific 'VERSIONS' of
- * the compiler and OS.  Until we have a need for that, lets go with this
- */
-#if defined(_MSC_VER)
-
-#define CDF_COMPILER_MSC
-/* assuming that if we build with MSC, OS is WinMobile */
-#define CDF_OS_WINMOBILE
-
-#elif defined(__GNUC__)
-
-#define CDF_COMPILER_GNUC
-#define CDF_OS_LINUX /* assuming if building with GNUC, OS is Linux */
-
-#endif
-
-#if defined(CDF_COMPILER_MSC)
-
-#define CDF_INLINE_FN  __inline
-
-/* Does nothing on Windows.  packing individual structs is not
- * supported on the Windows compiler
- */
-#define CDF_PACK_STRUCT_1
-#define CDF_PACK_STRUCT_2
-#define CDF_PACK_STRUCT_4
-#define CDF_PACK_STRUCT_8
-#define CDF_PACK_STRUCT_16
-
-#elif defined(CDF_COMPILER_GNUC)
-
-#define CDF_INLINE_FN  static inline
-
-#else
-#error "Compiling with an unknown compiler!!"
-#endif
-
-#endif /* __I_CDF_TYPES_H */

core/cdf/src/i_cdf_util.h

@@ -35,7 +35,7 @@
 
 #include <linux/random.h>
 
-#include <cdf_types.h>
+#include <qdf_types.h>
 #include <qdf_status.h>
 #include <asm/byteorder.h>
 /*

core/cds/inc/cds_api.h

@@ -34,7 +34,7 @@
  *
  */
 
-#include <cdf_types.h>
+#include <qdf_types.h>
 #include <qdf_status.h>
 #include <cdf_memory.h>
 #include <qdf_list.h>
@@ -199,17 +199,17 @@ QDF_STATUS cds_shutdown(v_CONTEXT_t cds_context);
 
 void cds_core_return_msg(void *pVContext, p_cds_msg_wrapper pMsgWrapper);
 
-void *cds_get_context(CDF_MODULE_ID moduleId);
+void *cds_get_context(QDF_MODULE_ID moduleId);
 
 v_CONTEXT_t cds_get_global_context(void);
 
-QDF_STATUS cds_alloc_context(void *p_cds_context, CDF_MODULE_ID moduleID,
+QDF_STATUS cds_alloc_context(void *p_cds_context, QDF_MODULE_ID moduleID,
 			     void **ppModuleContext, uint32_t size);
 
-QDF_STATUS cds_free_context(void *p_cds_context, CDF_MODULE_ID moduleID,
+QDF_STATUS cds_free_context(void *p_cds_context, QDF_MODULE_ID moduleID,
 			    void *pModuleContext);
 
-QDF_STATUS cds_set_context(CDF_MODULE_ID moduleID, void *context);
+QDF_STATUS cds_set_context(QDF_MODULE_ID moduleID, void *context);
 
 QDF_STATUS cds_get_vdev_types(enum tCDF_ADAPTER_MODE mode, uint32_t *type,
 			      uint32_t *subType);

core/cds/inc/cds_concurrency.h

@@ -465,8 +465,8 @@ struct cds_conc_connection_info {
 
 bool cds_is_connection_in_progress(void);
 void cds_dump_concurrency_info(void);
-void cds_set_concurrency_mode(enum tCDF_ADAPTER_MODE mode);
-void cds_clear_concurrency_mode(enum tCDF_ADAPTER_MODE mode);
+void cds_set_concurrency_mode(enum tQDF_ADAPTER_MODE mode);
+void cds_clear_concurrency_mode(enum tQDF_ADAPTER_MODE mode);
 uint32_t cds_get_connection_count(void);
 bool cds_is_sta_connection_pending(void);
 void cds_change_sta_conn_pending_status(bool value);
@@ -549,11 +549,11 @@ static inline void cds_check_and_restart_sap_with_non_dfs_acs(void)
 
 }
 #endif /* FEATURE_WLAN_STA_AP_MODE_DFS_DISABLE */
-void cds_incr_active_session(enum tCDF_ADAPTER_MODE mode,
+void cds_incr_active_session(enum tQDF_ADAPTER_MODE mode,
 				uint8_t sessionId);
-void cds_decr_active_session(enum tCDF_ADAPTER_MODE mode,
+void cds_decr_active_session(enum tQDF_ADAPTER_MODE mode,
 				uint8_t sessionId);
-void cds_decr_session_set_pcl(enum tCDF_ADAPTER_MODE mode,
+void cds_decr_session_set_pcl(enum tQDF_ADAPTER_MODE mode,
 		uint8_t session_id);
 QDF_STATUS cds_init_policy_mgr(void);
 QDF_STATUS cds_deinit_policy_mgr(void);
@@ -638,12 +638,12 @@ void cds_set_dual_mac_fw_mode_config(uint8_t dbs,
 void cds_soc_set_dual_mac_cfg_cb(enum set_hw_mode_status status,
 		uint32_t scan_config,
 		uint32_t fw_mode_config);
-bool cds_map_concurrency_mode(enum tCDF_ADAPTER_MODE *old_mode,
+bool cds_map_concurrency_mode(enum tQDF_ADAPTER_MODE *old_mode,
 		enum cds_con_mode *new_mode);
 QDF_STATUS cds_get_channel_from_scan_result(hdd_adapter_t *adapter,
 		tCsrRoamProfile *roam_profile, uint8_t *channel);
 
-enum tCDF_GLOBAL_CON_MODE cds_get_conparam(void);
+enum tQDF_GLOBAL_CON_MODE cds_get_conparam(void);
 bool cds_concurrent_open_sessions_running(void);
 bool cds_max_concurrent_connections_reached(void);
 void cds_clear_concurrent_session_count(void);

core/cds/inc/cds_crypto.h

@@ -34,7 +34,7 @@
  *
  */
 
-#include <cdf_types.h>
+#include <qdf_types.h>
 #include <qdf_status.h>
 #include <cdf_memory.h>
 #include <qdf_list.h>

core/cds/inc/cds_mq.h

@@ -41,7 +41,7 @@
 /*--------------------------------------------------------------------------
    Include Files
    ------------------------------------------------------------------------*/
-#include <cdf_types.h>
+#include <qdf_types.h>
 #include <qdf_status.h>
 
 /*--------------------------------------------------------------------------
@@ -92,16 +92,16 @@ typedef struct cds_msg_s {
 /* Message Queue IDs */
 typedef enum {
 	/* Message Queue ID for messages bound for SME */
-	CDS_MQ_ID_SME = CDF_MODULE_ID_SME,
+	CDS_MQ_ID_SME = QDF_MODULE_ID_SME,
 
 	/* Message Queue ID for messages bound for PE */
-	CDS_MQ_ID_PE = CDF_MODULE_ID_PE,
+	CDS_MQ_ID_PE = QDF_MODULE_ID_PE,
 
 	/* Message Queue ID for messages bound for WMA */
-	CDS_MQ_ID_WMA = CDF_MODULE_ID_WMA,
+	CDS_MQ_ID_WMA = QDF_MODULE_ID_WMA,
 
 	/* Message Queue ID for messages bound for the SYS module */
-	CDS_MQ_ID_SYS = CDF_MODULE_ID_SYS,
+	CDS_MQ_ID_SYS = QDF_MODULE_ID_SYS,
 
 } CDS_MQ_ID;
 

core/cds/inc/cds_packet.h

@@ -41,7 +41,7 @@
 /*--------------------------------------------------------------------------
    Include Files
    ------------------------------------------------------------------------*/
-#include <cdf_types.h>
+#include <qdf_types.h>
 #include <qdf_status.h>
 
 /*--------------------------------------------------------------------------

core/cds/inc/cds_sched.h

@@ -40,13 +40,13 @@
    Include Files
    ------------------------------------------------------------------------*/
 #include <qdf_event.h>
-#include "i_cdf_types.h"
+#include <i_qdf_types.h>
 #include <linux/wait.h>
 #if defined(WLAN_OPEN_SOURCE) && defined(CONFIG_HAS_WAKELOCK)
 #include <linux/wakelock.h>
 #endif
 #include <cds_mq.h>
-#include <cdf_types.h>
+#include <qdf_types.h>
 #include "cdf_lock.h"
 
 #define TX_POST_EVENT_MASK               0x001
@@ -269,7 +269,7 @@ typedef struct _cds_context_type {
 	 * while allocating dma memory
 	 * to access dev information.
 	 */
-	cdf_device_t cdf_ctx;
+	qdf_device_t cdf_ctx;
 
 	void *pdev_txrx_ctx;
 

core/cds/inc/cds_utils.h

@@ -41,7 +41,7 @@
 /*--------------------------------------------------------------------------
    Include Files
    ------------------------------------------------------------------------*/
-#include <cdf_types.h>
+#include <qdf_types.h>
 #include <qdf_status.h>
 #include <qdf_event.h>
 #include "ani_global.h"
@@ -66,7 +66,7 @@
 #define CDS_CHAN_15_FREQ       (2512)
 #define CDS_CHAN_170_FREQ      (5852)
 
-#define cds_log(level, args...) CDF_TRACE(CDF_MODULE_ID_CDF, level, ## args)
+#define cds_log(level, args...) CDF_TRACE(QDF_MODULE_ID_QDF, level, ## args)
 #define cds_logfl(level, format, args...) cds_log(level, FL(format), ## args)
 
 #define cds_alert(format, args...) \

core/cds/src/cds_concurrency.c

@@ -43,7 +43,7 @@
 #include "wlan_hdd_trace.h"
 #include "wlan_hdd_hostapd.h"
 #include "cds_concurrency.h"
-#include "cdf_types.h"
+#include "qdf_types.h"
 #include "cdf_trace.h"
 
 #include <net/addrconf.h>
@@ -1921,7 +1921,7 @@ bool cds_is_sta_connection_pending(void)
 	bool status;
 	hdd_context_t *hdd_ctx;
 
-	hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD);
+	hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (!hdd_ctx) {
 		cds_err("HDD context is NULL");
 		return false;
@@ -1946,7 +1946,7 @@ void cds_change_sta_conn_pending_status(bool value)
 {
 	hdd_context_t *hdd_ctx;
 
-	hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD);
+	hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (!hdd_ctx) {
 		cds_err("HDD context is NULL");
 		return;
@@ -1970,7 +1970,7 @@ static bool cds_is_sap_restart_required(void)
 	bool status;
 	hdd_context_t *hdd_ctx;
 
-	hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD);
+	hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (!hdd_ctx) {
 		cds_err("HDD context is NULL");
 		return false;
@@ -1995,7 +1995,7 @@ void cds_change_sap_restart_required_status(bool value)
 {
 	hdd_context_t *hdd_ctx;
 
-	hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD);
+	hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (!hdd_ctx) {
 		cds_err("HDD context is NULL");
 		return;
@@ -2020,7 +2020,7 @@ bool cds_set_connection_in_progress(bool value)
 	bool status = true;
 	hdd_context_t *hdd_ctx;
 
-	hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD);
+	hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (!hdd_ctx) {
 		cds_err("HDD context is NULL");
 		return false;
@@ -2197,7 +2197,7 @@ static void cds_update_hw_mode_conn_info(uint32_t num_vdev_mac_entries,
 	uint32_t i, conn_index, found;
 	cds_context_type *cds_ctx;
 
-	cds_ctx = cds_get_context(CDF_MODULE_ID_CDF);
+	cds_ctx = cds_get_context(QDF_MODULE_ID_QDF);
 	if (!cds_ctx) {
 		cds_err("Invalid CDS Context");
 		return;
@@ -2276,7 +2276,7 @@ void cds_set_dual_mac_scan_config(uint8_t dbs_val,
 	QDF_STATUS status;
 	hdd_context_t *hdd_ctx;
 
-	hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD);
+	hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (!hdd_ctx) {
 		cds_err("HDD context is NULL");
 		return;
@@ -2335,7 +2335,7 @@ void cds_set_dual_mac_fw_mode_config(uint8_t dbs, uint8_t dfs)
 	QDF_STATUS status;
 	hdd_context_t *hdd_ctx;
 
-	hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD);
+	hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (!hdd_ctx) {
 		cds_err("HDD context is NULL");
 		return;
@@ -2537,7 +2537,7 @@ QDF_STATUS cds_soc_set_hw_mode(uint32_t session_id,
 	QDF_STATUS status;
 	hdd_context_t *hdd_ctx;
 
-	hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD);
+	hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (!hdd_ctx) {
 		cds_err("Invalid HDD context");
 		return QDF_STATUS_E_FAILURE;
@@ -2585,7 +2585,7 @@ bool cds_is_connection_in_progress(void)
 	uint8_t *sta_mac = NULL;
 	hdd_context_t *hdd_ctx;
 
-	hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD);
+	hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (!hdd_ctx) {
 		cds_err("HDD context is NULL");
 		return false;
@@ -3002,13 +3002,13 @@ static bool cds_current_concurrency_is_scc(void)
  */
 static void cds_dump_legacy_concurrency(
 		uint8_t sta_channel, uint8_t ap_channel, uint8_t p2p_channel,
-		struct cdf_mac_addr sta_bssid, struct cdf_mac_addr p2p_bssid,
-		struct cdf_mac_addr ap_bssid, const char *p2p_mode)
+		struct qdf_mac_addr sta_bssid, struct qdf_mac_addr p2p_bssid,
+		struct qdf_mac_addr ap_bssid, const char *p2p_mode)
 {
 	const char *cc_mode = "Standalone";
 	hdd_context_t *hdd_ctx;
 
-	hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD);
+	hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (!hdd_ctx) {
 		cds_err("HDD context is NULL");
 		return;
@@ -3089,9 +3089,9 @@ void cds_dump_concurrency_info(void)
 	hdd_station_ctx_t *pHddStaCtx;
 	hdd_ap_ctx_t *hdd_ap_ctx;
 	hdd_hostapd_state_t *hostapd_state;
-	struct cdf_mac_addr staBssid = CDF_MAC_ADDR_ZERO_INITIALIZER;
-	struct cdf_mac_addr p2pBssid = CDF_MAC_ADDR_ZERO_INITIALIZER;
-	struct cdf_mac_addr apBssid = CDF_MAC_ADDR_ZERO_INITIALIZER;
+	struct qdf_mac_addr staBssid = QDF_MAC_ADDR_ZERO_INITIALIZER;
+	struct qdf_mac_addr p2pBssid = QDF_MAC_ADDR_ZERO_INITIALIZER;
+	struct qdf_mac_addr apBssid = QDF_MAC_ADDR_ZERO_INITIALIZER;
 	uint8_t staChannel = 0, p2pChannel = 0, apChannel = 0;
 	const char *p2pMode = "DEV";
 	hdd_context_t *hdd_ctx;
@@ -3105,7 +3105,7 @@ void cds_dump_concurrency_info(void)
 	hdd_adapter_t *adapter5 = NULL;
 #endif /* QCA_LL_LEGACY_TX_FLOW_CONTROL */
 
-	hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD);
+	hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (!hdd_ctx) {
 		cds_err("HDD context is NULL");
 		return;
@@ -3377,22 +3377,22 @@ void cds_dump_concurrency_info(void)
  *
  * Return: NONE
  */
-void cds_set_concurrency_mode(enum tCDF_ADAPTER_MODE mode)
+void cds_set_concurrency_mode(enum tQDF_ADAPTER_MODE mode)
 {
 	hdd_context_t *hdd_ctx;
 
-	hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD);
+	hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (!hdd_ctx) {
 		cds_err("HDD context is NULL");
 		return;
 	}
 
 	switch (mode) {
-	case CDF_STA_MODE:
-	case CDF_P2P_CLIENT_MODE:
-	case CDF_P2P_GO_MODE:
-	case CDF_SAP_MODE:
-	case CDF_IBSS_MODE:
+	case QDF_STA_MODE:
+	case QDF_P2P_CLIENT_MODE:
+	case QDF_P2P_GO_MODE:
+	case QDF_SAP_MODE:
+	case QDF_IBSS_MODE:
 		hdd_ctx->concurrency_mode |= (1 << mode);
 		hdd_ctx->no_of_open_sessions[mode]++;
 		break;
@@ -3412,21 +3412,21 @@ void cds_set_concurrency_mode(enum tCDF_ADAPTER_MODE mode)
  *
  * Return: NONE
  */
-void cds_clear_concurrency_mode(enum tCDF_ADAPTER_MODE mode)
+void cds_clear_concurrency_mode(enum tQDF_ADAPTER_MODE mode)
 {
 	hdd_context_t *hdd_ctx;
 
-	hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD);
+	hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (!hdd_ctx) {
 		cds_err("HDD context is NULL");
 		return;
 	}
 
 	switch (mode) {
-	case CDF_STA_MODE:
-	case CDF_P2P_CLIENT_MODE:
-	case CDF_P2P_GO_MODE:
-	case CDF_SAP_MODE:
+	case QDF_STA_MODE:
+	case QDF_P2P_CLIENT_MODE:
+	case QDF_P2P_GO_MODE:
+	case QDF_SAP_MODE:
 		hdd_ctx->no_of_open_sessions[mode]--;
 		if (!(hdd_ctx->no_of_open_sessions[mode]))
 			hdd_ctx->concurrency_mode &= (~(1 << mode));
@@ -3449,14 +3449,14 @@ void cds_clear_concurrency_mode(enum tCDF_ADAPTER_MODE mode)
  *
  * Return: None
  */
-static void cds_soc_set_pcl(enum tCDF_ADAPTER_MODE mode)
+static void cds_soc_set_pcl(enum tQDF_ADAPTER_MODE mode)
 {
 	QDF_STATUS status;
 	enum cds_con_mode con_mode;
 	struct sir_pcl_list pcl;
 	hdd_context_t *hdd_ctx;
 
-	hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD);
+	hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (!hdd_ctx) {
 		cds_err("HDD context is NULL");
 		return;
@@ -3464,19 +3464,19 @@ static void cds_soc_set_pcl(enum tCDF_ADAPTER_MODE mode)
 	pcl.pcl_len = 0;
 
 	switch (mode) {
-	case CDF_STA_MODE:
+	case QDF_STA_MODE:
 		con_mode = CDS_STA_MODE;
 		break;
-	case CDF_P2P_CLIENT_MODE:
+	case QDF_P2P_CLIENT_MODE:
 		con_mode = CDS_P2P_CLIENT_MODE;
 		break;
-	case CDF_P2P_GO_MODE:
+	case QDF_P2P_GO_MODE:
 		con_mode = CDS_P2P_GO_MODE;
 		break;
-	case CDF_SAP_MODE:
+	case QDF_SAP_MODE:
 		con_mode = CDS_SAP_MODE;
 		break;
-	case CDF_IBSS_MODE:
+	case QDF_IBSS_MODE:
 		con_mode = CDS_IBSS_MODE;
 		break;
 	default:
@@ -3511,19 +3511,19 @@ static void cds_soc_set_pcl(enum tCDF_ADAPTER_MODE mode)
  *
  * Return: None
  */
-void cds_incr_active_session(enum tCDF_ADAPTER_MODE mode,
+void cds_incr_active_session(enum tQDF_ADAPTER_MODE mode,
 				  uint8_t session_id)
 {
 	hdd_context_t *hdd_ctx;
 	cds_context_type *cds_ctx;
 
-	hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD);
+	hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (!hdd_ctx) {
 		cds_err("HDD context is NULL");
 		return;
 	}
 
-	cds_ctx = cds_get_context(CDF_MODULE_ID_CDF);
+	cds_ctx = cds_get_context(QDF_MODULE_ID_QDF);
 	if (!cds_ctx) {
 		cds_err("Invalid CDS Context");
 		return;
@@ -3535,11 +3535,11 @@ void cds_incr_active_session(enum tCDF_ADAPTER_MODE mode,
 	 */
 	cdf_mutex_acquire(&cds_ctx->cdf_conc_list_lock);
 	switch (mode) {
-	case CDF_STA_MODE:
-	case CDF_P2P_CLIENT_MODE:
-	case CDF_P2P_GO_MODE:
-	case CDF_SAP_MODE:
-	case CDF_IBSS_MODE:
+	case QDF_STA_MODE:
+	case QDF_P2P_CLIENT_MODE:
+	case QDF_P2P_GO_MODE:
+	case QDF_SAP_MODE:
+	case QDF_IBSS_MODE:
 		hdd_ctx->no_of_active_sessions[mode]++;
 		break;
 	default:
@@ -3552,7 +3552,7 @@ void cds_incr_active_session(enum tCDF_ADAPTER_MODE mode,
 	 * Let us set the PCL to the FW before updating the connection
 	 * info structure about the new connection.
 	 */
-	if (mode == CDF_STA_MODE) {
+	if (mode == QDF_STA_MODE) {
 		/* Set PCL of STA to the FW */
 		cds_soc_set_pcl(mode);
 		cds_info("Set PCL of STA to FW");
@@ -3578,7 +3578,7 @@ enum cds_conc_next_action cds_need_opportunistic_upgrade(void)
 #ifdef QCA_WIFI_3_0_EMU
 	hdd_context_t *hdd_ctx;
 
-	hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD);
+	hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (!hdd_ctx) {
 		cds_err("HDD context is NULL");
 		return upgrade;
@@ -3638,23 +3638,23 @@ done:
 static void cds_set_pcl_for_existing_combo(enum cds_con_mode mode)
 {
 	struct cds_conc_connection_info info;
-	enum tCDF_ADAPTER_MODE pcl_mode;
+	enum tQDF_ADAPTER_MODE pcl_mode;
 
 	switch (mode) {
 	case CDS_STA_MODE:
-		pcl_mode = CDF_STA_MODE;
+		pcl_mode = QDF_STA_MODE;
 		break;
 	case CDS_SAP_MODE:
-		pcl_mode = CDF_SAP_MODE;
+		pcl_mode = QDF_SAP_MODE;
 		break;
 	case CDS_P2P_CLIENT_MODE:
-		pcl_mode = CDF_P2P_CLIENT_MODE;
+		pcl_mode = QDF_P2P_CLIENT_MODE;
 		break;
 	case CDS_P2P_GO_MODE:
-		pcl_mode = CDF_P2P_GO_MODE;
+		pcl_mode = QDF_P2P_GO_MODE;
 		break;
 	case CDS_IBSS_MODE:
-		pcl_mode = CDF_IBSS_MODE;
+		pcl_mode = QDF_IBSS_MODE;
 		break;
 	default:
 		cds_err("Invalid mode to set PCL");
@@ -3682,20 +3682,20 @@ static void cds_set_pcl_for_existing_combo(enum cds_con_mode mode)
  *
  * Return: None
  */
-void cds_decr_session_set_pcl(enum tCDF_ADAPTER_MODE mode,
+void cds_decr_session_set_pcl(enum tQDF_ADAPTER_MODE mode,
 						uint8_t session_id)
 {
 	QDF_STATUS qdf_status;
 	hdd_context_t *hdd_ctx;
 	cds_context_type *cds_ctx;
 
-	hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD);
+	hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (!hdd_ctx) {
 		cds_err("HDD context is NULL");
 		return;
 	}
 
-	cds_ctx = cds_get_context(CDF_MODULE_ID_CDF);
+	cds_ctx = cds_get_context(QDF_MODULE_ID_QDF);
 	if (!cds_ctx) {
 		cds_err("Invalid CDS Context");
 		return;
@@ -3746,19 +3746,19 @@ void cds_decr_session_set_pcl(enum tCDF_ADAPTER_MODE mode,
  *
  * Return: None
  */
-void cds_decr_active_session(enum tCDF_ADAPTER_MODE mode,
+void cds_decr_active_session(enum tQDF_ADAPTER_MODE mode,
 				  uint8_t session_id)
 {
 	hdd_context_t *hdd_ctx;
 	cds_context_type *cds_ctx;
 
-	hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD);
+	hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (!hdd_ctx) {
 		cds_err("HDD context is NULL");
 		return;
 	}
 
-	cds_ctx = cds_get_context(CDF_MODULE_ID_CDF);
+	cds_ctx = cds_get_context(QDF_MODULE_ID_QDF);
 	if (!cds_ctx) {
 		cds_err("Invalid CDS Context");
 		return;
@@ -3770,11 +3770,11 @@ void cds_decr_active_session(enum tCDF_ADAPTER_MODE mode,
 	 */
 	cdf_mutex_acquire(&cds_ctx->cdf_conc_list_lock);
 	switch (mode) {
-	case CDF_STA_MODE:
-	case CDF_P2P_CLIENT_MODE:
-	case CDF_P2P_GO_MODE:
-	case CDF_SAP_MODE:
-	case CDF_IBSS_MODE:
+	case QDF_STA_MODE:
+	case QDF_P2P_CLIENT_MODE:
+	case QDF_P2P_GO_MODE:
+	case QDF_SAP_MODE:
+	case QDF_IBSS_MODE:
 		if (hdd_ctx->no_of_active_sessions[mode])
 			hdd_ctx->no_of_active_sessions[mode]--;
 		break;
@@ -3801,7 +3801,7 @@ void cds_dbs_opportunistic_timer_handler(void *data)
 	enum cds_conc_next_action action = CDS_NOP;
 	cds_context_type *cds_ctx;
 
-	cds_ctx = cds_get_context(CDF_MODULE_ID_CDF);
+	cds_ctx = cds_get_context(QDF_MODULE_ID_QDF);
 	if (!cds_ctx) {
 		cds_err("Invalid CDS Context");
 		return;
@@ -3835,7 +3835,7 @@ QDF_STATUS cds_deinit_policy_mgr(void)
 {
 	cds_context_type *cds_ctx;
 
-	cds_ctx = cds_get_context(CDF_MODULE_ID_CDF);
+	cds_ctx = cds_get_context(QDF_MODULE_ID_QDF);
 	if (!cds_ctx) {
 		cds_err("Invalid CDS Context");
 		return QDF_STATUS_E_FAILURE;
@@ -3862,13 +3862,13 @@ QDF_STATUS cds_init_policy_mgr(void)
 	hdd_context_t *hdd_ctx;
 	cds_context_type *cds_ctx;
 
-	hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD);
+	hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (!hdd_ctx) {
 		cds_err("HDD context is NULL");
 		return QDF_STATUS_E_FAILURE;
 	}
 
-	cds_ctx = cds_get_context(CDF_MODULE_ID_CDF);
+	cds_ctx = cds_get_context(QDF_MODULE_ID_QDF);
 	if (!cds_ctx) {
 		cds_err("Invalid CDS Context");
 		return QDF_STATUS_E_FAILURE;
@@ -3889,7 +3889,7 @@ QDF_STATUS cds_init_policy_mgr(void)
 	sme_register_hw_mode_trans_cb(hdd_ctx->hHal,
 				cds_hw_mode_transition_cb);
 	status = cdf_mc_timer_init(&hdd_ctx->dbs_opportunistic_timer,
-				   CDF_TIMER_TYPE_SW,
+				   QDF_TIMER_TYPE_SW,
 				   cds_dbs_opportunistic_timer_handler,
 				   (void *)hdd_ctx);
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
@@ -4020,13 +4020,13 @@ QDF_STATUS cds_incr_connection_count(uint32_t vdev_id)
 	hdd_context_t *hdd_ctx;
 	cds_context_type *cds_ctx;
 
-	hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD);
+	hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (!hdd_ctx) {
 		cds_err("HDD context is NULL");
 		return status;
 	}
 
-	cds_ctx = cds_get_context(CDF_MODULE_ID_CDF);
+	cds_ctx = cds_get_context(QDF_MODULE_ID_QDF);
 	if (!cds_ctx) {
 		cds_err("Invalid CDS Context");
 		return status;
@@ -4087,7 +4087,7 @@ QDF_STATUS cds_update_connection_info(uint32_t vdev_id)
 	struct wma_txrx_node *wma_conn_table_entry;
 	cds_context_type *cds_ctx;
 
-	cds_ctx = cds_get_context(CDF_MODULE_ID_CDF);
+	cds_ctx = cds_get_context(QDF_MODULE_ID_QDF);
 	if (!cds_ctx) {
 		cds_err("Invalid CDS Context");
 		return status;
@@ -4294,7 +4294,7 @@ void cds_update_with_safe_channel_list(uint8_t *pcl_channels, uint32_t *len)
 	uint32_t safe_channel_count = 0, current_channel_count = 0;
 
 	if (len) {
-		current_channel_count = CDF_MIN(*len, MAX_NUM_CHAN);
+		current_channel_count = QDF_MIN(*len, MAX_NUM_CHAN);
 	} else {
 		cds_err("invalid number of channel length");
 		return;
@@ -4362,7 +4362,7 @@ QDF_STATUS cds_get_channel_list(enum cds_pcl_type pcl,
 	uint8_t channel_list_5[MAX_NUM_CHAN] = {0};
 	hdd_context_t *hdd_ctx;
 
-	hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD);
+	hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (!hdd_ctx) {
 		cds_err("HDD context is NULL");
 		return status;
@@ -4556,26 +4556,26 @@ QDF_STATUS cds_get_channel_list(enum cds_pcl_type pcl,
  *
  * Return: true or false
  */
-bool cds_map_concurrency_mode(enum tCDF_ADAPTER_MODE *old_mode,
+bool cds_map_concurrency_mode(enum tQDF_ADAPTER_MODE *old_mode,
 	enum cds_con_mode *new_mode)
 {
 	bool status = true;
 
 	switch (*old_mode) {
 
-	case CDF_STA_MODE:
+	case QDF_STA_MODE:
 		*new_mode = CDS_STA_MODE;
 		break;
-	case CDF_SAP_MODE:
+	case QDF_SAP_MODE:
 		*new_mode = CDS_SAP_MODE;
 		break;
-	case CDF_P2P_CLIENT_MODE:
+	case QDF_P2P_CLIENT_MODE:
 		*new_mode = CDS_P2P_CLIENT_MODE;
 		break;
-	case CDF_P2P_GO_MODE:
+	case QDF_P2P_GO_MODE:
 		*new_mode = CDS_P2P_GO_MODE;
 		break;
-	case CDF_IBSS_MODE:
+	case QDF_IBSS_MODE:
 		*new_mode = CDS_IBSS_MODE;
 		break;
 	default:
@@ -4612,7 +4612,7 @@ QDF_STATUS cds_get_pcl(enum cds_con_mode mode,
 	enum cds_conc_priority_mode conc_system_pref = 0;
 	hdd_context_t *hdd_ctx;
 
-	hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD);
+	hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (!hdd_ctx) {
 		cds_err("HDD context is NULL");
 		return status;
@@ -4756,7 +4756,7 @@ bool cds_allow_new_home_channel(uint8_t channel, uint32_t num_connections)
 #ifdef QCA_WIFI_3_0_EMU
 	hdd_context_t *hdd_ctx;
 
-	hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD);
+	hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (!hdd_ctx) {
 		cds_err("HDD context is NULL");
 		return false;
@@ -4866,13 +4866,13 @@ bool cds_allow_concurrency(enum cds_con_mode mode,
 	hdd_context_t *hdd_ctx;
 	cds_context_type *cds_ctx;
 
-	hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD);
+	hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (!hdd_ctx) {
 		cds_err("HDD context is NULL");
 		return status;
 	}
 
-	cds_ctx = cds_get_context(CDF_MODULE_ID_CDF);
+	cds_ctx = cds_get_context(QDF_MODULE_ID_QDF);
 	if (!cds_ctx) {
 		cds_err("Invalid CDS Context");
 		return status;
@@ -5083,7 +5083,7 @@ enum cds_conc_priority_mode cds_get_first_connection_pcl_table_index(void)
 {
 	hdd_context_t *hdd_ctx;
 
-	hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD);
+	hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (!hdd_ctx) {
 		cds_err("HDD context is NULL");
 		return CDS_THROUGHPUT;
@@ -5551,13 +5551,13 @@ QDF_STATUS cds_current_connections_update(uint32_t session_id,
 	hdd_context_t *hdd_ctx;
 	QDF_STATUS status = QDF_STATUS_E_FAILURE;
 
-	cds_ctx = cds_get_context(CDF_MODULE_ID_CDF);
+	cds_ctx = cds_get_context(QDF_MODULE_ID_QDF);
 	if (!cds_ctx) {
 		cds_err("Invalid CDS Context");
 		return status;
 	}
 
-	hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD);
+	hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (!hdd_ctx) {
 		cds_err("Invalid HDD context");
 		return QDF_STATUS_E_FAILURE;
@@ -5712,7 +5712,7 @@ void cds_nss_update_cb(void *context, uint8_t tx_status, uint8_t vdev_id,
 		return;
 	}
 
-	cds_ctx = cds_get_context(CDF_MODULE_ID_CDF);
+	cds_ctx = cds_get_context(QDF_MODULE_ID_QDF);
 	if (!cds_ctx) {
 		cds_err("Invalid CDS Context");
 		return;
@@ -5777,7 +5777,7 @@ QDF_STATUS cds_complete_action(uint8_t  new_nss, uint8_t next_action,
 	uint32_t conn_index = 0;
 	hdd_context_t *hdd_ctx;
 
-	hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD);
+	hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (!hdd_ctx) {
 		cds_err("HDD context is NULL");
 		return status;
@@ -5960,7 +5960,7 @@ static int __cds_cfg80211_get_concurrency_matrix(struct wiphy *wiphy,
 
 	ENTER();
 
-	if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		cds_err("Command not allowed in FTM mode");
 		return -EPERM;
 	}
@@ -5992,7 +5992,7 @@ static int __cds_cfg80211_get_concurrency_matrix(struct wiphy *wiphy,
 		WIFI_FEATURE_P2P;
 	/* Add more feature combinations here */
 
-	feature_sets = CDF_MIN(feature_sets, max_feature_sets);
+	feature_sets = QDF_MIN(feature_sets, max_feature_sets);
 	cds_info("Number of feature sets (%d)", feature_sets);
 	cds_info("Feature set matrix");
 	for (i = 0; i < feature_sets; i++)
@@ -6053,7 +6053,7 @@ uint32_t cds_get_concurrency_mode(void)
 {
 	hdd_context_t *hdd_ctx;
 
-	hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD);
+	hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (NULL != hdd_ctx) {
 		cds_info("concurrency_mode = 0x%x",
 			hdd_ctx->concurrency_mode);
@@ -6062,7 +6062,7 @@ uint32_t cds_get_concurrency_mode(void)
 
 	/* we are in an invalid state :( */
 	cds_err("Invalid context");
-	return CDF_STA_MASK;
+	return QDF_STA_MASK;
 }
 
 /**
@@ -6114,7 +6114,7 @@ QDF_STATUS cds_check_and_restart_sap(eCsrRoamResult roam_result,
 	uint8_t default_sap_channel = 6;
 	hdd_context_t *hdd_ctx;
 
-	hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD);
+	hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (!hdd_ctx) {
 		cds_err("HDD context is NULL");
 		return QDF_STATUS_E_FAILURE;
@@ -6199,7 +6199,7 @@ static bool cds_sta_sap_concur_handle(hdd_adapter_t *sta_adapter,
 	QDF_STATUS status;
 	hdd_context_t *hdd_ctx;
 
-	hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD);
+	hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (!hdd_ctx) {
 		cds_err("HDD context is NULL");
 		return are_cc_channels_same;
@@ -6270,7 +6270,7 @@ static bool cds_sta_p2pgo_concur_handle(hdd_adapter_t *sta_adapter,
 	bool ret;
 	hdd_context_t *hdd_ctx;
 
-	hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD);
+	hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (!hdd_ctx) {
 		cds_err("HDD context is NULL");
 		return are_cc_channels_same;
@@ -6292,7 +6292,7 @@ static bool cds_sta_p2pgo_concur_handle(hdd_adapter_t *sta_adapter,
 		 */
 		if (false == are_cc_channels_same) {
 			if (true == cds_is_sta_connection_pending()) {
-				MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+				MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
 					TRACE_CODE_HDD_CLEAR_JOIN_REQ,
 					sta_adapter->sessionId, *roam_id));
 				ret = sme_clear_joinreq_param(
@@ -6305,7 +6305,7 @@ static bool cds_sta_p2pgo_concur_handle(hdd_adapter_t *sta_adapter,
 				cds_change_sta_conn_pending_status(false);
 				cds_info("===>Clear pending join req");
 			}
-			MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+			MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
 					TRACE_CODE_HDD_STORE_JOIN_REQ,
 					sta_adapter->sessionId, *roam_id));
 			/* store the scan cache here */
@@ -6379,7 +6379,7 @@ void cds_handle_conc_rule1(hdd_adapter_t *adapter,
 	bool ret;
 	hdd_context_t *hdd_ctx;
 
-	hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD);
+	hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (!hdd_ctx) {
 		cds_err("HDD context is NULL");
 		return;
@@ -6420,7 +6420,7 @@ bool cds_handle_conc_rule2(hdd_adapter_t *adapter,
 {
 	hdd_context_t *hdd_ctx;
 
-	hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD);
+	hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (!hdd_ctx) {
 		cds_err("HDD context is NULL");
 		return false;
@@ -6487,7 +6487,7 @@ uint8_t cds_search_and_check_for_session_conc(uint8_t session_id,
 	hdd_adapter_t *adapter;
 	bool ret;
 
-	hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD);
+	hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (!hdd_ctx) {
 		cds_err("Invalid HDD context");
 		return channel;
@@ -6535,7 +6535,7 @@ bool cds_check_for_session_conc(uint8_t session_id, uint8_t channel)
 	hdd_adapter_t *adapter;
 	bool ret;
 
-	hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD);
+	hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (!hdd_ctx) {
 		cds_err("Invalid HDD context");
 		return false;
@@ -6613,7 +6613,7 @@ void cds_restart_softap(hdd_adapter_t *pHostapdAdapter)
 	tHddAvoidFreqList hdd_avoid_freq_list;
 	hdd_context_t *hdd_ctx;
 
-	hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD);
+	hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (!hdd_ctx) {
 		cds_err("HDD context is NULL");
 		return;
@@ -6647,7 +6647,7 @@ void cds_force_sap_on_scc(eCsrRoamResult roam_result,
 	hdd_adapter_t *hostapd_adapter;
 	hdd_context_t *hdd_ctx;
 
-	hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD);
+	hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (!hdd_ctx) {
 		cds_err("HDD context is NULL");
 		return;
@@ -6695,7 +6695,7 @@ static void cds_check_sta_ap_concurrent_ch_intf(void *data)
 				CDF_MCC_TO_SCC_SWITCH_DISABLE)
 			|| !(cds_concurrent_open_sessions_running()
 			    || !(cds_get_concurrency_mode() ==
-					(CDF_STA_MASK | CDF_SAP_MASK))))
+					(QDF_STA_MASK | QDF_SAP_MASK))))
 		return;
 
 	ap_adapter = hdd_get_adapter(hdd_ctx, WLAN_HDD_SOFTAP);
@@ -6738,7 +6738,7 @@ void cds_check_concurrent_intf_and_restart_sap(hdd_station_ctx_t *hdd_sta_ctx,
 {
 	hdd_context_t *hdd_ctx;
 
-	hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD);
+	hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (!hdd_ctx) {
 		cds_err("HDD context is NULL");
 		return;
@@ -6784,7 +6784,7 @@ uint8_t cds_is_mcc_in_24G(void)
 	hdd_hostapd_state_t *hostapd_state;
 	hdd_context_t *hdd_ctx;
 
-	hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD);
+	hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (!hdd_ctx) {
 		cds_err("HDD context is NULL");
 		return 1;
@@ -6950,8 +6950,8 @@ int32_t cds_set_mcc_p2p_quota(hdd_adapter_t *hostapd_adapater,
 	 * Check if concurrency mode is active.
 	 * Need to modify this code to support MCC modes other than STA/P2P
 	 */
-	if ((concurrent_state == (CDF_STA_MASK | CDF_P2P_CLIENT_MASK)) ||
-		(concurrent_state == (CDF_STA_MASK | CDF_P2P_GO_MASK))) {
+	if ((concurrent_state == (QDF_STA_MASK | QDF_P2P_CLIENT_MASK)) ||
+		(concurrent_state == (QDF_STA_MASK | QDF_P2P_GO_MASK))) {
 		cds_info("STA & P2P are both enabled");
 		/*
 		 * The channel numbers for both adapters and the time
@@ -6985,7 +6985,7 @@ int32_t cds_set_mcc_p2p_quota(hdd_adapter_t *hostapd_adapater,
 			 * iwpriv cmd was issued on wlan0;
 			 * get p2p0 vdev channel
 			 */
-			if ((concurrent_state & CDF_P2P_CLIENT_MASK) != 0) {
+			if ((concurrent_state & QDF_P2P_CLIENT_MASK) != 0) {
 				/* The 2nd MCC vdev is P2P client */
 				sta_adapter = hdd_get_adapter(
 						hostapd_adapater->pHddCtx,
@@ -7102,7 +7102,7 @@ int32_t cds_go_set_mcc_p2p_quota(hdd_adapter_t *hostapd_adapter,
 	 */
 
 	concurrent_state = cds_get_concurrency_mode();
-	if (concurrent_state == (CDF_STA_MASK | CDF_P2P_GO_MASK)) {
+	if (concurrent_state == (QDF_STA_MASK | QDF_P2P_GO_MASK)) {
 		cds_info("STA & P2P are both enabled");
 
 		/*
@@ -7134,7 +7134,7 @@ int32_t cds_go_set_mcc_p2p_quota(hdd_adapter_t *hostapd_adapter,
 		if (hostapd_adapter->device_mode ==
 				WLAN_HDD_INFRA_STATION) {
 			/* iwpriv cmd issued on wlan0; get p2p0 vdev chan */
-			if ((concurrent_state & CDF_P2P_CLIENT_MASK) != 0) {
+			if ((concurrent_state & QDF_P2P_CLIENT_MASK) != 0) {
 				/* The 2nd MCC vdev is P2P client */
 				sta_adapter = hdd_get_adapter
 					(
@@ -7219,8 +7219,8 @@ void cds_set_mcc_latency(hdd_adapter_t *adapter, int set_value)
 	 * Need to modify this code to support MCC modes other than STA/P2P
 	 */
 	concurrent_state = cds_get_concurrency_mode();
-	if ((concurrent_state == (CDF_STA_MASK | CDF_P2P_CLIENT_MASK)) ||
-		(concurrent_state == (CDF_STA_MASK | CDF_P2P_GO_MASK))) {
+	if ((concurrent_state == (QDF_STA_MASK | QDF_P2P_CLIENT_MASK)) ||
+		(concurrent_state == (QDF_STA_MASK | QDF_P2P_GO_MASK))) {
 		cds_info("STA & P2P are both enabled");
 		/*
 		 * The channel number and latency are formatted in
@@ -7354,19 +7354,19 @@ void cds_check_and_restart_sap_with_non_dfs_acs(void)
 	hdd_context_t *hdd_ctx;
 	cds_context_type *cds_ctx;
 
-	hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD);
+	hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (!hdd_ctx) {
 		cds_err("HDD context is NULL");
 		return;
 	}
 
-	cds_ctx = cds_get_context(CDF_MODULE_ID_CDF);
+	cds_ctx = cds_get_context(QDF_MODULE_ID_QDF);
 	if (!cds_ctx) {
 		cds_err("Invalid CDS Context");
 		return;
 	}
 
-	if (cds_get_concurrency_mode() != (CDF_STA_MASK | CDF_SAP_MASK)) {
+	if (cds_get_concurrency_mode() != (QDF_STA_MASK | QDF_SAP_MASK)) {
 		cds_info("Concurrency mode is not SAP");
 		return;
 	}
@@ -7398,7 +7398,7 @@ QDF_STATUS cds_update_connection_info_utfw(
 	uint32_t conn_index = 0, found = 0;
 	cds_context_type *cds_ctx;
 
-	cds_ctx = cds_get_context(CDF_MODULE_ID_CDF);
+	cds_ctx = cds_get_context(QDF_MODULE_ID_QDF);
 	if (!cds_ctx) {
 		cds_err("Invalid CDS Context");
 		return status;
@@ -7441,13 +7441,13 @@ QDF_STATUS cds_incr_connection_count_utfw(
 	hdd_context_t *hdd_ctx;
 	cds_context_type *cds_ctx;
 
-	hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD);
+	hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (!hdd_ctx) {
 		cds_err("HDD context is NULL");
 		return status;
 	}
 
-	cds_ctx = cds_get_context(CDF_MODULE_ID_CDF);
+	cds_ctx = cds_get_context(QDF_MODULE_ID_QDF);
 	if (!cds_ctx) {
 		cds_err("Invalid CDS Context");
 		return status;
@@ -7479,7 +7479,7 @@ QDF_STATUS cds_decr_connection_count_utfw(uint32_t del_all,
 	QDF_STATUS status;
 	cds_context_type *cds_ctx;
 
-	cds_ctx = cds_get_context(CDF_MODULE_ID_CDF);
+	cds_ctx = cds_get_context(QDF_MODULE_ID_QDF);
 	if (!cds_ctx) {
 		cds_err("Invalid CDS Context");
 		return QDF_STATUS_E_FAILURE;
@@ -7589,11 +7589,11 @@ enum cds_con_mode cds_convert_device_mode_to_hdd_type(
  * Return the connection mode parameter set by insmod or set during statically
  * linked driver
  *
- * Return: enum tCDF_GLOBAL_CON_MODE
+ * Return: enum tQDF_GLOBAL_CON_MODE
  */
-enum tCDF_GLOBAL_CON_MODE cds_get_conparam(void)
+enum tQDF_GLOBAL_CON_MODE cds_get_conparam(void)
 {
-	enum tCDF_GLOBAL_CON_MODE con_mode;
+	enum tQDF_GLOBAL_CON_MODE con_mode;
 	con_mode = hdd_get_conparam();
 	return con_mode;
 }
@@ -7612,9 +7612,9 @@ bool cds_concurrent_open_sessions_running(void)
 	uint8_t j = 0;
 	hdd_context_t *pHddCtx;
 
-	pHddCtx = cds_get_context(CDF_MODULE_ID_HDD);
+	pHddCtx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (NULL != pHddCtx) {
-		for (i = 0; i < CDF_MAX_NO_OF_MODE; i++)
+		for (i = 0; i < QDF_MAX_NO_OF_MODE; i++)
 			j += pHddCtx->no_of_open_sessions[i];
 	}
 
@@ -7635,11 +7635,11 @@ bool cds_concurrent_beaconing_sessions_running(void)
 	uint8_t i = 0;
 	hdd_context_t *pHddCtx;
 
-	pHddCtx = cds_get_context(CDF_MODULE_ID_HDD);
+	pHddCtx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (NULL != pHddCtx) {
-		i = pHddCtx->no_of_open_sessions[CDF_SAP_MODE] +
-			pHddCtx->no_of_open_sessions[CDF_P2P_GO_MODE] +
-			pHddCtx->no_of_open_sessions[CDF_IBSS_MODE];
+		i = pHddCtx->no_of_open_sessions[QDF_SAP_MODE] +
+			pHddCtx->no_of_open_sessions[QDF_P2P_GO_MODE] +
+			pHddCtx->no_of_open_sessions[QDF_IBSS_MODE];
 	}
 	return i > 1;
 }
@@ -7664,9 +7664,9 @@ bool cds_max_concurrent_connections_reached(void)
 	uint8_t i = 0, j = 0;
 	hdd_context_t *pHddCtx;
 
-	pHddCtx = cds_get_context(CDF_MODULE_ID_HDD);
+	pHddCtx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (NULL != pHddCtx) {
-		for (i = 0; i < CDF_MAX_NO_OF_MODE; i++)
+		for (i = 0; i < QDF_MAX_NO_OF_MODE; i++)
 			j += pHddCtx->no_of_active_sessions[i];
 		return j >
 			(pHddCtx->config->
@@ -7688,9 +7688,9 @@ void cds_clear_concurrent_session_count(void)
 	uint8_t i = 0;
 	hdd_context_t *pHddCtx;
 
-	pHddCtx = cds_get_context(CDF_MODULE_ID_HDD);
+	pHddCtx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (NULL != pHddCtx) {
-		for (i = 0; i < CDF_MAX_NO_OF_MODE; i++)
+		for (i = 0; i < QDF_MAX_NO_OF_MODE; i++)
 			pHddCtx->no_of_active_sessions[i] = 0;
 	}
 }
@@ -7708,9 +7708,9 @@ bool cds_is_multiple_active_sta_sessions(void)
 	hdd_context_t *pHddCtx;
 	uint8_t j = 0;
 
-	pHddCtx = cds_get_context(CDF_MODULE_ID_HDD);
+	pHddCtx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (NULL != pHddCtx)
-		j = pHddCtx->no_of_active_sessions[CDF_STA_MODE];
+		j = pHddCtx->no_of_active_sessions[QDF_STA_MODE];
 
 	return j > 1;
 }
@@ -7727,9 +7727,9 @@ bool cds_is_sta_active_connection_exists(void)
 	hdd_context_t *pHddCtx;
 	uint8_t j = 0;
 
-	pHddCtx = cds_get_context(CDF_MODULE_ID_HDD);
+	pHddCtx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (NULL != pHddCtx)
-		j = pHddCtx->no_of_active_sessions[CDF_STA_MODE];
+		j = pHddCtx->no_of_active_sessions[QDF_STA_MODE];
 
 	return j ? true : false;
 }

core/cds/src/cds_mq.c

@@ -59,7 +59,7 @@ inline QDF_STATUS cds_mq_init(p_cds_mq_type pMq)
 {
 
 	if (pMq == NULL) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s: NULL pointer passed", __func__);
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -84,7 +84,7 @@ inline QDF_STATUS cds_mq_init(p_cds_mq_type pMq)
 inline void cds_mq_deinit(p_cds_mq_type pMq)
 {
 	if (pMq == NULL) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s: NULL pointer passed", __func__);
 		return;
 	}
@@ -104,7 +104,7 @@ inline void cds_mq_put(p_cds_mq_type pMq, p_cds_msg_wrapper pMsgWrapper)
 	unsigned long flags;
 
 	if ((pMq == NULL) || (pMsgWrapper == NULL)) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s: NULL pointer passed", __func__);
 		return;
 	}
@@ -131,7 +131,7 @@ inline p_cds_msg_wrapper cds_mq_get(p_cds_mq_type pMq)
 	unsigned long flags;
 
 	if (pMq == NULL) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s: NULL pointer passed", __func__);
 		return NULL;
 	}
@@ -139,7 +139,7 @@ inline p_cds_msg_wrapper cds_mq_get(p_cds_mq_type pMq)
 	spin_lock_irqsave(&pMq->mqLock, flags);
 
 	if (list_empty(&pMq->mqList)) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_WARN,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_WARN,
 			  "%s: CDS Message Queue is empty", __func__);
 	} else {
 		listptr = pMq->mqList.next;
@@ -168,7 +168,7 @@ inline bool cds_is_mq_empty(p_cds_mq_type pMq)
 	unsigned long flags;
 
 	if (pMq == NULL) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s: NULL pointer passed", __func__);
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -195,12 +195,12 @@ QDF_STATUS cds_send_mb_message_to_mac(void *pBuf)
 
 	cds_context = cds_get_global_context();
 	if (NULL == cds_context) {
-		CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR,
 			  "%s: invalid cds_context", __func__);
 	} else {
-		hHal = cds_get_context(CDF_MODULE_ID_SME);
+		hHal = cds_get_context(QDF_MODULE_ID_SME);
 		if (NULL == hHal) {
-			CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR,
+			CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR,
 				  "%s: invalid hHal", __func__);
 		} else {
 			sirStatus = u_mac_post_ctrl_msg(hHal, pBuf);

core/cds/src/cds_packet.c

@@ -63,7 +63,7 @@
 /* protocol Storage Structure */
 typedef struct {
 	uint32_t order;
-	v_TIME_t event_time;
+	unsigned long event_time;
 	char event_string[CDS_PKT_TRAC_MAX_STRING_LEN];
 } cds_pkt_proto_trace_t;
 
@@ -115,7 +115,7 @@ cds_pkt_get_packet_length(cds_pkt_t *pPacket, uint16_t *pPacketSize)
 	/* Validate the parameter pointers */
 	if (unlikely((pPacket == NULL) || (pPacketSize == NULL)) ||
 	    (pPacket->pkt_buf == NULL)) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL,
 			  "VPKT [%d]: NULL pointer", __LINE__);
 		return QDF_STATUS_E_INVAL;
 	}
@@ -154,7 +154,7 @@ uint8_t cds_pkt_get_proto_type(struct sk_buff *skb, uint8_t tracking_map,
 		ether_type = (uint16_t) (*(uint16_t *)
 					 (skb->data +
 					  CDS_PKT_TRAC_ETH_TYPE_OFFSET));
-		if (CDS_PKT_TRAC_EAPOL_ETH_TYPE == CDF_SWAP_U16(ether_type)) {
+		if (CDS_PKT_TRAC_EAPOL_ETH_TYPE == QDF_SWAP_U16(ether_type)) {
 			pkt_proto_type |= CDS_PKT_TRAC_TYPE_EAPOL;
 		}
 	}
@@ -168,10 +168,10 @@ uint8_t cds_pkt_get_proto_type(struct sk_buff *skb, uint8_t tracking_map,
 				    (skb->data + CDS_PKT_TRAC_IP_OFFSET +
 				     CDS_PKT_TRAC_IP_HEADER_SIZE +
 				     sizeof(uint16_t)));
-		if (((CDS_PKT_TRAC_DHCP_SRV_PORT == CDF_SWAP_U16(SPort))
-		     && (CDS_PKT_TRAC_DHCP_CLI_PORT == CDF_SWAP_U16(DPort)))
-		    || ((CDS_PKT_TRAC_DHCP_CLI_PORT == CDF_SWAP_U16(SPort))
-			&& (CDS_PKT_TRAC_DHCP_SRV_PORT == CDF_SWAP_U16(DPort)))) {
+		if (((CDS_PKT_TRAC_DHCP_SRV_PORT == QDF_SWAP_U16(SPort))
+		     && (CDS_PKT_TRAC_DHCP_CLI_PORT == QDF_SWAP_U16(DPort)))
+		    || ((CDS_PKT_TRAC_DHCP_CLI_PORT == QDF_SWAP_U16(SPort))
+			&& (CDS_PKT_TRAC_DHCP_SRV_PORT == QDF_SWAP_U16(DPort)))) {
 			pkt_proto_type |= CDS_PKT_TRAC_TYPE_DHCP;
 		}
 	}
@@ -191,7 +191,7 @@ void cds_pkt_trace_buf_update(char *event_string)
 {
 	uint32_t slot;
 
-	CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO,
+	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO,
 		  "%s %d, %s", __func__, __LINE__, event_string);
 	cdf_spinlock_acquire(&trace_buffer_lock);
 	slot = trace_buffer_order % CDS_PKT_TRAC_MAX_TRACE_BUF;
@@ -218,14 +218,14 @@ void cds_pkt_trace_buf_dump(void)
 	uint32_t slot, idx;
 
 	cdf_spinlock_acquire(&trace_buffer_lock);
-	CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 		  "PACKET TRACE DUMP START Current Timestamp %u",
 		  (unsigned int)cdf_mc_timer_get_system_time());
-	CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 		  "ORDER :        TIME : EVT");
 	if (CDS_PKT_TRAC_MAX_TRACE_BUF > trace_buffer_order) {
 		for (slot = 0; slot < trace_buffer_order; slot++) {
-			CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+			CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 				  "%5d :%12u : %s",
 				  trace_buffer[slot].order,
 				  (unsigned int)trace_buffer[slot].event_time,
@@ -236,14 +236,14 @@ void cds_pkt_trace_buf_dump(void)
 			slot =
 				(trace_buffer_order +
 				 idx) % CDS_PKT_TRAC_MAX_TRACE_BUF;
-			CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+			CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 				  "%5d :%12u : %s", trace_buffer[slot].order,
 				  (unsigned int)trace_buffer[slot].event_time,
 				  trace_buffer[slot].event_string);
 		}
 	}
 
-	CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 		  "PACKET TRACE DUMP END");
 	cdf_spinlock_release(&trace_buffer_lock);
 
@@ -275,7 +275,7 @@ void cds_pkt_proto_trace_init(void)
    ---------------------------------------------------------------------------*/
 void cds_pkt_proto_trace_close(void)
 {
-	CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 		  "%s %d", __func__, __LINE__);
 	cdf_mem_free(trace_buffer);
 	cdf_spinlock_destroy(&trace_buffer_lock);

core/cds/src/cds_reg_service.c

@@ -32,7 +32,7 @@
    ============================================================================*/
 
 #include <net/cfg80211.h>
-#include "cdf_types.h"
+#include "qdf_types.h"
 #include "cds_reg_service.h"
 #include "cdf_trace.h"
 #include "sme_api.h"
@@ -426,9 +426,9 @@ QDF_STATUS cds_read_default_country(uint8_t *default_country)
 {
 	hdd_context_t *hdd_ctx;
 
-	hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD);
+	hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (!hdd_ctx) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "invalid hdd_ctx pointer");
 		return QDF_STATUS_E_FAULT;
 	}
@@ -437,7 +437,7 @@ QDF_STATUS cds_read_default_country(uint8_t *default_country)
 	       hdd_ctx->reg.def_country,
 	       CDS_COUNTRY_CODE_LEN + 1);
 
-	CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO,
+	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO,
 		  "default country is %c%c\n",
 		  default_country[0],
 		  default_country[1]);
@@ -459,7 +459,7 @@ static enum channel_enum cds_get_channel_enum(uint32_t chan_num)
 		if (chan_mapping[loop].chan_num == chan_num)
 			return loop;
 
-	CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 		  "invalid channel number %d", chan_num);
 
 	return INVALID_RF_CHANNEL;
@@ -603,7 +603,7 @@ QDF_STATUS cds_set_dfs_region(uint8_t dfs_region)
 {
 	hdd_context_t *hdd_ctx;
 
-	hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD);
+	hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
 
 	if (NULL == hdd_ctx)
 		return QDF_STATUS_E_EXISTS;
@@ -643,7 +643,7 @@ QDF_STATUS cds_get_dfs_region(uint8_t *dfs_region)
 {
 	hdd_context_t *hdd_ctx;
 
-	hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD);
+	hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
 
 	if (NULL == hdd_ctx)
 		return QDF_STATUS_E_EXISTS;
@@ -669,7 +669,7 @@ QDF_STATUS cds_get_reg_domain_from_country_code(v_REGDOMAIN_t *reg_domain_ptr,
 	struct wiphy *wiphy = NULL;
 
 	if (NULL == reg_domain_ptr) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  ("Invalid reg domain pointer"));
 		return QDF_STATUS_E_FAULT;
 	}
@@ -680,21 +680,21 @@ QDF_STATUS cds_get_reg_domain_from_country_code(v_REGDOMAIN_t *reg_domain_ptr,
 		return QDF_STATUS_SUCCESS;
 
 	if (NULL == country_alpha2) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  ("Country code array is NULL"));
 		return QDF_STATUS_E_FAULT;
 	}
 
 	if (cds_is_driver_recovering()) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "SSR in progress, return");
 		return QDF_STATUS_SUCCESS;
 	}
 
-	hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD);
+	hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
 
 	if (NULL == hdd_ctx) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  ("Invalid pHddCtx pointer"));
 		return QDF_STATUS_E_FAULT;
 	}
@@ -751,9 +751,9 @@ static int cds_process_regulatory_data(struct wiphy *wiphy,
 	struct ieee80211_channel *chan;
 	struct regulatory_channel *temp_chan_k, *temp_chan_n, *temp_chan;
 
-	hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD);
+	hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (NULL == hdd_ctx) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "invalid hdd_ctx pointer");
 		return QDF_STATUS_E_FAULT;
 	}
@@ -761,7 +761,7 @@ static int cds_process_regulatory_data(struct wiphy *wiphy,
 	hdd_ctx->isVHT80Allowed = 0;
 
 	if (band_capability == eCSR_BAND_24)
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO,
 			  "band capability is set to 2G only");
 
 	for (i = 0, m = 0; i < IEEE80211_NUM_BANDS; i++) {
@@ -808,7 +808,7 @@ static int cds_process_regulatory_data(struct wiphy *wiphy,
 
 					if (!(reg_rule->flags &
 					      NL80211_RRF_DFS)) {
-						CDF_TRACE(CDF_MODULE_ID_CDF,
+						CDF_TRACE(QDF_MODULE_ID_QDF,
 							  CDF_TRACE_LEVEL_INFO,
 							  "%s: Remove passive scan restriction for %u",
 							  __func__,
@@ -819,7 +819,7 @@ static int cds_process_regulatory_data(struct wiphy *wiphy,
 
 					if (!(reg_rule->flags &
 					      NL80211_RRF_PASSIVE_SCAN)) {
-						CDF_TRACE(CDF_MODULE_ID_CDF,
+						CDF_TRACE(QDF_MODULE_ID_QDF,
 							  CDF_TRACE_LEVEL_INFO,
 							  "%s: Remove passive scan restriction for %u",
 							  __func__,
@@ -830,7 +830,7 @@ static int cds_process_regulatory_data(struct wiphy *wiphy,
 
 					if (!(reg_rule->flags &
 					      NL80211_RRF_NO_IBSS)) {
-						CDF_TRACE(CDF_MODULE_ID_CDF,
+						CDF_TRACE(QDF_MODULE_ID_QDF,
 							  CDF_TRACE_LEVEL_INFO,
 							  "%s: Remove no ibss restriction for %u",
 							  __func__,
@@ -972,7 +972,7 @@ void __hdd_reg_notifier(struct wiphy *wiphy,
 	bool vht80_allowed;
 	bool reset = false;
 
-	CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO,
+	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO,
 		  FL("country: %c%c, initiator %d, dfs_region: %d"),
 		  request->alpha2[0],
 		  request->alpha2[1],
@@ -980,13 +980,13 @@ void __hdd_reg_notifier(struct wiphy *wiphy,
 		  request->dfs_region);
 
 	if (NULL == hdd_ctx) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  ("Invalid pHddCtx pointer"));
 		return;
 	}
 
 	if (cds_is_driver_unloading() || cds_is_driver_recovering()) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s: Unloading or SSR in Progress, Ignore!!!",
 			  __func__);
 		return;
@@ -1055,7 +1055,7 @@ void __hdd_reg_notifier(struct wiphy *wiphy,
 		vht80_allowed = hdd_ctx->isVHT80Allowed;
 		if (cds_process_regulatory_data(wiphy, band_capability,
 						reset) == 0) {
-			CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO,
+			CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO,
 				  (" regulatory entry created"));
 		}
 		if (hdd_ctx->isVHT80Allowed != vht80_allowed)
@@ -1105,9 +1105,9 @@ QDF_STATUS cds_regulatory_init(void)
 	int ret_val = 0;
 	struct regulatory *reg_info;
 
-	hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD);
+	hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (!hdd_ctx) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "invalid hdd_ctx pointer");
 		return QDF_STATUS_E_FAULT;
 	}
@@ -1121,7 +1121,7 @@ QDF_STATUS cds_regulatory_init(void)
 	if (cds_process_regulatory_data(wiphy,
 					hdd_ctx->config->
 					nBandCapability, true) != 0) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  ("Error while creating regulatory entry"));
 		return QDF_STATUS_E_FAULT;
 	}
@@ -1130,7 +1130,7 @@ QDF_STATUS cds_regulatory_init(void)
 
 	ret_val = cds_fill_some_regulatory_info(reg_info);
 	if (ret_val) {
-		cdf_print(KERN_ERR "Error in getting country code\n");
+		qdf_print(KERN_ERR "Error in getting country code\n");
 		return ret_val;
 	}
 
@@ -1154,7 +1154,7 @@ QDF_STATUS cds_regulatory_init(void)
 QDF_STATUS cds_set_reg_domain(void *client_ctxt, v_REGDOMAIN_t reg_domain)
 {
 	if (reg_domain >= REGDOMAIN_COUNT) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "CDS set reg domain, invalid REG domain ID %d",
 			  reg_domain);
 		return QDF_STATUS_E_INVAL;
@@ -1174,9 +1174,9 @@ QDF_STATUS cds_set_reg_domain(void *client_ctxt, v_REGDOMAIN_t reg_domain)
 void cds_set_ch_params(uint8_t ch, uint32_t phy_mode,
 		chan_params_t *ch_params)
 {
-	tHalHandle *hal_ctx = cds_get_context(CDF_MODULE_ID_PE);
+	tHalHandle *hal_ctx = cds_get_context(QDF_MODULE_ID_PE);
 	if (!hal_ctx) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			("Invalid hal_ctx pointer"));
 		return;
 	}

core/cds/src/cds_regdomain.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011,2013-2015 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011,2013-2016 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -65,7 +65,7 @@
  * SUCH DAMAGES.
  */
 
-#include <cdf_types.h>
+#include <qdf_types.h>
 #include "wma.h"
 #include "cds_regdomain.h"
 #include "cds_regdomain_common.h"
@@ -74,89 +74,89 @@ static regdm_supp_op_classes regdm_curr_supp_opp_classes = { 0 };
 
 /* Global Operating Classes */
 regdm_op_class_map_t global_op_class[] = {
-	{81, 25, BW20, {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13}},
-	{82, 25, BW20, {14}},
-	{83, 40, BW40_LOW_PRIMARY, {1, 2, 3, 4, 5, 6, 7, 8, 9}},
-	{84, 40, BW40_HIGH_PRIMARY, {5, 6, 7, 8, 9, 10, 11, 12, 13}},
-	{115, 20, BW20, {36, 40, 44, 48}},
-	{116, 40, BW40_LOW_PRIMARY, {36, 44}},
-	{117, 40, BW40_HIGH_PRIMARY, {40, 48}},
-	{118, 20, BW20, {52, 56, 60, 64}},
-	{119, 40, BW40_LOW_PRIMARY, {52, 60}},
-	{120, 40, BW40_HIGH_PRIMARY, {56, 64}},
+	{81, 25, BW20, {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13} },
+	{82, 25, BW20, {14} },
+	{83, 40, BW40_LOW_PRIMARY, {1, 2, 3, 4, 5, 6, 7, 8, 9} },
+	{84, 40, BW40_HIGH_PRIMARY, {5, 6, 7, 8, 9, 10, 11, 12, 13} },
+	{115, 20, BW20, {36, 40, 44, 48} },
+	{116, 40, BW40_LOW_PRIMARY, {36, 44} },
+	{117, 40, BW40_HIGH_PRIMARY, {40, 48} },
+	{118, 20, BW20, {52, 56, 60, 64} },
+	{119, 40, BW40_LOW_PRIMARY, {52, 60} },
+	{120, 40, BW40_HIGH_PRIMARY, {56, 64} },
 	{121, 20, BW20,
-	 {100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140}},
-	{122, 40, BW40_LOW_PRIMARY, {100, 108, 116, 124, 132}},
-	{123, 40, BW40_HIGH_PRIMARY, {104, 112, 120, 128, 136}},
-	{125, 20, BW20, {149, 153, 157, 161, 165, 169}},
-	{126, 40, BW40_LOW_PRIMARY, {149, 157}},
-	{127, 40, BW40_HIGH_PRIMARY, {153, 161}},
+	 {100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140} },
+	{122, 40, BW40_LOW_PRIMARY, {100, 108, 116, 124, 132} },
+	{123, 40, BW40_HIGH_PRIMARY, {104, 112, 120, 128, 136} },
+	{125, 20, BW20, {149, 153, 157, 161, 165, 169} },
+	{126, 40, BW40_LOW_PRIMARY, {149, 157} },
+	{127, 40, BW40_HIGH_PRIMARY, {153, 161} },
 	{128, 80, BW80, {36, 40, 44, 48, 52, 56, 60, 64, 100, 104, 108,
 			   112, 116, 120, 124, 128, 132, 136, 140, 144,
 			   149, 153, 157, 161} },
-	{0, 0, 0, {0}},
+	{0, 0, 0, {0} },
 };
 
 /* Operating Classes in US */
 regdm_op_class_map_t us_op_class[] = {
-	{1, 20, BW20, {36, 40, 44, 48}},
-	{2, 20, BW20, {52, 56, 60, 64}},
+	{1, 20, BW20, {36, 40, 44, 48} },
+	{2, 20, BW20, {52, 56, 60, 64} },
 	{4, 20, BW20, {100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140,
 			144} },
-	{5, 20, BW20, {149, 153, 157, 161, 165}},
-	{12, 25, BW20, {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11}},
-	{22, 40, BW40_LOW_PRIMARY, {36, 44}},
-	{23, 40, BW40_LOW_PRIMARY, {52, 60}},
-	{24, 40, BW40_LOW_PRIMARY, {100, 108, 116, 124, 132}},
-	{26, 40, BW40_LOW_PRIMARY, {149, 157}},
-	{27, 40, BW40_HIGH_PRIMARY, {40, 48}},
-	{28, 40, BW40_HIGH_PRIMARY, {56, 64}},
-	{29, 40, BW40_HIGH_PRIMARY, {104, 112, 120, 128, 136}},
-	{31, 40, BW40_HIGH_PRIMARY, {153, 161}},
-	{32, 40, BW40_LOW_PRIMARY, {1, 2, 3, 4, 5, 6, 7}},
-	{33, 40, BW40_HIGH_PRIMARY, {5, 6, 7, 8, 9, 10, 11}},
+	{5, 20, BW20, {149, 153, 157, 161, 165} },
+	{12, 25, BW20, {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11} },
+	{22, 40, BW40_LOW_PRIMARY, {36, 44} },
+	{23, 40, BW40_LOW_PRIMARY, {52, 60} },
+	{24, 40, BW40_LOW_PRIMARY, {100, 108, 116, 124, 132} },
+	{26, 40, BW40_LOW_PRIMARY, {149, 157} },
+	{27, 40, BW40_HIGH_PRIMARY, {40, 48} },
+	{28, 40, BW40_HIGH_PRIMARY, {56, 64} },
+	{29, 40, BW40_HIGH_PRIMARY, {104, 112, 120, 128, 136} },
+	{31, 40, BW40_HIGH_PRIMARY, {153, 161} },
+	{32, 40, BW40_LOW_PRIMARY, {1, 2, 3, 4, 5, 6, 7} },
+	{33, 40, BW40_HIGH_PRIMARY, {5, 6, 7, 8, 9, 10, 11} },
 	{128, 80, BW80, {36, 40, 44, 48, 52, 56, 60, 64, 100, 104, 108,
 			   112, 116, 120, 124, 128, 132, 136, 140, 144,
 			   149, 153, 157, 161} },
-	{0, 0, 0, {0}},
+	{0, 0, 0, {0} },
 };
 
 /* Operating Classes in Europe */
 regdm_op_class_map_t euro_op_class[] = {
-	{1, 20, BW20, {36, 40, 44, 48}},
-	{2, 20, BW20, {52, 56, 60, 64}},
-	{3, 20, BW20, {100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140}},
-	{4, 25, BW20, {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13}},
-	{5, 40, BW40_LOW_PRIMARY, {36, 44}},
-	{6, 40, BW40_LOW_PRIMARY, {52, 60}},
-	{7, 40, BW40_LOW_PRIMARY, {100, 108, 116, 124, 132}},
-	{8, 40, BW40_HIGH_PRIMARY, {40, 48}},
-	{9, 40, BW40_HIGH_PRIMARY, {56, 64}},
-	{10, 40, BW40_HIGH_PRIMARY, {104, 112, 120, 128, 136}},
-	{11, 40, BW40_LOW_PRIMARY, {1, 2, 3, 4, 5, 6, 7, 8, 9}},
-	{12, 40, BW40_HIGH_PRIMARY, {5, 6, 7, 8, 9, 10, 11, 12, 13}},
-	{17, 20, BW20, {149, 153, 157, 161, 165, 169}},
+	{1, 20, BW20, {36, 40, 44, 48} },
+	{2, 20, BW20, {52, 56, 60, 64} },
+	{3, 20, BW20, {100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140} },
+	{4, 25, BW20, {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13} },
+	{5, 40, BW40_LOW_PRIMARY, {36, 44} },
+	{6, 40, BW40_LOW_PRIMARY, {52, 60} },
+	{7, 40, BW40_LOW_PRIMARY, {100, 108, 116, 124, 132} },
+	{8, 40, BW40_HIGH_PRIMARY, {40, 48} },
+	{9, 40, BW40_HIGH_PRIMARY, {56, 64} },
+	{10, 40, BW40_HIGH_PRIMARY, {104, 112, 120, 128, 136} },
+	{11, 40, BW40_LOW_PRIMARY, {1, 2, 3, 4, 5, 6, 7, 8, 9} },
+	{12, 40, BW40_HIGH_PRIMARY, {5, 6, 7, 8, 9, 10, 11, 12, 13} },
+	{17, 20, BW20, {149, 153, 157, 161, 165, 169} },
 	{128, 80, BW80, {36, 40, 44, 48, 52, 56, 60, 64, 100, 104, 108, 112,
 			   116, 120, 124, 128} },
-	{0, 0, 0, {0}},
+	{0, 0, 0, {0} },
 };
 
 /* Operating Classes in Japan */
 regdm_op_class_map_t japan_op_class[] = {
-	{1, 20, BW20, {36, 40, 44, 48}},
-	{30, 25, BW20, {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13}},
-	{31, 25, BW20, {14}},
-	{32, 20, BW20, {52, 56, 60, 64}},
-	{34, 20, BW20, {100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140}},
-	{36, 40, BW40_LOW_PRIMARY, {36, 44}},
-	{37, 40, BW40_LOW_PRIMARY, {52, 60}},
-	{39, 40, BW40_LOW_PRIMARY, {100, 108, 116, 124, 132}},
-	{41, 40, BW40_HIGH_PRIMARY, {40, 48}},
-	{42, 40, BW40_HIGH_PRIMARY, {56, 64}},
-	{44, 40, BW40_HIGH_PRIMARY, {104, 112, 120, 128, 136}},
+	{1, 20, BW20, {36, 40, 44, 48} },
+	{30, 25, BW20, {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13} },
+	{31, 25, BW20, {14} },
+	{32, 20, BW20, {52, 56, 60, 64} },
+	{34, 20, BW20, {100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140} },
+	{36, 40, BW40_LOW_PRIMARY, {36, 44} },
+	{37, 40, BW40_LOW_PRIMARY, {52, 60} },
+	{39, 40, BW40_LOW_PRIMARY, {100, 108, 116, 124, 132} },
+	{41, 40, BW40_HIGH_PRIMARY, {40, 48} },
+	{42, 40, BW40_HIGH_PRIMARY, {56, 64} },
+	{44, 40, BW40_HIGH_PRIMARY, {104, 112, 120, 128, 136} },
 	{128, 80, BW80, {36, 40, 44, 48, 52, 56, 60, 64, 100, 104, 108, 112,
 			   116, 120, 124, 128} },
-	{0, 0, 0, {0}},
+	{0, 0, 0, {0} },
 };
 
 /*
@@ -168,9 +168,9 @@ HAL_REG_DMN_TABLES ol_regdmn_rdt = {
 	ah_cmn_reg_domain_pairs,    /* regDomainPairs */
 	ah_cmn_all_countries,      /* allCountries */
 	ah_cmn_reg_domains,        /* allRegDomains */
-	CDF_ARRAY_SIZE(ah_cmn_reg_domain_pairs), /* regDomainPairsCt */
-	CDF_ARRAY_SIZE(ah_cmn_all_countries),   /* allCountriesCt */
-	CDF_ARRAY_SIZE(ah_cmn_reg_domains),     /* allRegDomainCt */
+	QDF_ARRAY_SIZE(ah_cmn_reg_domain_pairs), /* regDomainPairsCt */
+	QDF_ARRAY_SIZE(ah_cmn_all_countries),   /* allCountriesCt */
+	QDF_ARRAY_SIZE(ah_cmn_reg_domains),     /* allRegDomainCt */
 };
 
 static uint16_t get_eeprom_rd(uint16_t rd)
@@ -197,7 +197,7 @@ static bool regdmn_is_eeprom_valid(uint16_t rd)
 				return true;
 	}
 	/* TODO: Bring it under debug level */
-	cdf_print("%s: invalid regulatory domain/country code 0x%x\n",
+	qdf_print("%s: invalid regulatory domain/country code 0x%x\n",
 		  __func__, rd);
 	return false;
 }
@@ -329,7 +329,7 @@ int32_t cds_fill_some_regulatory_info(struct regulatory *reg)
 		country = find_country(country_code);
 		if (!country) {
 			/* TODO: Bring it under debug level */
-			cdf_print(KERN_ERR "Not a valid country code\n");
+			qdf_print(KERN_ERR "Not a valid country code\n");
 			return -EINVAL;
 		}
 		regdmn = country->regDmnEnum;
@@ -338,7 +338,7 @@ int32_t cds_fill_some_regulatory_info(struct regulatory *reg)
 	reg->regpair = get_regdmn_pair(regdmn);
 	if (!reg->regpair) {
 		/* TODO: Bring it under debug level */
-		cdf_print(KERN_ERR "No regpair is found, can not proceeed\n");
+		qdf_print(KERN_ERR "No regpair is found, can not proceeed\n");
 		return -EINVAL;
 	}
 	reg->country_code = country_code;
@@ -464,13 +464,13 @@ void cds_fill_send_ctl_info_to_fw(struct regulatory *reg, uint32_t modesAvail,
 	regpair = reg->regpair;
 	regdomain2G = get_regdmn(regpair->regDmn2GHz);
 	if (!regdomain2G) {
-		cdf_print(KERN_ERR "Failed to get regdmn 2G");
+		qdf_print(KERN_ERR "Failed to get regdmn 2G");
 		return;
 	}
 
 	regdomain5G = get_regdmn(regpair->regDmn5GHz);
 	if (!regdomain5G) {
-		cdf_print(KERN_ERR "Failed to get regdmn 5G");
+		qdf_print(KERN_ERR "Failed to get regdmn 5G");
 		return;
 	}
 
@@ -484,7 +484,7 @@ void cds_fill_send_ctl_info_to_fw(struct regulatory *reg, uint32_t modesAvail,
 		modesAvail =
 			regdmn_getwmodesnreg(modesAvail, country, regdomain5G);
 
-	for (cm = modes; cm < &modes[CDF_ARRAY_SIZE(modes)]; cm++) {
+	for (cm = modes; cm < &modes[QDF_ARRAY_SIZE(modes)]; cm++) {
 
 		if ((cm->mode & modeSelect) == 0)
 			continue;
@@ -531,7 +531,7 @@ void cds_fill_send_ctl_info_to_fw(struct regulatory *reg, uint32_t modesAvail,
 			ctl = rd->conformance_test_limit | CTL_108G;
 			break;
 		default:
-			cdf_print(KERN_ERR "%s: Unkonwn HAL mode 0x%x\n",
+			qdf_print(KERN_ERR "%s: Unkonwn HAL mode 0x%x\n",
 				  __func__, cm->mode);
 			continue;
 		}
@@ -559,20 +559,20 @@ void cds_fill_send_ctl_info_to_fw(struct regulatory *reg, uint32_t modesAvail,
  */
 void cds_set_wma_dfs_region(struct regulatory *reg)
 {
-	tp_wma_handle wma = cds_get_context(CDF_MODULE_ID_WMA);
+	tp_wma_handle wma = cds_get_context(QDF_MODULE_ID_WMA);
 
 	if (!wma) {
-		cdf_print(KERN_ERR "%s: Unable to get WMA handle", __func__);
+		qdf_print(KERN_ERR "%s: Unable to get WMA handle", __func__);
 		return;
 	}
 
-	cdf_print("%s: dfs_region: %d", __func__, reg->dfs_region);
+	qdf_print("%s: dfs_region: %d", __func__, reg->dfs_region);
 	wma_set_dfs_region(wma, reg->dfs_region);
 }
 
 void cds_fill_and_send_ctl_to_fw(struct regulatory *reg)
 {
-	tp_wma_handle wma = cds_get_context(CDF_MODULE_ID_WMA);
+	tp_wma_handle wma = cds_get_context(QDF_MODULE_ID_WMA);
 	uint32_t modeSelect = 0xFFFFFFFF;
 
 	if (!wma) {
@@ -617,7 +617,7 @@ uint16_t cds_get_regdmn_5g(uint32_t reg_dmn)
 			return ol_regdmn_rdt.regDomainPairs[i].regDmn5GHz;
 		}
 	}
-	cdf_print("%s: invalid regulatory domain/country code 0x%x\n",
+	qdf_print("%s: invalid regulatory domain/country code 0x%x\n",
 		  __func__, reg_dmn);
 	return 0;
 }
@@ -707,7 +707,7 @@ uint16_t cds_regdm_set_curr_opclasses(uint8_t num_classes, uint8_t *class)
 	uint8_t i;
 
 	if (SIR_MAC_MAX_SUPP_OPER_CLASSES < num_classes) {
-		cdf_print(KERN_ERR "%s: Invalid numClasses (%d)\n",
+		qdf_print(KERN_ERR "%s: Invalid numClasses (%d)\n",
 			  __func__, num_classes);
 		return -1;
 	}
@@ -728,7 +728,7 @@ uint16_t cds_regdm_get_curr_opclasses(uint8_t *num_classes, uint8_t *class)
 	uint8_t i;
 
 	if (!num_classes || !class) {
-		cdf_print(KERN_ERR "%s: Either num_classes or class is null\n",
+		qdf_print(KERN_ERR "%s: Either num_classes or class is null\n",
 			  __func__);
 		return -1;
 	}

core/cds/src/cds_sched.c

@@ -36,7 +36,7 @@
 #include <cds_api.h>
 #include <ani_global.h>
 #include <sir_types.h>
-#include <cdf_types.h>
+#include <qdf_types.h>
 #include <lim_api.h>
 #include <sme_api.h>
 #include <wlan_qct_sys.h>
@@ -124,7 +124,7 @@ cds_cpu_hotplug_notify(struct notifier_block *block,
 		return NOTIFY_OK;
 
 	num_cpus = num_possible_cpus();
-	CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_LOW,
+	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_LOW,
 		  "%s: RX CORE %d, STATE %d, NUM CPUS %d",
 		  __func__, (int)affine_cpu, (int)state, num_cpus);
 	multi_cluster = (num_cpus > CDS_CORE_PER_CLUSTER) ? 1 : 0;
@@ -191,16 +191,16 @@ QDF_STATUS cds_sched_open(void *p_cds_context,
 		uint32_t SchedCtxSize)
 {
 	QDF_STATUS vStatus = QDF_STATUS_SUCCESS;
-	CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH,
+	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: Opening the CDS Scheduler", __func__);
 	/* Sanity checks */
 	if ((p_cds_context == NULL) || (pSchedContext == NULL)) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s: Null params being passed", __func__);
 		return QDF_STATUS_E_FAILURE;
 	}
 	if (sizeof(cds_sched_context) != SchedCtxSize) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH,
 			  "%s: Incorrect CDS Sched Context size passed",
 			  __func__);
 		return QDF_STATUS_E_INVAL;
@@ -209,7 +209,7 @@ QDF_STATUS cds_sched_open(void *p_cds_context,
 	pSchedContext->pVContext = p_cds_context;
 	vStatus = cds_sched_init_mqs(pSchedContext);
 	if (!QDF_IS_STATUS_SUCCESS(vStatus)) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s: Failed to initialize CDS Scheduler MQs",
 			  __func__);
 		return vStatus;
@@ -252,13 +252,13 @@ QDF_STATUS cds_sched_open(void *p_cds_context,
 	pSchedContext->McThread = kthread_create(cds_mc_thread, pSchedContext,
 						 "cds_mc_thread");
 	if (IS_ERR(pSchedContext->McThread)) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL,
 			  "%s: Could not Create CDS Main Thread Controller",
 			  __func__);
 		goto MC_THREAD_START_FAILURE;
 	}
 	wake_up_process(pSchedContext->McThread);
-	CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH,
+	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: CDS Main Controller thread Created", __func__);
 
 #ifdef QCA_CONFIG_SMP
@@ -267,14 +267,14 @@ QDF_STATUS cds_sched_open(void *p_cds_context,
 						       "cds_ol_rx_thread");
 	if (IS_ERR(pSchedContext->ol_rx_thread)) {
 
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL,
 			  "%s: Could not Create CDS OL RX Thread",
 			  __func__);
 		goto OL_RX_THREAD_START_FAILURE;
 
 	}
 	wake_up_process(pSchedContext->ol_rx_thread);
-	CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH,
+	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH,
 		  ("CDS OL RX thread Created"));
 #endif
 	/*
@@ -282,15 +282,15 @@ QDF_STATUS cds_sched_open(void *p_cds_context,
 	 * Each thread should normally ACK back when it starts.
 	 */
 	wait_for_completion_interruptible(&pSchedContext->McStartEvent);
-	CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH,
+	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: CDS MC Thread has started", __func__);
 #ifdef QCA_CONFIG_SMP
 	wait_for_completion_interruptible(&pSchedContext->ol_rx_start_event);
-	CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH,
+	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: CDS OL Rx Thread has started", __func__);
 #endif
 	/* We're good now: Let's get the ball rolling!!! */
-	CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH,
+	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: CDS Scheduler successfully Opened", __func__);
 	return QDF_STATUS_SUCCESS;
 
@@ -336,7 +336,7 @@ static int cds_mc_thread(void *Arg)
 	v_CONTEXT_t p_cds_context = NULL;
 
 	if (Arg == NULL) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s: Bad Args passed", __func__);
 		return 0;
 	}
@@ -346,21 +346,21 @@ static int cds_mc_thread(void *Arg)
 	 * has been created
 	 */
 	complete(&pSchedContext->McStartEvent);
-	CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO,
+	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO,
 		  "%s: MC Thread %d (%s) starting up", __func__, current->pid,
 		  current->comm);
 
 	/* Get the Global CDS Context */
 	p_cds_context = cds_get_global_context();
 	if (!p_cds_context) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL,
 			  "%s: Global CDS context is Null", __func__);
 		return 0;
 	}
 
-	pHddCtx = cds_get_context(CDF_MODULE_ID_HDD);
+	pHddCtx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (!pHddCtx) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL,
 			  "%s: HDD context is Null", __func__);
 		return 0;
 	}
@@ -375,7 +375,7 @@ static int cds_mc_thread(void *Arg)
 							     &pSchedContext->mcEventFlag));
 
 		if (retWaitStatus == -ERESTARTSYS) {
-			CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+			CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 				  "%s: wait_event_interruptible returned -ERESTARTSYS",
 				  __func__);
 			CDF_BUG(0);
@@ -387,7 +387,7 @@ static int cds_mc_thread(void *Arg)
 			if (test_bit
 				    (MC_SHUTDOWN_EVENT_MASK,
 				    &pSchedContext->mcEventFlag)) {
-				CDF_TRACE(CDF_MODULE_ID_CDF,
+				CDF_TRACE(QDF_MODULE_ID_QDF,
 					  CDF_TRACE_LEVEL_INFO,
 					  "%s: MC thread signaled to shutdown",
 					  __func__);
@@ -407,14 +407,14 @@ static int cds_mc_thread(void *Arg)
 			/* Check the SYS queue first */
 			if (!cds_is_mq_empty(&pSchedContext->sysMcMq)) {
 				/* Service the SYS message queue */
-				CDF_TRACE(CDF_MODULE_ID_CDF,
+				CDF_TRACE(QDF_MODULE_ID_QDF,
 					  CDF_TRACE_LEVEL_INFO,
 					  "%s: Servicing the CDS SYS MC Message queue",
 					  __func__);
 				pMsgWrapper =
 					cds_mq_get(&pSchedContext->sysMcMq);
 				if (pMsgWrapper == NULL) {
-					CDF_TRACE(CDF_MODULE_ID_CDF,
+					CDF_TRACE(QDF_MODULE_ID_QDF,
 						  CDF_TRACE_LEVEL_ERROR,
 						  "%s: pMsgWrapper is NULL",
 						  __func__);
@@ -425,7 +425,7 @@ static int cds_mc_thread(void *Arg)
 					sys_mc_process_msg(pSchedContext->pVContext,
 							   pMsgWrapper->pVosMsg);
 				if (!QDF_IS_STATUS_SUCCESS(vStatus)) {
-					CDF_TRACE(CDF_MODULE_ID_CDF,
+					CDF_TRACE(QDF_MODULE_ID_QDF,
 						  CDF_TRACE_LEVEL_ERROR,
 						  "%s: Issue Processing SYS message",
 						  __func__);
@@ -438,14 +438,14 @@ static int cds_mc_thread(void *Arg)
 			/* Check the WMA queue */
 			if (!cds_is_mq_empty(&pSchedContext->wmaMcMq)) {
 				/* Service the WMA message queue */
-				CDF_TRACE(CDF_MODULE_ID_CDF,
+				CDF_TRACE(QDF_MODULE_ID_QDF,
 					  CDF_TRACE_LEVEL_INFO,
 					  "%s: Servicing the CDS WMA MC Message queue",
 					  __func__);
 				pMsgWrapper =
 					cds_mq_get(&pSchedContext->wmaMcMq);
 				if (pMsgWrapper == NULL) {
-					CDF_TRACE(CDF_MODULE_ID_CDF,
+					CDF_TRACE(QDF_MODULE_ID_QDF,
 						  CDF_TRACE_LEVEL_ERROR,
 						  "%s: pMsgWrapper is NULL",
 						  __func__);
@@ -456,7 +456,7 @@ static int cds_mc_thread(void *Arg)
 					wma_mc_process_msg(pSchedContext->pVContext,
 							 pMsgWrapper->pVosMsg);
 				if (!QDF_IS_STATUS_SUCCESS(vStatus)) {
-					CDF_TRACE(CDF_MODULE_ID_CDF,
+					CDF_TRACE(QDF_MODULE_ID_QDF,
 						  CDF_TRACE_LEVEL_ERROR,
 						  "%s: Issue Processing WMA message",
 						  __func__);
@@ -469,14 +469,14 @@ static int cds_mc_thread(void *Arg)
 			/* Check the PE queue */
 			if (!cds_is_mq_empty(&pSchedContext->peMcMq)) {
 				/* Service the PE message queue */
-				CDF_TRACE(CDF_MODULE_ID_CDF,
+				CDF_TRACE(QDF_MODULE_ID_QDF,
 					  CDF_TRACE_LEVEL_INFO,
 					  "%s: Servicing the CDS PE MC Message queue",
 					  __func__);
 				pMsgWrapper =
 					cds_mq_get(&pSchedContext->peMcMq);
 				if (NULL == pMsgWrapper) {
-					CDF_TRACE(CDF_MODULE_ID_CDF,
+					CDF_TRACE(QDF_MODULE_ID_QDF,
 						  CDF_TRACE_LEVEL_ERROR,
 						  "%s: pMsgWrapper is NULL",
 						  __func__);
@@ -486,9 +486,9 @@ static int cds_mc_thread(void *Arg)
 
 				/* Need some optimization */
 				pMacContext =
-					cds_get_context(CDF_MODULE_ID_PE);
+					cds_get_context(QDF_MODULE_ID_PE);
 				if (NULL == pMacContext) {
-					CDF_TRACE(CDF_MODULE_ID_CDF,
+					CDF_TRACE(QDF_MODULE_ID_QDF,
 						  CDF_TRACE_LEVEL_INFO,
 						  "MAC Context not ready yet");
 					cds_core_return_msg
@@ -502,7 +502,7 @@ static int cds_mc_thread(void *Arg)
 							    (tSirMsgQ *)
 							    pMsgWrapper->pVosMsg);
 				if (eSIR_SUCCESS != macStatus) {
-					CDF_TRACE(CDF_MODULE_ID_CDF,
+					CDF_TRACE(QDF_MODULE_ID_QDF,
 						  CDF_TRACE_LEVEL_ERROR,
 						  "%s: Issue Processing PE message",
 						  __func__);
@@ -515,14 +515,14 @@ static int cds_mc_thread(void *Arg)
 			/** Check the SME queue **/
 			if (!cds_is_mq_empty(&pSchedContext->smeMcMq)) {
 				/* Service the SME message queue */
-				CDF_TRACE(CDF_MODULE_ID_CDF,
+				CDF_TRACE(QDF_MODULE_ID_QDF,
 					  CDF_TRACE_LEVEL_INFO,
 					  "%s: Servicing the CDS SME MC Message queue",
 					  __func__);
 				pMsgWrapper =
 					cds_mq_get(&pSchedContext->smeMcMq);
 				if (NULL == pMsgWrapper) {
-					CDF_TRACE(CDF_MODULE_ID_CDF,
+					CDF_TRACE(QDF_MODULE_ID_QDF,
 						  CDF_TRACE_LEVEL_ERROR,
 						  "%s: pMsgWrapper is NULL",
 						  __func__);
@@ -532,9 +532,9 @@ static int cds_mc_thread(void *Arg)
 
 				/* Need some optimization */
 				pMacContext =
-					cds_get_context(CDF_MODULE_ID_SME);
+					cds_get_context(QDF_MODULE_ID_SME);
 				if (NULL == pMacContext) {
-					CDF_TRACE(CDF_MODULE_ID_CDF,
+					CDF_TRACE(QDF_MODULE_ID_QDF,
 						  CDF_TRACE_LEVEL_INFO,
 						  "MAC Context not ready yet");
 					cds_core_return_msg
@@ -547,7 +547,7 @@ static int cds_mc_thread(void *Arg)
 					sme_process_msg((tHalHandle) pMacContext,
 							pMsgWrapper->pVosMsg);
 				if (!QDF_IS_STATUS_SUCCESS(vStatus)) {
-					CDF_TRACE(CDF_MODULE_ID_CDF,
+					CDF_TRACE(QDF_MODULE_ID_QDF,
 						  CDF_TRACE_LEVEL_ERROR,
 						  "%s: Issue Processing SME message",
 						  __func__);
@@ -579,7 +579,7 @@ static int cds_mc_thread(void *Arg)
 		} /* while message loop processing */
 	} /* while true */
 	/* If we get here the MC thread must exit */
-	CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO,
+	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO,
 		  "%s: MC Thread exiting!!!!", __func__);
 	complete_and_exit(&pSchedContext->McShutdown, 0);
 } /* cds_mc_thread() */
@@ -627,7 +627,7 @@ static QDF_STATUS cds_alloc_ol_rx_pkt_freeq(p_cds_sched_context pSchedContext)
 	for (i = 0; i < CDS_MAX_OL_RX_PKT; i++) {
 		pkt = cdf_mem_malloc(sizeof(*pkt));
 		if (!pkt) {
-			CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+			CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 				  "%s Vos packet allocation for ol rx thread failed",
 				  __func__);
 			goto free;
@@ -822,7 +822,7 @@ static int cds_ol_rx_thread(void *arg)
 		affine_cpu = pref_cpu;
 
 	if (!arg) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s: Bad Args passed", __func__);
 		return 0;
 	}
@@ -852,7 +852,7 @@ static int cds_ol_rx_thread(void *arg)
 					complete
 						(&pSchedContext->ol_suspend_rx_event);
 				}
-				CDF_TRACE(CDF_MODULE_ID_CDF,
+				CDF_TRACE(QDF_MODULE_ID_QDF,
 					  CDF_TRACE_LEVEL_INFO,
 					  "%s: Shutting down OL RX Thread",
 					  __func__);
@@ -877,7 +877,7 @@ static int cds_ol_rx_thread(void *arg)
 		}
 	}
 
-	CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO,
+	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO,
 		  "%s: Exiting CDS OL rx thread", __func__);
 	complete_and_exit(&pSchedContext->ol_rx_shutdown, 0);
 }
@@ -897,10 +897,10 @@ static int cds_ol_rx_thread(void *arg)
  */
 QDF_STATUS cds_sched_close(void *p_cds_context)
 {
-	CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH,
+	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: invoked", __func__);
 	if (gp_cds_sched_context == NULL) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s: gp_cds_sched_context == NULL", __func__);
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -944,38 +944,38 @@ QDF_STATUS cds_sched_init_mqs(p_cds_sched_context pSchedContext)
 {
 	QDF_STATUS vStatus = QDF_STATUS_SUCCESS;
 	/* Now intialize all the message queues */
-	CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH,
+	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: Initializing the WMA MC Message queue", __func__);
 	vStatus = cds_mq_init(&pSchedContext->wmaMcMq);
 	if (!QDF_IS_STATUS_SUCCESS(vStatus)) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s: Failed to init WMA MC Message queue", __func__);
 		CDF_ASSERT(0);
 		return vStatus;
 	}
-	CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH,
+	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: Initializing the PE MC Message queue", __func__);
 	vStatus = cds_mq_init(&pSchedContext->peMcMq);
 	if (!QDF_IS_STATUS_SUCCESS(vStatus)) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s: Failed to init PE MC Message queue", __func__);
 		CDF_ASSERT(0);
 		return vStatus;
 	}
-	CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH,
+	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: Initializing the SME MC Message queue", __func__);
 	vStatus = cds_mq_init(&pSchedContext->smeMcMq);
 	if (!QDF_IS_STATUS_SUCCESS(vStatus)) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s: Failed to init SME MC Message queue", __func__);
 		CDF_ASSERT(0);
 		return vStatus;
 	}
-	CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH,
+	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: Initializing the SYS MC Message queue", __func__);
 	vStatus = cds_mq_init(&pSchedContext->sysMcMq);
 	if (!QDF_IS_STATUS_SUCCESS(vStatus)) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s: Failed to init SYS MC Message queue", __func__);
 		CDF_ASSERT(0);
 		return vStatus;
@@ -995,19 +995,19 @@ void cds_sched_deinit_mqs(p_cds_sched_context pSchedContext)
 	/* Now de-intialize all message queues */
 
 	/* MC WMA */
-	CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH,
+	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s De-Initializing the WMA MC Message queue", __func__);
 	cds_mq_deinit(&pSchedContext->wmaMcMq);
 	/* MC PE */
-	CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH,
+	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s De-Initializing the PE MC Message queue", __func__);
 	cds_mq_deinit(&pSchedContext->peMcMq);
 	/* MC SME */
-	CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH,
+	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s De-Initializing the SME MC Message queue", __func__);
 	cds_mq_deinit(&pSchedContext->smeMcMq);
 	/* MC SYS */
-	CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH,
+	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s De-Initializing the SYS MC Message queue", __func__);
 	cds_mq_deinit(&pSchedContext->sysMcMq);
 
@@ -1028,26 +1028,26 @@ void cds_sched_flush_mc_mqs(p_cds_sched_context pSchedContext)
 	 * Core. Before returning a wrapper to the Core, the CDS message shall
 	 * be freed first
 	 */
-	CDF_TRACE(CDF_MODULE_ID_CDF,
+	CDF_TRACE(QDF_MODULE_ID_QDF,
 		  CDF_TRACE_LEVEL_INFO,
 		  ("Flushing the MC Thread message queue"));
 
 	if (NULL == pSchedContext) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s: pSchedContext is NULL", __func__);
 		return;
 	}
 
 	cds_ctx = (p_cds_contextType) (pSchedContext->pVContext);
 	if (NULL == cds_ctx) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s: cds_ctx is NULL", __func__);
 		return;
 	}
 
 	/* Flush the SYS Mq */
 	while (NULL != (pMsgWrapper = cds_mq_get(&pSchedContext->sysMcMq))) {
-		CDF_TRACE(CDF_MODULE_ID_CDF,
+		CDF_TRACE(QDF_MODULE_ID_QDF,
 			  CDF_TRACE_LEVEL_INFO,
 			  "%s: Freeing MC SYS message type %d ", __func__,
 			  pMsgWrapper->pVosMsg->type);
@@ -1056,7 +1056,7 @@ void cds_sched_flush_mc_mqs(p_cds_sched_context pSchedContext)
 	/* Flush the WMA Mq */
 	while (NULL != (pMsgWrapper = cds_mq_get(&pSchedContext->wmaMcMq))) {
 		if (pMsgWrapper->pVosMsg != NULL) {
-			CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO,
+			CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO,
 				  "%s: Freeing MC WMA MSG message type %d",
 				  __func__, pMsgWrapper->pVosMsg->type);
 			if (pMsgWrapper->pVosMsg->bodyptr) {
@@ -1073,7 +1073,7 @@ void cds_sched_flush_mc_mqs(p_cds_sched_context pSchedContext)
 
 	/* Flush the PE Mq */
 	while (NULL != (pMsgWrapper = cds_mq_get(&pSchedContext->peMcMq))) {
-		CDF_TRACE(CDF_MODULE_ID_CDF,
+		CDF_TRACE(QDF_MODULE_ID_QDF,
 			  CDF_TRACE_LEVEL_INFO,
 			  "%s: Freeing MC PE MSG message type %d", __func__,
 			  pMsgWrapper->pVosMsg->type);
@@ -1083,7 +1083,7 @@ void cds_sched_flush_mc_mqs(p_cds_sched_context pSchedContext)
 	}
 	/* Flush the SME Mq */
 	while (NULL != (pMsgWrapper = cds_mq_get(&pSchedContext->smeMcMq))) {
-		CDF_TRACE(CDF_MODULE_ID_CDF,
+		CDF_TRACE(QDF_MODULE_ID_QDF,
 			  CDF_TRACE_LEVEL_INFO,
 			  "%s: Freeing MC SME MSG message type %d", __func__,
 			  pMsgWrapper->pVosMsg->type);
@@ -1101,7 +1101,7 @@ p_cds_sched_context get_cds_sched_ctxt(void)
 {
 	/* Make sure that Vos Scheduler context has been initialized */
 	if (gp_cds_sched_context == NULL)
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s: gp_cds_sched_context == NULL", __func__);
 
 	return gp_cds_sched_context;
@@ -1143,7 +1143,7 @@ static void cds_print_external_threads(void)
 
 	while (i < MAX_SSR_PROTECT_LOG) {
 		if (!ssr_protect_log[i].free) {
-			CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+			CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			"PID %d is stuck at %s", ssr_protect_log[i].pid,
 			ssr_protect_log[i].func);
 		}
@@ -1186,7 +1186,7 @@ void cds_ssr_protect(const char *caller_func)
 	spin_unlock_irqrestore(&ssr_protect_lock, irq_flags);
 
 	if (!status)
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 		"Could not track PID %d call %s: log is full",
 		current->pid, caller_func);
 }
@@ -1225,7 +1225,7 @@ void cds_ssr_unprotect(const char *caller_func)
 	spin_unlock_irqrestore(&ssr_protect_lock, irq_flags);
 
 	if (!status)
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			"Untracked call %s", caller_func);
 }
 
@@ -1247,7 +1247,7 @@ bool cds_wait_for_external_threads_completion(const char *caller_func)
 			break;
 
 		if (--count) {
-			CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+			CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 				  "%s: Waiting for active entry points to exit",
 				  __func__);
 			msleep(SSR_WAIT_SLEEP_TIME);
@@ -1259,7 +1259,7 @@ bool cds_wait_for_external_threads_completion(const char *caller_func)
 		return false;
 	}
 
-	CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO,
+	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO,
 		  "Allowing SSR/Driver unload for %s", caller_func);
 
 	return true;

core/cds/src/cds_utils.c

@@ -358,7 +358,7 @@ cds_attach_mmie(uint8_t *igtk, uint8_t *ipn, uint16_t key_id,
 
 	/* Check if frame is invalid length */
 	if (((efrm - frm) != frmLen) || (frmLen < sizeof(*wh))) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s: Invalid frame length", __func__);
 		return false;
 	}
@@ -388,14 +388,14 @@ cds_attach_mmie(uint8_t *igtk, uint8_t *ipn, uint16_t key_id,
 	if (IS_ERR(tfm)) {
 		ret = PTR_ERR(tfm);
 		tfm = NULL;
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s: crypto_alloc_cipher failed (%d)", __func__, ret);
 		goto err_tfm;
 	}
 
 	ret = crypto_cipher_setkey(tfm, igtk, AES_KEYSIZE_128);
 	if (ret) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s: crypto_cipher_setkey failed (%d)", __func__,
 			  ret);
 		goto err_tfm;
@@ -418,7 +418,7 @@ cds_attach_mmie(uint8_t *igtk, uint8_t *ipn, uint16_t key_id,
 	nBytes = AAD_LEN + (frmLen - sizeof(struct ieee80211_frame));
 	input = (uint8_t *) cdf_mem_malloc(nBytes);
 	if (NULL == input) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s: Memory allocation failed", __func__);
 		ret = QDF_STATUS_E_NOMEM;
 		goto err_tfm;
@@ -439,7 +439,7 @@ cds_attach_mmie(uint8_t *igtk, uint8_t *ipn, uint16_t key_id,
 	cds_cmac_calc_mic(tfm, input, nBytes, mic);
 	cdf_mem_free(input);
 
-	CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH,
+	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH,
 		  "CMAC(T)= %02X %02X %02X %02X %02X %02X %02X %02X",
 		  mic[0], mic[1], mic[2], mic[3],
 		  mic[4], mic[5], mic[6], mic[7]);
@@ -467,7 +467,7 @@ cds_is_mmie_valid(uint8_t *igtk, uint8_t *ipn, uint8_t *frm, uint8_t *efrm)
 
 	/* Check if frame is invalid length */
 	if ((efrm < frm) || ((efrm - frm) < sizeof(*wh))) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "Invalid frame length");
 		return false;
 	}
@@ -477,7 +477,7 @@ cds_is_mmie_valid(uint8_t *igtk, uint8_t *ipn, uint8_t *frm, uint8_t *efrm)
 	/* Check Element ID */
 	if ((mmie->element_id != IEEE80211_ELEMID_MMIE) ||
 	    (mmie->length != (sizeof(*mmie) - 2))) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "IE is not Mgmt MIC IE or Invalid length");
 		/* IE is not Mgmt MIC IE or invalid length */
 		return false;
@@ -487,7 +487,7 @@ cds_is_mmie_valid(uint8_t *igtk, uint8_t *ipn, uint8_t *frm, uint8_t *efrm)
 	rx_ipn = mmie->sequence_number;
 	if (OS_MEMCMP(rx_ipn, ipn, CMAC_IPN_LEN) <= 0) {
 		/* Replay error */
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "Replay error mmie ipn %02X %02X %02X %02X %02X %02X"
 			  " drvr ipn %02X %02X %02X %02X %02X %02X",
 			  rx_ipn[0], rx_ipn[1], rx_ipn[2], rx_ipn[3], rx_ipn[4],
@@ -499,14 +499,14 @@ cds_is_mmie_valid(uint8_t *igtk, uint8_t *ipn, uint8_t *frm, uint8_t *efrm)
 	if (IS_ERR(tfm)) {
 		ret = PTR_ERR(tfm);
 		tfm = NULL;
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "crypto_alloc_cipher failed (%d)", ret);
 		goto err_tfm;
 	}
 
 	ret = crypto_cipher_setkey(tfm, igtk, AES_KEYSIZE_128);
 	if (ret) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "crypto_cipher_setkey failed (%d)", ret);
 		goto err_tfm;
 	}
@@ -528,7 +528,7 @@ cds_is_mmie_valid(uint8_t *igtk, uint8_t *ipn, uint8_t *frm, uint8_t *efrm)
 	nBytes = AAD_LEN + (efrm - (uint8_t *) (wh + 1));
 	input = (uint8_t *) cdf_mem_malloc(nBytes);
 	if (NULL == input) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "Memory allocation failed");
 		ret = QDF_STATUS_E_NOMEM;
 		goto err_tfm;
@@ -543,14 +543,14 @@ cds_is_mmie_valid(uint8_t *igtk, uint8_t *ipn, uint8_t *frm, uint8_t *efrm)
 	cds_cmac_calc_mic(tfm, input, nBytes, mic);
 	cdf_mem_free(input);
 
-	CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 		  "CMAC(T)= %02X %02X %02X %02X %02X %02X %02X %02X",
 		  mic[0], mic[1], mic[2], mic[3],
 		  mic[4], mic[5], mic[6], mic[7]);
 
 	if (OS_MEMCMP(mic, mmie->mic, CMAC_TLEN) != 0) {
 		/* MMIE MIC mismatch */
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "BC/MC MGMT frame MMIE MIC check Failed"
 			  " rmic %02X %02X %02X %02X %02X %02X %02X %02X"
 			  " cmic %02X %02X %02X %02X %02X %02X %02X %02X",
@@ -630,7 +630,7 @@ hmac_sha1(uint8_t *key, uint8_t ksize, char *plaintext, uint8_t psize,
 	tfm = cds_crypto_alloc_ahash("hmac(sha1)", CRYPTO_ALG_TYPE_AHASH,
 				 CRYPTO_ALG_TYPE_AHASH_MASK);
 	if (IS_ERR(tfm)) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "crypto_alloc_ahash failed");
 		ret = PTR_ERR(tfm);
 		goto err_tfm;
@@ -638,7 +638,7 @@ hmac_sha1(uint8_t *key, uint8_t ksize, char *plaintext, uint8_t psize,
 
 	req = ahash_request_alloc(tfm, GFP_KERNEL);
 	if (!req) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "failed to allocate request for hmac(sha1)");
 		ret = -ENOMEM;
 		goto err_req;
@@ -649,7 +649,7 @@ hmac_sha1(uint8_t *key, uint8_t ksize, char *plaintext, uint8_t psize,
 
 	hash_buff = kzalloc(psize, GFP_KERNEL);
 	if (!hash_buff) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "failed to kzalloc hash_buff");
 		ret = -ENOMEM;
 		goto err_hash_buf;
@@ -663,7 +663,7 @@ hmac_sha1(uint8_t *key, uint8_t ksize, char *plaintext, uint8_t psize,
 		crypto_ahash_clear_flags(tfm, ~0);
 		ret = cds_crypto_ahash_setkey(tfm, key, ksize);
 		if (ret) {
-			CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+			CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 				  "crypto_ahash_setkey failed");
 			goto err_setkey;
 		}
@@ -671,7 +671,7 @@ hmac_sha1(uint8_t *key, uint8_t ksize, char *plaintext, uint8_t psize,
 
 	ahash_request_set_crypt(req, &sg, hash_result, psize);
 	ret = cds_crypto_ahash_digest(req);
-	CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "ret 0x%x", ret);
+	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "ret 0x%x", ret);
 
 	switch (ret) {
 	case 0:
@@ -687,7 +687,7 @@ hmac_sha1(uint8_t *key, uint8_t ksize, char *plaintext, uint8_t psize,
 			INIT_COMPLETION(tresult.completion);
 			break;
 		} else {
-			CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+			CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 				  "wait_for_completion_interruptible failed");
 			if (!ret)
 				ret = tresult.err;
@@ -726,7 +726,7 @@ QDF_STATUS cds_sha1_hmac_str(uint32_t cryptHandle,      /* Handle */
 			);
 
 	if (ret != 0) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "hmac_sha1() call failed");
 		return QDF_STATUS_E_FAULT;
 	}
@@ -791,7 +791,7 @@ hmac_md5(uint8_t *key, uint8_t ksize, char *plaintext, uint8_t psize,
 	tfm = cds_crypto_alloc_ahash("hmac(md5)", CRYPTO_ALG_TYPE_AHASH,
 				 CRYPTO_ALG_TYPE_AHASH_MASK);
 	if (IS_ERR(tfm)) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "crypto_alloc_ahash failed");
 		ret = PTR_ERR(tfm);
 		goto err_tfm;
@@ -799,7 +799,7 @@ hmac_md5(uint8_t *key, uint8_t ksize, char *plaintext, uint8_t psize,
 
 	req = ahash_request_alloc(tfm, GFP_KERNEL);
 	if (!req) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "failed to allocate request for hmac(md5)");
 		ret = -ENOMEM;
 		goto err_req;
@@ -810,7 +810,7 @@ hmac_md5(uint8_t *key, uint8_t ksize, char *plaintext, uint8_t psize,
 
 	hash_buff = kzalloc(psize, GFP_KERNEL);
 	if (!hash_buff) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "failed to kzalloc hash_buff");
 		ret = -ENOMEM;
 		goto err_hash_buf;
@@ -824,7 +824,7 @@ hmac_md5(uint8_t *key, uint8_t ksize, char *plaintext, uint8_t psize,
 		crypto_ahash_clear_flags(tfm, ~0);
 		ret = cds_crypto_ahash_setkey(tfm, key, ksize);
 		if (ret) {
-			CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+			CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 				  "crypto_ahash_setkey failed");
 			goto err_setkey;
 		}
@@ -833,7 +833,7 @@ hmac_md5(uint8_t *key, uint8_t ksize, char *plaintext, uint8_t psize,
 	ahash_request_set_crypt(req, &sg, hash_result, psize);
 	ret = cds_crypto_ahash_digest(req);
 
-	CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "ret 0x%x", ret);
+	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "ret 0x%x", ret);
 
 	switch (ret) {
 	case 0:
@@ -847,7 +847,7 @@ hmac_md5(uint8_t *key, uint8_t ksize, char *plaintext, uint8_t psize,
 			INIT_COMPLETION(tresult.completion);
 			break;
 		} else {
-			CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+			CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 				  "wait_for_completion_interruptible failed");
 			if (!ret)
 				ret = tresult.err;
@@ -886,7 +886,7 @@ QDF_STATUS cds_md5_hmac_str(uint32_t cryptHandle,       /* Handle */
 		       );
 
 	if (ret != 0) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "hmac_md5() call failed");
 		return QDF_STATUS_E_FAULT;
 	}
@@ -951,7 +951,7 @@ QDF_STATUS cds_encrypt_aes(uint32_t cryptHandle,        /* Handle */
 
 	tfm = cds_crypto_alloc_ablkcipher("cbc(aes)", 0, 0);
 	if (IS_ERR(tfm)) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "crypto_alloc_ablkcipher failed");
 		ret = PTR_ERR(tfm);
 		goto err_tfm;
@@ -959,7 +959,7 @@ QDF_STATUS cds_encrypt_aes(uint32_t cryptHandle,        /* Handle */
 
 	req = ablkcipher_request_alloc(tfm, GFP_KERNEL);
 	if (!req) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "Failed to allocate request for cbc(aes)");
 		ret = -ENOMEM;
 		goto err_req;
@@ -972,7 +972,7 @@ QDF_STATUS cds_encrypt_aes(uint32_t cryptHandle,        /* Handle */
 
 	ret = crypto_ablkcipher_setkey(tfm, pKey, AES_KEYSIZE_128);
 	if (ret) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "crypto_cipher_setkey failed");
 		goto err_setkey;
 	}
@@ -995,7 +995,7 @@ err_req:
 err_tfm:
 	/* return ret; */
 	if (ret != 0) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s() call failed", __func__);
 		return QDF_STATUS_E_FAULT;
 	}
@@ -1047,7 +1047,7 @@ QDF_STATUS cds_decrypt_aes(uint32_t cryptHandle,        /* Handle */
 
 	tfm = cds_crypto_alloc_ablkcipher("cbc(aes)", 0, 0);
 	if (IS_ERR(tfm)) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "crypto_alloc_ablkcipher failed");
 		ret = PTR_ERR(tfm);
 		goto err_tfm;
@@ -1055,7 +1055,7 @@ QDF_STATUS cds_decrypt_aes(uint32_t cryptHandle,        /* Handle */
 
 	req = ablkcipher_request_alloc(tfm, GFP_KERNEL);
 	if (!req) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "Failed to allocate request for cbc(aes)");
 		ret = -ENOMEM;
 		goto err_req;
@@ -1068,7 +1068,7 @@ QDF_STATUS cds_decrypt_aes(uint32_t cryptHandle,        /* Handle */
 
 	ret = crypto_ablkcipher_setkey(tfm, pKey, AES_KEYSIZE_128);
 	if (ret) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "crypto_cipher_setkey failed");
 		goto err_setkey;
 	}
@@ -1091,7 +1091,7 @@ err_req:
 err_tfm:
 	/* return ret; */
 	if (ret != 0) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s() call failed", __func__);
 		return QDF_STATUS_E_FAULT;
 	}

core/cds/src/i_cds_packet.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2015 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -25,7 +25,7 @@
  * to the Linux Foundation.
  */
 
-#if !defined( __I_CDS_PACKET_H )
+#if !defined(__I_CDS_PACKET_H)
 #define __I_CDS_PACKET_H
 
 /**=========================================================================
@@ -41,7 +41,7 @@
 /*--------------------------------------------------------------------------
    Include Files
    ------------------------------------------------------------------------*/
-#include "cdf_types.h"
+#include "qdf_types.h"
 /**
  * Rx Packet Struct
  * Buffer for the packet received from WMA has pointers to 802.11
@@ -76,9 +76,9 @@ typedef struct {
 	uint32_t mpdu_len;
 	uint32_t mpdu_hdr_len;
 	uint32_t mpdu_data_len;
-	uint8_t offloadScanLearn : 1;
-	uint8_t roamCandidateInd : 1;
-	uint8_t scan : 1;
+	uint8_t offloadScanLearn:1;
+	uint8_t roamCandidateInd:1;
+	uint8_t scan:1;
 	uint8_t scan_src;
 	uint8_t dpuFeedback;
 	uint8_t sessionId;

core/dp/htt/htt.c

@@ -35,7 +35,7 @@
  */
 
 #include <cdf_memory.h>         /* cdf_mem_malloc */
-#include <cdf_types.h>          /* cdf_device_t, cdf_print */
+#include <qdf_types.h>          /* qdf_device_t, qdf_print */
 
 #include <htt.h>                /* htt_tx_msdu_desc_t */
 #include <ol_cfg.h>
@@ -127,7 +127,7 @@ void htt_htc_misc_pkt_pool_free(struct htt_pdev_t *pdev)
 	while (pkt) {
 		next = pkt->u.next;
 		netbuf = (cdf_nbuf_t) (pkt->u.pkt.htc_pkt.pNetBufContext);
-		cdf_nbuf_unmap(pdev->osdev, netbuf, CDF_DMA_TO_DEVICE);
+		cdf_nbuf_unmap(pdev->osdev, netbuf, QDF_DMA_TO_DEVICE);
 		cdf_nbuf_free(netbuf);
 		cdf_mem_free(pkt);
 		pkt = next;
@@ -148,7 +148,7 @@ void htt_htc_misc_pkt_pool_free(struct htt_pdev_t *pdev)
 htt_pdev_handle
 htt_pdev_alloc(ol_txrx_pdev_handle txrx_pdev,
 	   ol_pdev_handle ctrl_pdev,
-	   HTC_HANDLE htc_pdev, cdf_device_t osdev)
+	   HTC_HANDLE htc_pdev, qdf_device_t osdev)
 {
 	struct htt_pdev_t *pdev;
 
@@ -171,12 +171,12 @@ htt_pdev_alloc(ol_txrx_pdev_handle txrx_pdev,
 
 	pdev->cfg.is_full_reorder_offload =
 			ol_cfg_is_full_reorder_offload(pdev->ctrl_pdev);
-	cdf_print("is_full_reorder_offloaded? %d\n",
+	qdf_print("is_full_reorder_offloaded? %d\n",
 		  (int)pdev->cfg.is_full_reorder_offload);
 
 	pdev->cfg.ce_classify_enabled =
 		ol_cfg_is_ce_classify_enabled(ctrl_pdev);
-	cdf_print("ce_classify_enabled %d\n",
+	qdf_print("ce_classify_enabled %d\n",
 		  pdev->cfg.ce_classify_enabled);
 
 	pdev->targetdef = htc_get_targetdef(htc_pdev);
@@ -254,7 +254,7 @@ htt_attach(struct htt_pdev_t *pdev, int desc_pool_size)
 	} else if (frm_type == wlan_frm_fmt_802_3) {
 		pdev->download_len = HTT_TX_HDR_SIZE_ETHERNET;
 	} else {
-		cdf_print("Unexpected frame type spec: %d\n", frm_type);
+		qdf_print("Unexpected frame type spec: %d\n", frm_type);
 		HTT_ASSERT0(0);
 	}
 	/*
@@ -441,22 +441,22 @@ int htt_htc_attach(struct htt_pdev_t *pdev)
 #if HTT_DEBUG_LEVEL > 5
 void htt_display(htt_pdev_handle pdev, int indent)
 {
-	cdf_print("%*s%s:\n", indent, " ", "HTT");
-	cdf_print("%*stx desc pool: %d elems of %d bytes, %d allocated\n",
+	qdf_print("%*s%s:\n", indent, " ", "HTT");
+	qdf_print("%*stx desc pool: %d elems of %d bytes, %d allocated\n",
 		  indent + 4, " ",
 		  pdev->tx_descs.pool_elems,
 		  pdev->tx_descs.size, pdev->tx_descs.alloc_cnt);
-	cdf_print("%*srx ring: space for %d elems, filled with %d buffers\n",
+	qdf_print("%*srx ring: space for %d elems, filled with %d buffers\n",
 		  indent + 4, " ",
 		  pdev->rx_ring.size, pdev->rx_ring.fill_level);
-	cdf_print("%*sat %p (%#x paddr)\n", indent + 8, " ",
+	qdf_print("%*sat %p (%#x paddr)\n", indent + 8, " ",
 		  pdev->rx_ring.buf.paddrs_ring, pdev->rx_ring.base_paddr);
-	cdf_print("%*snetbuf ring @ %p\n", indent + 8, " ",
+	qdf_print("%*snetbuf ring @ %p\n", indent + 8, " ",
 		  pdev->rx_ring.buf.netbufs_ring);
-	cdf_print("%*sFW_IDX shadow register: vaddr = %p, paddr = %#x\n",
+	qdf_print("%*sFW_IDX shadow register: vaddr = %p, paddr = %#x\n",
 		  indent + 8, " ",
 		  pdev->rx_ring.alloc_idx.vaddr, pdev->rx_ring.alloc_idx.paddr);
-	cdf_print("%*sSW enqueue idx= %d, SW dequeue idx: desc= %d, buf= %d\n",
+	qdf_print("%*sSW enqueue idx= %d, SW dequeue idx: desc= %d, buf= %d\n",
 		  indent + 8, " ", *pdev->rx_ring.alloc_idx.vaddr,
 		  pdev->rx_ring.sw_rd_idx.msdu_desc,
 		  pdev->rx_ring.sw_rd_idx.msdu_payld);
@@ -488,7 +488,7 @@ int htt_ipa_uc_attach(struct htt_pdev_t *pdev)
 		ol_cfg_ipa_uc_tx_max_buf_cnt(pdev->ctrl_pdev),
 		ol_cfg_ipa_uc_tx_partition_base(pdev->ctrl_pdev));
 	if (error) {
-		cdf_print("HTT IPA UC TX attach fail code %d\n", error);
+		qdf_print("HTT IPA UC TX attach fail code %d\n", error);
 		HTT_ASSERT0(0);
 		return error;
 	}
@@ -498,7 +498,7 @@ int htt_ipa_uc_attach(struct htt_pdev_t *pdev)
 		pdev,
 		ol_cfg_ipa_uc_rx_ind_ring_size(pdev->ctrl_pdev));
 	if (error) {
-		cdf_print("HTT IPA UC RX attach fail code %d\n", error);
+		qdf_print("HTT IPA UC RX attach fail code %d\n", error);
 		htt_tx_ipa_uc_detach(pdev);
 		HTT_ASSERT0(0);
 		return error;
@@ -544,19 +544,19 @@ void htt_ipa_uc_detach(struct htt_pdev_t *pdev)
  */
 int
 htt_ipa_uc_get_resource(htt_pdev_handle pdev,
-			cdf_dma_addr_t *ce_sr_base_paddr,
+			qdf_dma_addr_t *ce_sr_base_paddr,
 			uint32_t *ce_sr_ring_size,
-			cdf_dma_addr_t *ce_reg_paddr,
-			cdf_dma_addr_t *tx_comp_ring_base_paddr,
+			qdf_dma_addr_t *ce_reg_paddr,
+			qdf_dma_addr_t *tx_comp_ring_base_paddr,
 			uint32_t *tx_comp_ring_size,
 			uint32_t *tx_num_alloc_buffer,
-			cdf_dma_addr_t *rx_rdy_ring_base_paddr,
+			qdf_dma_addr_t *rx_rdy_ring_base_paddr,
 			uint32_t *rx_rdy_ring_size,
-			cdf_dma_addr_t *rx_proc_done_idx_paddr,
+			qdf_dma_addr_t *rx_proc_done_idx_paddr,
 			void **rx_proc_done_idx_vaddr,
-			cdf_dma_addr_t *rx2_rdy_ring_base_paddr,
+			qdf_dma_addr_t *rx2_rdy_ring_base_paddr,
 			uint32_t *rx2_rdy_ring_size,
-			cdf_dma_addr_t *rx2_proc_done_idx_paddr,
+			qdf_dma_addr_t *rx2_proc_done_idx_paddr,
 			void **rx2_proc_done_idx_vaddr)
 {
 	/* Release allocated resource to client */
@@ -598,8 +598,8 @@ htt_ipa_uc_get_resource(htt_pdev_handle pdev,
  */
 int
 htt_ipa_uc_set_doorbell_paddr(htt_pdev_handle pdev,
-			      cdf_dma_addr_t ipa_uc_tx_doorbell_paddr,
-			      cdf_dma_addr_t ipa_uc_rx_doorbell_paddr)
+			      qdf_dma_addr_t ipa_uc_tx_doorbell_paddr,
+			      qdf_dma_addr_t ipa_uc_rx_doorbell_paddr)
 {
 	pdev->ipa_uc_tx_rsc.tx_comp_idx_paddr = ipa_uc_tx_doorbell_paddr;
 	pdev->ipa_uc_rx_rsc.rx_rdy_idx_paddr = ipa_uc_rx_doorbell_paddr;

core/dp/htt/htt_fw_stats.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -62,11 +62,11 @@ static char *bw_str_arr[] = {"20MHz", "40MHz", "80MHz", "160MHz"};
 {														\
 	int i;												\
 														\
-	cdf_print("TX Rate Info:\n");						\
+	qdf_print("TX Rate Info:\n");						\
 														\
 	/* MCS */											\
-	cdf_print("MCS counts (0..9): ");					\
-	cdf_print("%d, %d, %d, %d, %d, %d, %d, %d, %d, %d\n",\
+	qdf_print("MCS counts (0..9): ");					\
+	qdf_print("%d, %d, %d, %d, %d, %d, %d, %d, %d, %d\n",\
 		  _tx_rate_info->mcs[0],						\
 		  _tx_rate_info->mcs[1],						\
 		  _tx_rate_info->mcs[2],						\
@@ -79,8 +79,8 @@ static char *bw_str_arr[] = {"20MHz", "40MHz", "80MHz", "160MHz"};
 		  _tx_rate_info->mcs[9]);						\
 														\
 	/* SGI */											\
-	cdf_print("SGI counts (0..9): ");					\
-	cdf_print("%d, %d, %d, %d, %d, %d, %d, %d, %d, %d\n",\
+	qdf_print("SGI counts (0..9): ");					\
+	qdf_print("%d, %d, %d, %d, %d, %d, %d, %d, %d, %d\n",\
 		  _tx_rate_info->sgi[0],						\
 		  _tx_rate_info->sgi[1],						\
 		  _tx_rate_info->sgi[2],						\
@@ -93,32 +93,32 @@ static char *bw_str_arr[] = {"20MHz", "40MHz", "80MHz", "160MHz"};
 		  _tx_rate_info->sgi[9]);						\
 														\
 	/* NSS */											\
-	cdf_print("NSS  counts: ");							\
-	cdf_print("1x1 %d, 2x2 %d, 3x3 %d\n",				\
+	qdf_print("NSS  counts: ");							\
+	qdf_print("1x1 %d, 2x2 %d, 3x3 %d\n",				\
 		  _tx_rate_info->nss[0],						\
 		  _tx_rate_info->nss[1], _tx_rate_info->nss[2]);\
 														\
 	/* BW */											\
-	cdf_print("BW counts: ");							\
+	qdf_print("BW counts: ");							\
 														\
 	for (i = 0;											\
 		i < sizeof(_tx_rate_info->bw) / sizeof(_tx_rate_info->bw[0]);\
 		i++) {											\
-			cdf_print("%s %d ", bw_str_arr[i], _tx_rate_info->bw[i]);\
+			qdf_print("%s %d ", bw_str_arr[i], _tx_rate_info->bw[i]);\
 	}													\
-	cdf_print("\n");									\
+	qdf_print("\n");									\
 														\
 	/* Preamble */										\
-	cdf_print("Preamble (O C H V) counts: ");			\
-	cdf_print("%d, %d, %d, %d\n",						\
+	qdf_print("Preamble (O C H V) counts: ");			\
+	qdf_print("%d, %d, %d, %d\n",						\
 		  _tx_rate_info->pream[0],						\
 		  _tx_rate_info->pream[1],						\
 		  _tx_rate_info->pream[2],						\
 		  _tx_rate_info->pream[3]);						\
 														\
 	/* STBC rate counts */								\
-	cdf_print("STBC rate counts (0..9): ");				\
-	cdf_print("%d, %d, %d, %d, %d, %d, %d, %d, %d, %d\n",\
+	qdf_print("STBC rate counts (0..9): ");				\
+	qdf_print("%d, %d, %d, %d, %d, %d, %d, %d, %d, %d\n",\
 		  _tx_rate_info->stbc[0],						\
 		  _tx_rate_info->stbc[1],						\
 		  _tx_rate_info->stbc[2],						\
@@ -131,12 +131,12 @@ static char *bw_str_arr[] = {"20MHz", "40MHz", "80MHz", "160MHz"};
 		  _tx_rate_info->stbc[9]);						\
 														\
 	/* LDPC and TxBF counts */							\
-	cdf_print("LDPC Counts: ");							\
-	cdf_print("%d\n", _tx_rate_info->ldpc);				\
-	cdf_print("RTS Counts: ");							\
-	cdf_print("%d\n", _tx_rate_info->rts_cnt);			\
+	qdf_print("LDPC Counts: ");							\
+	qdf_print("%d\n", _tx_rate_info->ldpc);				\
+	qdf_print("RTS Counts: ");							\
+	qdf_print("%d\n", _tx_rate_info->rts_cnt);			\
 	/* RSSI Values for last ack frames */				\
-	cdf_print("Ack RSSI: %d\n", _tx_rate_info->ack_rssi);\
+	qdf_print("Ack RSSI: %d\n", _tx_rate_info->ack_rssi);\
 }
 
 static void htt_t2h_stats_tx_rate_stats_print(wlan_dbg_tx_rate_info_t *
@@ -165,11 +165,11 @@ static void htt_t2h_stats_tx_rate_stats_print_v2(wlan_dbg_tx_rate_info_v2_t *
 {														\
 	int i;												\
 														\
-	cdf_print("RX Rate Info:\n");						\
+	qdf_print("RX Rate Info:\n");						\
 														\
 	/* MCS */											\
-	cdf_print("MCS counts (0..9): ");					\
-	cdf_print("%d, %d, %d, %d, %d, %d, %d, %d, %d, %d\n",\
+	qdf_print("MCS counts (0..9): ");					\
+	qdf_print("%d, %d, %d, %d, %d, %d, %d, %d, %d, %d\n",\
 		  _rx_phy_info->mcs[0],							\
 		  _rx_phy_info->mcs[1],							\
 		  _rx_phy_info->mcs[2],							\
@@ -182,8 +182,8 @@ static void htt_t2h_stats_tx_rate_stats_print_v2(wlan_dbg_tx_rate_info_v2_t *
 		  _rx_phy_info->mcs[9]);						\
 														\
 	/* SGI */											\
-	cdf_print("SGI counts (0..9): ");					\
-	cdf_print("%d, %d, %d, %d, %d, %d, %d, %d, %d, %d\n",\
+	qdf_print("SGI counts (0..9): ");					\
+	qdf_print("%d, %d, %d, %d, %d, %d, %d, %d, %d, %d\n",\
 		  _rx_phy_info->sgi[0],							\
 		  _rx_phy_info->sgi[1],							\
 		  _rx_phy_info->sgi[2],							\
@@ -196,7 +196,7 @@ static void htt_t2h_stats_tx_rate_stats_print_v2(wlan_dbg_tx_rate_info_v2_t *
 		  _rx_phy_info->sgi[9]);						\
 														\
 	/* NSS */											\
-	cdf_print("NSS  counts: ");							\
+	qdf_print("NSS  counts: ");							\
 	/* nss[0] just holds the count of non-stbc frames that were sent at 1x1 \
 	 * rates and nsts holds the count of frames sent with stbc.	\
 	 * It was decided to not include PPDUs sent w/ STBC in nss[0]\
@@ -204,28 +204,28 @@ static void htt_t2h_stats_tx_rate_stats_print_v2(wlan_dbg_tx_rate_info_v2_t *
 	 * printed (from "stbc+non-stbc count to only non-stbc count")\
 	 * if needed in the future. Hence the addition in the host code\
 	 * at this line. */									\
-	cdf_print("1x1 %d, 2x2 %d, 3x3 %d, 4x4 %d\n",		\
+	qdf_print("1x1 %d, 2x2 %d, 3x3 %d, 4x4 %d\n",		\
 		  _rx_phy_info->nss[0] + _rx_phy_info->nsts,	\
 		  _rx_phy_info->nss[1],							\
 		  _rx_phy_info->nss[2],							\
 		  _rx_phy_info->nss[3]);						\
 														\
 	/* NSTS */											\
-	cdf_print("NSTS count: ");							\
-	cdf_print("%d\n", _rx_phy_info->nsts);				\
+	qdf_print("NSTS count: ");							\
+	qdf_print("%d\n", _rx_phy_info->nsts);				\
 														\
 	/* BW */											\
-	cdf_print("BW counts: ");							\
+	qdf_print("BW counts: ");							\
 	for (i = 0;											\
 		i < sizeof(_rx_phy_info->bw) / sizeof(_rx_phy_info->bw[0]);	\
 		i++) {											\
-			cdf_print("%s %d ", bw_str_arr[i], _rx_phy_info->bw[i]);\
+			qdf_print("%s %d ", bw_str_arr[i], _rx_phy_info->bw[i]);\
 	}													\
-	cdf_print("\n");									\
+	qdf_print("\n");									\
 														\
 	/* Preamble */										\
-	cdf_print("Preamble counts: ");						\
-	cdf_print("%d, %d, %d, %d, %d, %d\n",				\
+	qdf_print("Preamble counts: ");						\
+	qdf_print("%d, %d, %d, %d, %d, %d\n",				\
 		  _rx_phy_info->pream[0],						\
 		  _rx_phy_info->pream[1],						\
 		  _rx_phy_info->pream[2],						\
@@ -234,8 +234,8 @@ static void htt_t2h_stats_tx_rate_stats_print_v2(wlan_dbg_tx_rate_info_v2_t *
 		  _rx_phy_info->pream[5]);						\
 														\
 	/* STBC rate counts */								\
-	cdf_print("STBC rate counts (0..9): ");				\
-	cdf_print("%d, %d, %d, %d, %d, %d, %d, %d, %d, %d\n",\
+	qdf_print("STBC rate counts (0..9): ");				\
+	qdf_print("%d, %d, %d, %d, %d, %d, %d, %d, %d, %d\n",\
 		  _rx_phy_info->stbc[0],						\
 		  _rx_phy_info->stbc[1],						\
 		  _rx_phy_info->stbc[2],						\
@@ -248,25 +248,25 @@ static void htt_t2h_stats_tx_rate_stats_print_v2(wlan_dbg_tx_rate_info_v2_t *
 		  _rx_phy_info->stbc[9]);						\
 														\
 	/* LDPC and TxBF counts */							\
-	cdf_print("LDPC TXBF Counts: ");					\
-	cdf_print("%d, %d\n", _rx_phy_info->ldpc, _rx_phy_info->txbf);\
+	qdf_print("LDPC TXBF Counts: ");					\
+	qdf_print("%d, %d\n", _rx_phy_info->ldpc, _rx_phy_info->txbf);\
 	/* RSSI Values for last received frames */			\
-	cdf_print("RSSI (data, mgmt): %d, %d\n", _rx_phy_info->data_rssi,\
+	qdf_print("RSSI (data, mgmt): %d, %d\n", _rx_phy_info->data_rssi,\
 		  _rx_phy_info->mgmt_rssi);						\
 														\
-	cdf_print("RSSI Chain 0 (0x%02x 0x%02x 0x%02x 0x%02x)\n",\
+	qdf_print("RSSI Chain 0 (0x%02x 0x%02x 0x%02x 0x%02x)\n",\
 		  ((_rx_phy_info->rssi_chain0 >> 24) & 0xff),	\
 		  ((_rx_phy_info->rssi_chain0 >> 16) & 0xff),	\
 		  ((_rx_phy_info->rssi_chain0 >> 8) & 0xff),	\
 		  ((_rx_phy_info->rssi_chain0 >> 0) & 0xff));	\
 														\
-	cdf_print("RSSI Chain 1 (0x%02x 0x%02x 0x%02x 0x%02x)\n",\
+	qdf_print("RSSI Chain 1 (0x%02x 0x%02x 0x%02x 0x%02x)\n",\
 		  ((_rx_phy_info->rssi_chain1 >> 24) & 0xff),	\
 		  ((_rx_phy_info->rssi_chain1 >> 16) & 0xff),	\
 		  ((_rx_phy_info->rssi_chain1 >> 8) & 0xff),	\
 		  ((_rx_phy_info->rssi_chain1 >> 0) & 0xff));	\
 														\
-	cdf_print("RSSI Chain 2 (0x%02x 0x%02x 0x%02x 0x%02x)\n",\
+	qdf_print("RSSI Chain 2 (0x%02x 0x%02x 0x%02x 0x%02x)\n",\
 		  ((_rx_phy_info->rssi_chain2 >> 24) & 0xff),	\
 		  ((_rx_phy_info->rssi_chain2 >> 16) & 0xff),	\
 		  ((_rx_phy_info->rssi_chain2 >> 8) & 0xff),	\
@@ -292,78 +292,78 @@ htt_t2h_stats_pdev_stats_print(struct wlan_dbg_stats *wlan_pdev_stats,
 	struct wlan_dbg_tx_stats *tx = &wlan_pdev_stats->tx;
 	struct wlan_dbg_rx_stats *rx = &wlan_pdev_stats->rx;
 
-	cdf_print("WAL Pdev stats:\n");
-	cdf_print("\n### Tx ###\n");
+	qdf_print("WAL Pdev stats:\n");
+	qdf_print("\n### Tx ###\n");
 
 	/* Num HTT cookies queued to dispatch list */
-	cdf_print("comp_queued       :\t%d\n", tx->comp_queued);
+	qdf_print("comp_queued       :\t%d\n", tx->comp_queued);
 	/* Num HTT cookies dispatched */
-	cdf_print("comp_delivered    :\t%d\n", tx->comp_delivered);
+	qdf_print("comp_delivered    :\t%d\n", tx->comp_delivered);
 	/* Num MSDU queued to WAL */
-	cdf_print("msdu_enqued       :\t%d\n", tx->msdu_enqued);
+	qdf_print("msdu_enqued       :\t%d\n", tx->msdu_enqued);
 	/* Num MPDU queued to WAL */
-	cdf_print("mpdu_enqued       :\t%d\n", tx->mpdu_enqued);
+	qdf_print("mpdu_enqued       :\t%d\n", tx->mpdu_enqued);
 	/* Num MSDUs dropped by WMM limit */
-	cdf_print("wmm_drop          :\t%d\n", tx->wmm_drop);
+	qdf_print("wmm_drop          :\t%d\n", tx->wmm_drop);
 	/* Num Local frames queued */
-	cdf_print("local_enqued      :\t%d\n", tx->local_enqued);
+	qdf_print("local_enqued      :\t%d\n", tx->local_enqued);
 	/* Num Local frames done */
-	cdf_print("local_freed       :\t%d\n", tx->local_freed);
+	qdf_print("local_freed       :\t%d\n", tx->local_freed);
 	/* Num queued to HW */
-	cdf_print("hw_queued         :\t%d\n", tx->hw_queued);
+	qdf_print("hw_queued         :\t%d\n", tx->hw_queued);
 	/* Num PPDU reaped from HW */
-	cdf_print("hw_reaped         :\t%d\n", tx->hw_reaped);
+	qdf_print("hw_reaped         :\t%d\n", tx->hw_reaped);
 	/* Num underruns */
-	cdf_print("mac underrun      :\t%d\n", tx->underrun);
+	qdf_print("mac underrun      :\t%d\n", tx->underrun);
 	/* Num underruns */
-	cdf_print("phy underrun      :\t%d\n", tx->phy_underrun);
+	qdf_print("phy underrun      :\t%d\n", tx->phy_underrun);
 	/* Num PPDUs cleaned up in TX abort */
-	cdf_print("tx_abort          :\t%d\n", tx->tx_abort);
+	qdf_print("tx_abort          :\t%d\n", tx->tx_abort);
 	/* Num MPDUs requed by SW */
-	cdf_print("mpdus_requed      :\t%d\n", tx->mpdus_requed);
+	qdf_print("mpdus_requed      :\t%d\n", tx->mpdus_requed);
 	/* Excessive retries */
-	cdf_print("excess retries    :\t%d\n", tx->tx_ko);
+	qdf_print("excess retries    :\t%d\n", tx->tx_ko);
 	/* last data rate */
-	cdf_print("last rc           :\t%d\n", tx->data_rc);
+	qdf_print("last rc           :\t%d\n", tx->data_rc);
 	/* scheduler self triggers */
-	cdf_print("sched self trig   :\t%d\n", tx->self_triggers);
+	qdf_print("sched self trig   :\t%d\n", tx->self_triggers);
 	/* SW retry failures */
-	cdf_print("ampdu retry failed:\t%d\n", tx->sw_retry_failure);
+	qdf_print("ampdu retry failed:\t%d\n", tx->sw_retry_failure);
 	/* ilegal phy rate errirs */
-	cdf_print("illegal rate errs :\t%d\n", tx->illgl_rate_phy_err);
+	qdf_print("illegal rate errs :\t%d\n", tx->illgl_rate_phy_err);
 	/* pdev continous excessive retries  */
-	cdf_print("pdev cont xretry  :\t%d\n", tx->pdev_cont_xretry);
+	qdf_print("pdev cont xretry  :\t%d\n", tx->pdev_cont_xretry);
 	/* pdev continous excessive retries  */
-	cdf_print("pdev tx timeout   :\t%d\n", tx->pdev_tx_timeout);
+	qdf_print("pdev tx timeout   :\t%d\n", tx->pdev_tx_timeout);
 	/* pdev resets  */
-	cdf_print("pdev resets       :\t%d\n", tx->pdev_resets);
+	qdf_print("pdev resets       :\t%d\n", tx->pdev_resets);
 	/* PPDU > txop duration  */
-	cdf_print("ppdu txop ovf     :\t%d\n", tx->txop_ovf);
+	qdf_print("ppdu txop ovf     :\t%d\n", tx->txop_ovf);
 
-	cdf_print("\n### Rx ###\n");
+	qdf_print("\n### Rx ###\n");
 	/* Cnts any change in ring routing mid-ppdu */
-	cdf_print("ppdu_route_change :\t%d\n", rx->mid_ppdu_route_change);
+	qdf_print("ppdu_route_change :\t%d\n", rx->mid_ppdu_route_change);
 	/* Total number of statuses processed */
-	cdf_print("status_rcvd       :\t%d\n", rx->status_rcvd);
+	qdf_print("status_rcvd       :\t%d\n", rx->status_rcvd);
 	/* Extra frags on rings 0-3 */
-	cdf_print("r0_frags          :\t%d\n", rx->r0_frags);
-	cdf_print("r1_frags          :\t%d\n", rx->r1_frags);
-	cdf_print("r2_frags          :\t%d\n", rx->r2_frags);
-	cdf_print("r3_frags          :\t%d\n", rx->r3_frags);
+	qdf_print("r0_frags          :\t%d\n", rx->r0_frags);
+	qdf_print("r1_frags          :\t%d\n", rx->r1_frags);
+	qdf_print("r2_frags          :\t%d\n", rx->r2_frags);
+	qdf_print("r3_frags          :\t%d\n", rx->r3_frags);
 	/* MSDUs / MPDUs delivered to HTT */
-	cdf_print("htt_msdus         :\t%d\n", rx->htt_msdus);
-	cdf_print("htt_mpdus         :\t%d\n", rx->htt_mpdus);
+	qdf_print("htt_msdus         :\t%d\n", rx->htt_msdus);
+	qdf_print("htt_mpdus         :\t%d\n", rx->htt_mpdus);
 	/* MSDUs / MPDUs delivered to local stack */
-	cdf_print("loc_msdus         :\t%d\n", rx->loc_msdus);
-	cdf_print("loc_mpdus         :\t%d\n", rx->loc_mpdus);
+	qdf_print("loc_msdus         :\t%d\n", rx->loc_msdus);
+	qdf_print("loc_mpdus         :\t%d\n", rx->loc_mpdus);
 	/* AMSDUs that have more MSDUs than the status ring size */
-	cdf_print("oversize_amsdu    :\t%d\n", rx->oversize_amsdu);
+	qdf_print("oversize_amsdu    :\t%d\n", rx->oversize_amsdu);
 	/* Number of PHY errors */
-	cdf_print("phy_errs          :\t%d\n", rx->phy_errs);
+	qdf_print("phy_errs          :\t%d\n", rx->phy_errs);
 	/* Number of PHY errors dropped */
-	cdf_print("phy_errs dropped  :\t%d\n", rx->phy_err_drop);
+	qdf_print("phy_errs dropped  :\t%d\n", rx->phy_err_drop);
 	/* Number of mpdu errors - FCS, MIC, ENC etc. */
-	cdf_print("mpdu_errs         :\t%d\n", rx->mpdu_errs);
+	qdf_print("mpdu_errs         :\t%d\n", rx->mpdu_errs);
 
 }
 
@@ -371,112 +371,112 @@ static void
 htt_t2h_stats_rx_reorder_stats_print(struct rx_reorder_stats *stats_ptr,
 				     int concise)
 {
-	cdf_print("Rx reorder statistics:\n");
-	cdf_print("  %u non-QoS frames received\n", stats_ptr->deliver_non_qos);
-	cdf_print("  %u frames received in-order\n",
+	qdf_print("Rx reorder statistics:\n");
+	qdf_print("  %u non-QoS frames received\n", stats_ptr->deliver_non_qos);
+	qdf_print("  %u frames received in-order\n",
 		  stats_ptr->deliver_in_order);
-	cdf_print("  %u frames flushed due to timeout\n",
+	qdf_print("  %u frames flushed due to timeout\n",
 		  stats_ptr->deliver_flush_timeout);
-	cdf_print("  %u frames flushed due to moving out of window\n",
+	qdf_print("  %u frames flushed due to moving out of window\n",
 		  stats_ptr->deliver_flush_oow);
-	cdf_print("  %u frames flushed due to receiving DELBA\n",
+	qdf_print("  %u frames flushed due to receiving DELBA\n",
 		  stats_ptr->deliver_flush_delba);
-	cdf_print("  %u frames discarded due to FCS error\n",
+	qdf_print("  %u frames discarded due to FCS error\n",
 		  stats_ptr->fcs_error);
-	cdf_print("  %u frames discarded due to invalid peer\n",
+	qdf_print("  %u frames discarded due to invalid peer\n",
 		  stats_ptr->invalid_peer);
-	cdf_print
+	qdf_print
 		("  %u frames discarded due to duplication (non aggregation)\n",
 		stats_ptr->dup_non_aggr);
-	cdf_print("  %u frames discarded due to duplication in reorder queue\n",
+	qdf_print("  %u frames discarded due to duplication in reorder queue\n",
 		 stats_ptr->dup_in_reorder);
-	cdf_print("  %u frames discarded due to processed before\n",
+	qdf_print("  %u frames discarded due to processed before\n",
 		  stats_ptr->dup_past);
-	cdf_print("  %u times reorder timeout happened\n",
+	qdf_print("  %u times reorder timeout happened\n",
 		  stats_ptr->reorder_timeout);
-	cdf_print("  %u times incorrect bar received\n",
+	qdf_print("  %u times incorrect bar received\n",
 		  stats_ptr->invalid_bar_ssn);
-	cdf_print("  %u times bar ssn reset happened\n",
+	qdf_print("  %u times bar ssn reset happened\n",
 			stats_ptr->ssn_reset);
-	cdf_print("  %u times flushed due to peer delete\n",
+	qdf_print("  %u times flushed due to peer delete\n",
 			stats_ptr->deliver_flush_delpeer);
-	cdf_print("  %u times flushed due to offload\n",
+	qdf_print("  %u times flushed due to offload\n",
 			stats_ptr->deliver_flush_offload);
-	cdf_print("  %u times flushed due to ouf of buffer\n",
+	qdf_print("  %u times flushed due to ouf of buffer\n",
 			stats_ptr->deliver_flush_oob);
-	cdf_print("  %u MPDU's dropped due to PN check fail\n",
+	qdf_print("  %u MPDU's dropped due to PN check fail\n",
 			stats_ptr->pn_fail);
-	cdf_print("  %u MPDU's dropped due to lack of memory\n",
+	qdf_print("  %u MPDU's dropped due to lack of memory\n",
 			stats_ptr->store_fail);
-	cdf_print("  %u times tid pool alloc succeeded\n",
+	qdf_print("  %u times tid pool alloc succeeded\n",
 			stats_ptr->tid_pool_alloc_succ);
-	cdf_print("  %u times MPDU pool alloc succeeded\n",
+	qdf_print("  %u times MPDU pool alloc succeeded\n",
 			stats_ptr->mpdu_pool_alloc_succ);
-	cdf_print("  %u times MSDU pool alloc succeeded\n",
+	qdf_print("  %u times MSDU pool alloc succeeded\n",
 			stats_ptr->msdu_pool_alloc_succ);
-	cdf_print("  %u times tid pool alloc failed\n",
+	qdf_print("  %u times tid pool alloc failed\n",
 			stats_ptr->tid_pool_alloc_fail);
-	cdf_print("  %u times MPDU pool alloc failed\n",
+	qdf_print("  %u times MPDU pool alloc failed\n",
 			stats_ptr->mpdu_pool_alloc_fail);
-	cdf_print("  %u times MSDU pool alloc failed\n",
+	qdf_print("  %u times MSDU pool alloc failed\n",
 			stats_ptr->msdu_pool_alloc_fail);
-	cdf_print("  %u times tid pool freed\n",
+	qdf_print("  %u times tid pool freed\n",
 			stats_ptr->tid_pool_free);
-	cdf_print("  %u times MPDU pool freed\n",
+	qdf_print("  %u times MPDU pool freed\n",
 			stats_ptr->mpdu_pool_free);
-	cdf_print("  %u times MSDU pool freed\n",
+	qdf_print("  %u times MSDU pool freed\n",
 			stats_ptr->msdu_pool_free);
-	cdf_print("  %u MSDUs undelivered to HTT, queued to Rx MSDU free list\n",
+	qdf_print("  %u MSDUs undelivered to HTT, queued to Rx MSDU free list\n",
 			stats_ptr->msdu_queued);
-	cdf_print("  %u MSDUs released from Rx MSDU list to MAC ring\n",
+	qdf_print("  %u MSDUs released from Rx MSDU list to MAC ring\n",
 			stats_ptr->msdu_recycled);
-	cdf_print("  %u MPDUs with invalid peer but A2 found in AST\n",
+	qdf_print("  %u MPDUs with invalid peer but A2 found in AST\n",
 			stats_ptr->invalid_peer_a2_in_ast);
-	cdf_print("  %u MPDUs with invalid peer but A3 found in AST\n",
+	qdf_print("  %u MPDUs with invalid peer but A3 found in AST\n",
 			stats_ptr->invalid_peer_a3_in_ast);
-	cdf_print("  %u MPDUs with invalid peer, Broadcast or Mulitcast frame\n",
+	qdf_print("  %u MPDUs with invalid peer, Broadcast or Mulitcast frame\n",
 			stats_ptr->invalid_peer_bmc_mpdus);
-	cdf_print("  %u MSDUs with err attention word\n",
+	qdf_print("  %u MSDUs with err attention word\n",
 			stats_ptr->rxdesc_err_att);
-	cdf_print("  %u MSDUs with flag of peer_idx_invalid\n",
+	qdf_print("  %u MSDUs with flag of peer_idx_invalid\n",
 			stats_ptr->rxdesc_err_peer_idx_inv);
-	cdf_print("  %u MSDUs with  flag of peer_idx_timeout\n",
+	qdf_print("  %u MSDUs with  flag of peer_idx_timeout\n",
 			stats_ptr->rxdesc_err_peer_idx_to);
-	cdf_print("  %u MSDUs with  flag of overflow\n",
+	qdf_print("  %u MSDUs with  flag of overflow\n",
 			stats_ptr->rxdesc_err_ov);
-	cdf_print("  %u MSDUs with  flag of msdu_length_err\n",
+	qdf_print("  %u MSDUs with  flag of msdu_length_err\n",
 			stats_ptr->rxdesc_err_msdu_len);
-	cdf_print("  %u MSDUs with  flag of mpdu_length_err\n",
+	qdf_print("  %u MSDUs with  flag of mpdu_length_err\n",
 			stats_ptr->rxdesc_err_mpdu_len);
-	cdf_print("  %u MSDUs with  flag of tkip_mic_err\n",
+	qdf_print("  %u MSDUs with  flag of tkip_mic_err\n",
 			stats_ptr->rxdesc_err_tkip_mic);
-	cdf_print("  %u MSDUs with  flag of decrypt_err\n",
+	qdf_print("  %u MSDUs with  flag of decrypt_err\n",
 			stats_ptr->rxdesc_err_decrypt);
-	cdf_print("  %u MSDUs with  flag of fcs_err\n",
+	qdf_print("  %u MSDUs with  flag of fcs_err\n",
 			stats_ptr->rxdesc_err_fcs);
-	cdf_print("  %u Unicast frames with invalid peer handler\n",
+	qdf_print("  %u Unicast frames with invalid peer handler\n",
 			stats_ptr->rxdesc_uc_msdus_inv_peer);
-	cdf_print("  %u unicast frame directly to DUT with invalid peer handler\n",
+	qdf_print("  %u unicast frame directly to DUT with invalid peer handler\n",
 			stats_ptr->rxdesc_direct_msdus_inv_peer);
-	cdf_print("  %u Broadcast/Multicast frames with invalid peer handler\n",
+	qdf_print("  %u Broadcast/Multicast frames with invalid peer handler\n",
 			stats_ptr->rxdesc_bmc_msdus_inv_peer);
-	cdf_print("  %u MSDUs dropped due to no first MSDU flag\n",
+	qdf_print("  %u MSDUs dropped due to no first MSDU flag\n",
 			stats_ptr->rxdesc_no_1st_msdu);
-	cdf_print("  %u MSDUs dropped due to ring overflow\n",
+	qdf_print("  %u MSDUs dropped due to ring overflow\n",
 			stats_ptr->msdu_drop_ring_ov);
-	cdf_print("  %u MSDUs dropped due to FC mismatch\n",
+	qdf_print("  %u MSDUs dropped due to FC mismatch\n",
 			stats_ptr->msdu_drop_fc_mismatch);
-	cdf_print("  %u MSDUs dropped due to mgt frame in Remote ring\n",
+	qdf_print("  %u MSDUs dropped due to mgt frame in Remote ring\n",
 			stats_ptr->msdu_drop_mgmt_remote_ring);
-	cdf_print("  %u MSDUs dropped due to misc non error\n",
+	qdf_print("  %u MSDUs dropped due to misc non error\n",
 			stats_ptr->msdu_drop_misc);
-	cdf_print("  %u MSDUs go to offload before reorder\n",
+	qdf_print("  %u MSDUs go to offload before reorder\n",
 			stats_ptr->offload_msdu_wal);
-	cdf_print("  %u data frame dropped by offload after reorder\n",
+	qdf_print("  %u data frame dropped by offload after reorder\n",
 			stats_ptr->offload_msdu_reorder);
-	cdf_print("  %u  MPDUs with SN in the past & within BA window\n",
+	qdf_print("  %u  MPDUs with SN in the past & within BA window\n",
 			stats_ptr->dup_past_within_window);
-	cdf_print("  %u  MPDUs with SN in the past & outside BA window\n",
+	qdf_print("  %u  MPDUs with SN in the past & outside BA window\n",
 			stats_ptr->dup_past_outside_window);
 }
 
@@ -484,32 +484,32 @@ static void
 htt_t2h_stats_rx_rem_buf_stats_print(
     struct rx_remote_buffer_mgmt_stats *stats_ptr, int concise)
 {
-	cdf_print("Rx Remote Buffer Statistics:\n");
-	cdf_print("  %u MSDU's reaped for Rx processing\n",
+	qdf_print("Rx Remote Buffer Statistics:\n");
+	qdf_print("  %u MSDU's reaped for Rx processing\n",
 			stats_ptr->remote_reaped);
-	cdf_print("  %u MSDU's recycled within firmware\n",
+	qdf_print("  %u MSDU's recycled within firmware\n",
 			stats_ptr->remote_recycled);
-	cdf_print("  %u MSDU's stored by Data Rx\n",
+	qdf_print("  %u MSDU's stored by Data Rx\n",
 			stats_ptr->data_rx_msdus_stored);
-	cdf_print("  %u HTT indications from WAL Rx MSDU\n",
+	qdf_print("  %u HTT indications from WAL Rx MSDU\n",
 			stats_ptr->wal_rx_ind);
-	cdf_print("  %u HTT indications unconsumed from WAL Rx MSDU\n",
+	qdf_print("  %u HTT indications unconsumed from WAL Rx MSDU\n",
 			stats_ptr->wal_rx_ind_unconsumed);
-	cdf_print("  %u HTT indications from Data Rx MSDU\n",
+	qdf_print("  %u HTT indications from Data Rx MSDU\n",
 			stats_ptr->data_rx_ind);
-	cdf_print("  %u HTT indications unconsumed from Data Rx MSDU\n",
+	qdf_print("  %u HTT indications unconsumed from Data Rx MSDU\n",
 			stats_ptr->data_rx_ind_unconsumed);
-	cdf_print("  %u HTT indications from ATHBUF\n",
+	qdf_print("  %u HTT indications from ATHBUF\n",
 			stats_ptr->athbuf_rx_ind);
-	cdf_print("  %u Remote buffers requested for refill\n",
+	qdf_print("  %u Remote buffers requested for refill\n",
 			stats_ptr->refill_buf_req);
-	cdf_print("  %u Remote buffers filled by host\n",
+	qdf_print("  %u Remote buffers filled by host\n",
 			stats_ptr->refill_buf_rsp);
-	cdf_print("  %u times MAC has no buffers\n",
+	qdf_print("  %u times MAC has no buffers\n",
 			stats_ptr->mac_no_bufs);
-	cdf_print("  %u times f/w write & read indices on MAC ring are equal\n",
+	qdf_print("  %u times f/w write & read indices on MAC ring are equal\n",
 			stats_ptr->fw_indices_equal);
-	cdf_print("  %u times f/w has no remote buffers to post to MAC\n",
+	qdf_print("  %u times f/w has no remote buffers to post to MAC\n",
 			stats_ptr->host_no_bufs);
 }
 
@@ -517,9 +517,9 @@ static void
 htt_t2h_stats_txbf_info_buf_stats_print(
 	struct wlan_dbg_txbf_data_stats *stats_ptr)
 {
-	cdf_print("TXBF data Statistics:\n");
-	cdf_print("tx_txbf_vht (0..9): ");
-	cdf_print("%u, %u, %u, %u, %u, %u, %u, %u, %u, %d\n",
+	qdf_print("TXBF data Statistics:\n");
+	qdf_print("tx_txbf_vht (0..9): ");
+	qdf_print("%u, %u, %u, %u, %u, %u, %u, %u, %u, %d\n",
 		  stats_ptr->tx_txbf_vht[0],
 		  stats_ptr->tx_txbf_vht[1],
 		  stats_ptr->tx_txbf_vht[2],
@@ -530,8 +530,8 @@ htt_t2h_stats_txbf_info_buf_stats_print(
 		  stats_ptr->tx_txbf_vht[7],
 		  stats_ptr->tx_txbf_vht[8],
 		  stats_ptr->tx_txbf_vht[9]);
-	cdf_print("rx_txbf_vht (0..9): ");
-	cdf_print("%u, %u, %u, %u, %u, %u, %u, %u, %u, %u\n",
+	qdf_print("rx_txbf_vht (0..9): ");
+	qdf_print("%u, %u, %u, %u, %u, %u, %u, %u, %u, %u\n",
 		  stats_ptr->rx_txbf_vht[0],
 		  stats_ptr->rx_txbf_vht[1],
 		  stats_ptr->rx_txbf_vht[2],
@@ -542,8 +542,8 @@ htt_t2h_stats_txbf_info_buf_stats_print(
 		  stats_ptr->rx_txbf_vht[7],
 		  stats_ptr->rx_txbf_vht[8],
 		  stats_ptr->rx_txbf_vht[9]);
-	cdf_print("tx_txbf_ht (0..7): ");
-	cdf_print("%u, %u, %u, %u, %u, %u, %u, %u\n",
+	qdf_print("tx_txbf_ht (0..7): ");
+	qdf_print("%u, %u, %u, %u, %u, %u, %u, %u\n",
 		  stats_ptr->tx_txbf_ht[0],
 		  stats_ptr->tx_txbf_ht[1],
 		  stats_ptr->tx_txbf_ht[2],
@@ -552,8 +552,8 @@ htt_t2h_stats_txbf_info_buf_stats_print(
 		  stats_ptr->tx_txbf_ht[5],
 		  stats_ptr->tx_txbf_ht[6],
 		  stats_ptr->tx_txbf_ht[7]);
-	cdf_print("tx_txbf_ofdm (0..7): ");
-	cdf_print("%u, %u, %u, %u, %u, %u, %u, %u\n",
+	qdf_print("tx_txbf_ofdm (0..7): ");
+	qdf_print("%u, %u, %u, %u, %u, %u, %u, %u\n",
 		  stats_ptr->tx_txbf_ofdm[0],
 		  stats_ptr->tx_txbf_ofdm[1],
 		  stats_ptr->tx_txbf_ofdm[2],
@@ -562,8 +562,8 @@ htt_t2h_stats_txbf_info_buf_stats_print(
 		  stats_ptr->tx_txbf_ofdm[5],
 		  stats_ptr->tx_txbf_ofdm[6],
 		  stats_ptr->tx_txbf_ofdm[7]);
-	cdf_print("tx_txbf_cck (0..6): ");
-	cdf_print("%u, %u, %u, %u, %u, %u, %u\n",
+	qdf_print("tx_txbf_cck (0..6): ");
+	qdf_print("%u, %u, %u, %u, %u, %u, %u\n",
 		  stats_ptr->tx_txbf_cck[0],
 		  stats_ptr->tx_txbf_cck[1],
 		  stats_ptr->tx_txbf_cck[2],
@@ -577,27 +577,27 @@ static void
 htt_t2h_stats_txbf_snd_buf_stats_print(
 	struct wlan_dbg_txbf_snd_stats *stats_ptr)
 {
-	cdf_print("TXBF snd Buffer Statistics:\n");
-	cdf_print("cbf_20: ");
-	cdf_print("%u, %u, %u, %u\n",
+	qdf_print("TXBF snd Buffer Statistics:\n");
+	qdf_print("cbf_20: ");
+	qdf_print("%u, %u, %u, %u\n",
 		  stats_ptr->cbf_20[0],
 		  stats_ptr->cbf_20[1],
 		  stats_ptr->cbf_20[2],
 		  stats_ptr->cbf_20[3]);
-	cdf_print("cbf_40: ");
-	cdf_print("%u, %u, %u, %u\n",
+	qdf_print("cbf_40: ");
+	qdf_print("%u, %u, %u, %u\n",
 		  stats_ptr->cbf_40[0],
 		  stats_ptr->cbf_40[1],
 		  stats_ptr->cbf_40[2],
 		  stats_ptr->cbf_40[3]);
-	cdf_print("cbf_80: ");
-	cdf_print("%u, %u, %u, %u\n",
+	qdf_print("cbf_80: ");
+	qdf_print("%u, %u, %u, %u\n",
 		  stats_ptr->cbf_80[0],
 		  stats_ptr->cbf_80[1],
 		  stats_ptr->cbf_80[2],
 		  stats_ptr->cbf_80[3]);
-	cdf_print("sounding: ");
-	cdf_print("%u, %u, %u, %u, %u, %u, %u, %u, %u\n",
+	qdf_print("sounding: ");
+	qdf_print("%u, %u, %u, %u, %u, %u, %u, %u, %u\n",
 		  stats_ptr->sounding[0],
 		  stats_ptr->sounding[1],
 		  stats_ptr->sounding[2],
@@ -613,34 +613,34 @@ static void
 htt_t2h_stats_tx_selfgen_buf_stats_print(
 	struct wlan_dbg_tx_selfgen_stats *stats_ptr)
 {
-	cdf_print("Tx selfgen Buffer Statistics:\n");
-	cdf_print("  %u su_ndpa\n",
+	qdf_print("Tx selfgen Buffer Statistics:\n");
+	qdf_print("  %u su_ndpa\n",
 			stats_ptr->su_ndpa);
-	cdf_print("  %u mu_ndp\n",
+	qdf_print("  %u mu_ndp\n",
 			stats_ptr->mu_ndp);
-	cdf_print("  %u mu_ndpa\n",
+	qdf_print("  %u mu_ndpa\n",
 			stats_ptr->mu_ndpa);
-	cdf_print("  %u mu_ndp\n",
+	qdf_print("  %u mu_ndp\n",
 			stats_ptr->mu_ndp);
-	cdf_print("  %u mu_brpoll_1\n",
+	qdf_print("  %u mu_brpoll_1\n",
 			stats_ptr->mu_brpoll_1);
-	cdf_print("  %u mu_brpoll_2\n",
+	qdf_print("  %u mu_brpoll_2\n",
 			stats_ptr->mu_brpoll_2);
-	cdf_print("  %u mu_bar_1\n",
+	qdf_print("  %u mu_bar_1\n",
 			stats_ptr->mu_bar_1);
-	cdf_print("  %u mu_bar_2\n",
+	qdf_print("  %u mu_bar_2\n",
 			stats_ptr->mu_bar_2);
-	cdf_print("  %u cts_burst\n",
+	qdf_print("  %u cts_burst\n",
 			stats_ptr->cts_burst);
-	cdf_print("  %u su_ndp_err\n",
+	qdf_print("  %u su_ndp_err\n",
 			stats_ptr->su_ndp_err);
-	cdf_print("  %u su_ndpa_err\n",
+	qdf_print("  %u su_ndpa_err\n",
 			stats_ptr->su_ndpa_err);
-	cdf_print("  %u mu_ndp_err\n",
+	qdf_print("  %u mu_ndp_err\n",
 			stats_ptr->mu_ndp_err);
-	cdf_print("  %u mu_brp1_err\n",
+	qdf_print("  %u mu_brp1_err\n",
 			stats_ptr->mu_brp1_err);
-	cdf_print("  %u mu_brp2_err\n",
+	qdf_print("  %u mu_brp2_err\n",
 			stats_ptr->mu_brp2_err);
 }
 
@@ -650,39 +650,39 @@ htt_t2h_stats_wifi2_error_stats_print(
 {
 	int i;
 
-	cdf_print("Scheduler error Statistics:\n");
-	cdf_print("urrn_stats: ");
-	cdf_print("%d, %d, %d\n",
+	qdf_print("Scheduler error Statistics:\n");
+	qdf_print("urrn_stats: ");
+	qdf_print("%d, %d, %d\n",
 		  stats_ptr->urrn_stats[0],
 		  stats_ptr->urrn_stats[1],
 		  stats_ptr->urrn_stats[2]);
-	cdf_print("flush_errs (0..%d): ",
+	qdf_print("flush_errs (0..%d): ",
 			WHAL_DBG_FLUSH_REASON_MAXCNT);
 	for (i = 0; i < WHAL_DBG_FLUSH_REASON_MAXCNT; i++)
-		cdf_print("  %u", stats_ptr->flush_errs[i]);
-	cdf_print("\n");
-	cdf_print("schd_stall_errs (0..3): ");
-	cdf_print("%d, %d, %d, %d\n",
+		qdf_print("  %u", stats_ptr->flush_errs[i]);
+	qdf_print("\n");
+	qdf_print("schd_stall_errs (0..3): ");
+	qdf_print("%d, %d, %d, %d\n",
 		  stats_ptr->schd_stall_errs[0],
 		  stats_ptr->schd_stall_errs[1],
 		  stats_ptr->schd_stall_errs[2],
 		  stats_ptr->schd_stall_errs[3]);
-	cdf_print("schd_cmd_result (0..%d): ",
+	qdf_print("schd_cmd_result (0..%d): ",
 			WHAL_DBG_CMD_RESULT_MAXCNT);
 	for (i = 0; i < WHAL_DBG_CMD_RESULT_MAXCNT; i++)
-		cdf_print("  %u", stats_ptr->schd_cmd_result[i]);
-	cdf_print("\n");
-	cdf_print("sifs_status (0..%d): ",
+		qdf_print("  %u", stats_ptr->schd_cmd_result[i]);
+	qdf_print("\n");
+	qdf_print("sifs_status (0..%d): ",
 			WHAL_DBG_SIFS_STATUS_MAXCNT);
 	for (i = 0; i < WHAL_DBG_SIFS_STATUS_MAXCNT; i++)
-		cdf_print("  %u", stats_ptr->sifs_status[i]);
-	cdf_print("\n");
-	cdf_print("phy_errs (0..%d): ",
+		qdf_print("  %u", stats_ptr->sifs_status[i]);
+	qdf_print("\n");
+	qdf_print("phy_errs (0..%d): ",
 			WHAL_DBG_PHY_ERR_MAXCNT);
 	for (i = 0; i < WHAL_DBG_PHY_ERR_MAXCNT; i++)
-		cdf_print("  %u", stats_ptr->phy_errs[i]);
-	cdf_print("\n");
-	cdf_print("  %u rx_rate_inval\n",
+		qdf_print("  %u", stats_ptr->phy_errs[i]);
+	qdf_print("\n");
+	qdf_print("  %u rx_rate_inval\n",
 			stats_ptr->rx_rate_inval);
 }
 
@@ -690,16 +690,16 @@ static void
 htt_t2h_rx_musu_ndpa_pkts_stats_print(
 	struct rx_txbf_musu_ndpa_pkts_stats *stats_ptr)
 {
-	cdf_print("Rx TXBF MU/SU Packets and NDPA Statistics:\n");
-	cdf_print("  %u Number of TXBF MU packets received\n",
+	qdf_print("Rx TXBF MU/SU Packets and NDPA Statistics:\n");
+	qdf_print("  %u Number of TXBF MU packets received\n",
 			stats_ptr->number_mu_pkts);
-	cdf_print("  %u Number of TXBF SU packets received\n",
+	qdf_print("  %u Number of TXBF SU packets received\n",
 			stats_ptr->number_su_pkts);
-	cdf_print("  %u Number of TXBF directed NDPA\n",
+	qdf_print("  %u Number of TXBF directed NDPA\n",
 			stats_ptr->txbf_directed_ndpa_count);
-	cdf_print("  %u Number of TXBF retried NDPA\n",
+	qdf_print("  %u Number of TXBF retried NDPA\n",
 			stats_ptr->txbf_ndpa_retry_count);
-	cdf_print("  %u Total number of TXBF NDPA\n",
+	qdf_print("  %u Total number of TXBF NDPA\n",
 			stats_ptr->txbf_total_ndpa_count);
 }
 
@@ -739,8 +739,8 @@ htt_t2h_tx_ppdu_bitmaps_pr(uint32_t *queued_ptr, uint32_t *acked_ptr)
 	}
 	queued_str[HTT_FW_STATS_MAX_BLOCK_ACK_WINDOW] = '\0';
 	acked_str[HTT_FW_STATS_MAX_BLOCK_ACK_WINDOW] = '\0';
-	cdf_print("%s\n", queued_str);
-	cdf_print("%s\n", acked_str);
+	qdf_print("%s\n", queued_str);
+	qdf_print("%s\n", acked_str);
 }
 
 static inline uint16_t htt_msg_read16(uint16_t *p16)
@@ -797,7 +797,7 @@ void htt_make_u8_list_str(uint32_t *aligned_data,
 			/* not enough data to fill the reserved msg buffer*/
 			break;
 
-		bytes = cdf_snprint(buf_p, space, "%d,", val);
+		bytes = qdf_snprint(buf_p, space, "%d,", val);
 		space -= bytes;
 		if (space > 0)
 			buf_p += bytes;
@@ -825,7 +825,7 @@ void htt_make_u16_list_str(uint32_t *aligned_data,
 		if (val == 0)
 			/* not enough data to fill the reserved msg buffer */
 			break;
-		bytes = cdf_snprint(buf_p, space, "%d,", val);
+		bytes = qdf_snprint(buf_p, space, "%d,", val);
 		space -= bytes;
 		if (space > 0)
 			buf_p += bytes;
@@ -855,7 +855,7 @@ htt_t2h_tx_ppdu_log_print(struct ol_fw_tx_dbg_ppdu_msg_hdr *hdr,
 		hdr->mpdu_msdus_array_len * sizeof(uint8_t) +
 		hdr->msdu_bytes_array_len * sizeof(uint16_t);
 	num_records = (length - sizeof(*hdr)) / record_size;
-	cdf_print("Tx PPDU log elements:\n");
+	qdf_print("Tx PPDU log elements:\n");
 
 	for (i = 0; i < num_records; i++) {
 		uint16_t start_seq_num;
@@ -924,34 +924,34 @@ htt_t2h_tx_ppdu_log_print(struct ol_fw_tx_dbg_ppdu_msg_hdr *hdr,
 				 OL_FW_TX_DBG_PPDU_TRIES_M) >>
 				OL_FW_TX_DBG_PPDU_TRIES_S;
 
-			cdf_print(" - PPDU tx to peer %d, TID %d\n", peer_id,
+			qdf_print(" - PPDU tx to peer %d, TID %d\n", peer_id,
 				  ext_tid);
-			cdf_print
+			qdf_print
 				("   start seq num= %u, start PN LSBs= %#04x\n",
 				start_seq_num, start_pn_lsbs);
-			cdf_print
+			qdf_print
 				("   PPDU: %d MPDUs, (?) MSDUs, %d bytes\n",
 				num_mpdus,
 				 /* num_msdus - not yet computed in target */
 				record->num_bytes);
 			if (complete) {
-				cdf_print
+				qdf_print
 				      ("   enqueued: %u, completed: %u usec)\n",
 				       time_enqueue_us, time_completion_us);
-				cdf_print
+				qdf_print
 					("   %d tries, last tx used rate %d ",
 					 tries, rate_code);
-				cdf_print("on %d MHz chan (flags = %#x)\n",
+				qdf_print("on %d MHz chan (flags = %#x)\n",
 					  htt_rate_flags_to_mhz
 					  (rate_flags), rate_flags);
-				cdf_print
+				qdf_print
 				      ("  enqueued and acked MPDU bitmaps:\n");
 				htt_t2h_tx_ppdu_bitmaps_pr(msg_word +
 					   OL_FW_TX_DBG_PPDU_ENQUEUED_LSBS_16,
 							   msg_word +
 					   OL_FW_TX_DBG_PPDU_BLOCK_ACK_LSBS_16);
 			} else {
-				cdf_print
+				qdf_print
 				      ("  enqueued: %d us, not yet completed\n",
 					time_enqueue_us);
 			}
@@ -963,14 +963,14 @@ htt_t2h_tx_ppdu_log_print(struct ol_fw_tx_dbg_ppdu_msg_hdr *hdr,
 						      BUF_SIZE,
 						      hdr->
 						      mpdu_bytes_array_len);
-				cdf_print("   MPDU bytes: %s\n", buf);
+				qdf_print("   MPDU bytes: %s\n", buf);
 			}
 			p8 += hdr->mpdu_bytes_array_len * sizeof(uint16_t);
 			if (hdr->mpdu_msdus_array_len) {
 				htt_make_u8_list_str((uint32_t *) p8, buf,
 						     BUF_SIZE,
 						     hdr->mpdu_msdus_array_len);
-				cdf_print("   MPDU MSDUs: %s\n", buf);
+				qdf_print("   MPDU MSDUs: %s\n", buf);
 			}
 			p8 += hdr->mpdu_msdus_array_len * sizeof(uint8_t);
 			if (hdr->msdu_bytes_array_len) {
@@ -978,19 +978,19 @@ htt_t2h_tx_ppdu_log_print(struct ol_fw_tx_dbg_ppdu_msg_hdr *hdr,
 						      BUF_SIZE,
 						      hdr->
 						      msdu_bytes_array_len);
-				cdf_print("   MSDU bytes: %s\n", buf);
+				qdf_print("   MSDU bytes: %s\n", buf);
 			}
 		} else {
 			/* concise */
-			cdf_print("start seq num = %u ", start_seq_num);
-			cdf_print("enqueued and acked MPDU bitmaps:\n");
+			qdf_print("start seq num = %u ", start_seq_num);
+			qdf_print("enqueued and acked MPDU bitmaps:\n");
 			if (complete) {
 				htt_t2h_tx_ppdu_bitmaps_pr(msg_word +
 					OL_FW_TX_DBG_PPDU_ENQUEUED_LSBS_16,
 							   msg_word +
 					OL_FW_TX_DBG_PPDU_BLOCK_ACK_LSBS_16);
 			} else {
-				cdf_print("(not completed)\n");
+				qdf_print("(not completed)\n");
 			}
 		}
 		record = (struct ol_fw_tx_dbg_ppdu_base *)
@@ -1013,10 +1013,10 @@ void htt_t2h_stats_print(uint8_t *stats_data, int concise)
 	if (status == HTT_DBG_STATS_STATUS_SERIES_DONE) {
 		return;
 	} else if (status == HTT_DBG_STATS_STATUS_INVALID) {
-		cdf_print("Target doesn't support stats type %d\n", type);
+		qdf_print("Target doesn't support stats type %d\n", type);
 		return;
 	} else if (status == HTT_DBG_STATS_STATUS_ERROR) {
-		cdf_print("Target couldn't upload stats type %d (no mem?)\n",
+		qdf_print("Target couldn't upload stats type %d (no mem?)\n",
 			  type);
 		return;
 	}
@@ -1068,7 +1068,7 @@ void htt_t2h_stats_print(uint8_t *stats_data, int concise)
 
 		if (status == HTT_DBG_STATS_STATUS_PARTIAL
 		    && length == 0) {
-			cdf_print
+			qdf_print
 				("HTT_DBG_STATS_TX_PPDU_LOG -- length = 0!\n");
 			break;
 		}

core/dp/htt/htt_h2t.c

@@ -333,10 +333,10 @@ A_STATUS htt_h2t_rx_ring_cfg_msg_ll(struct htt_pdev_t *pdev)
 		enable_ppdu_start = 1;
 		enable_ppdu_end = 1;
 		/* Disable ASPM when pkt log is enabled */
-		cdf_print("Pkt log is enabled\n");
+		qdf_print("Pkt log is enabled\n");
 		htt_htc_disable_aspm(pdev);
 	} else {
-		cdf_print("Pkt log is disabled\n");
+		qdf_print("Pkt log is disabled\n");
 		enable_ctrl_data = 0;
 		enable_mgmt_data = 0;
 		enable_null_data = 0;
@@ -448,7 +448,7 @@ htt_h2t_dbg_stats_get(struct htt_pdev_t *pdev,
 	if (stats_type_upload_mask >= 1 << HTT_DBG_NUM_STATS ||
 	    stats_type_reset_mask >= 1 << HTT_DBG_NUM_STATS) {
 		/* FIX THIS - add more details? */
-		cdf_print("%#x %#x stats not supported\n",
+		qdf_print("%#x %#x stats not supported\n",
 			  stats_type_upload_mask, stats_type_reset_mask);
 		return -EINVAL;      /* failure */
 	}
@@ -786,12 +786,12 @@ int htt_h2t_ipa_uc_rsc_cfg_msg(struct htt_pdev_t *pdev)
 
 	msg_word++;
 	*msg_word = 0;
-        /* TX COMP RING BASE LO */
+	/* TX COMP RING BASE LO */
 	HTT_WDI_IPA_CFG_TX_COMP_RING_BASE_ADDR_LO_SET(*msg_word,
 		(unsigned int)pdev->ipa_uc_tx_rsc.tx_comp_base.paddr);
 	msg_word++;
 	*msg_word = 0;
-        /* TX COMP RING BASE HI, NONE */
+	/* TX COMP RING BASE HI, NONE */
 
 	msg_word++;
 	*msg_word = 0;

core/dp/htt/htt_internal.h

@@ -152,31 +152,31 @@ static inline struct htt_host_rx_desc_base *htt_rx_desc(cdf_nbuf_t msdu)
  */
 static inline void htt_print_rx_desc_lro(struct htt_host_rx_desc_base *rx_desc)
 {
-	cdf_print
+	qdf_print
 		("----------------------RX DESC LRO----------------------\n");
-	cdf_print("msdu_end.lro_eligible:0x%x\n",
+	qdf_print("msdu_end.lro_eligible:0x%x\n",
 		 rx_desc->msdu_end.lro_eligible);
-	cdf_print("msdu_start.tcp_only_ack:0x%x\n",
+	qdf_print("msdu_start.tcp_only_ack:0x%x\n",
 		 rx_desc->msdu_start.tcp_only_ack);
-	cdf_print("msdu_end.tcp_udp_chksum:0x%x\n",
+	qdf_print("msdu_end.tcp_udp_chksum:0x%x\n",
 		 rx_desc->msdu_end.tcp_udp_chksum);
-	cdf_print("msdu_end.tcp_seq_number:0x%x\n",
+	qdf_print("msdu_end.tcp_seq_number:0x%x\n",
 		 rx_desc->msdu_end.tcp_seq_number);
-	cdf_print("msdu_end.tcp_ack_number:0x%x\n",
+	qdf_print("msdu_end.tcp_ack_number:0x%x\n",
 		 rx_desc->msdu_end.tcp_ack_number);
-	cdf_print("msdu_start.tcp_proto:0x%x\n",
+	qdf_print("msdu_start.tcp_proto:0x%x\n",
 		 rx_desc->msdu_start.tcp_proto);
-	cdf_print("msdu_start.ipv6_proto:0x%x\n",
+	qdf_print("msdu_start.ipv6_proto:0x%x\n",
 		 rx_desc->msdu_start.ipv6_proto);
-	cdf_print("msdu_start.ipv4_proto:0x%x\n",
+	qdf_print("msdu_start.ipv4_proto:0x%x\n",
 		 rx_desc->msdu_start.ipv4_proto);
-	cdf_print("msdu_start.l3_offset:0x%x\n",
+	qdf_print("msdu_start.l3_offset:0x%x\n",
 		 rx_desc->msdu_start.l3_offset);
-	cdf_print("msdu_start.l4_offset:0x%x\n",
+	qdf_print("msdu_start.l4_offset:0x%x\n",
 		 rx_desc->msdu_start.l4_offset);
-	cdf_print("msdu_start.flow_id_toeplitz:0x%x\n",
+	qdf_print("msdu_start.flow_id_toeplitz:0x%x\n",
 			   rx_desc->msdu_start.flow_id_toeplitz);
-	cdf_print
+	qdf_print
 		("---------------------------------------------------------\n");
 }
 
@@ -218,29 +218,29 @@ static inline void htt_rx_extract_lro_info(cdf_nbuf_t msdu,
 
 static inline void htt_print_rx_desc(struct htt_host_rx_desc_base *rx_desc)
 {
-	cdf_print
+	qdf_print
 		("----------------------RX DESC----------------------------\n");
-	cdf_print("attention: %#010x\n",
+	qdf_print("attention: %#010x\n",
 		  (unsigned int)(*(uint32_t *) &rx_desc->attention));
-	cdf_print("frag_info: %#010x\n",
+	qdf_print("frag_info: %#010x\n",
 		  (unsigned int)(*(uint32_t *) &rx_desc->frag_info));
-	cdf_print("mpdu_start: %#010x %#010x %#010x\n",
+	qdf_print("mpdu_start: %#010x %#010x %#010x\n",
 		  (unsigned int)(((uint32_t *) &rx_desc->mpdu_start)[0]),
 		  (unsigned int)(((uint32_t *) &rx_desc->mpdu_start)[1]),
 		  (unsigned int)(((uint32_t *) &rx_desc->mpdu_start)[2]));
-	cdf_print("msdu_start: %#010x %#010x %#010x\n",
+	qdf_print("msdu_start: %#010x %#010x %#010x\n",
 		  (unsigned int)(((uint32_t *) &rx_desc->msdu_start)[0]),
 		  (unsigned int)(((uint32_t *) &rx_desc->msdu_start)[1]),
 		  (unsigned int)(((uint32_t *) &rx_desc->msdu_start)[2]));
-	cdf_print("msdu_end: %#010x %#010x %#010x %#010x %#010x\n",
+	qdf_print("msdu_end: %#010x %#010x %#010x %#010x %#010x\n",
 		  (unsigned int)(((uint32_t *) &rx_desc->msdu_end)[0]),
 		  (unsigned int)(((uint32_t *) &rx_desc->msdu_end)[1]),
 		  (unsigned int)(((uint32_t *) &rx_desc->msdu_end)[2]),
 		  (unsigned int)(((uint32_t *) &rx_desc->msdu_end)[3]),
 		  (unsigned int)(((uint32_t *) &rx_desc->msdu_end)[4]));
-	cdf_print("mpdu_end: %#010x\n",
+	qdf_print("mpdu_end: %#010x\n",
 		  (unsigned int)(*(uint32_t *) &rx_desc->mpdu_end));
-	cdf_print("ppdu_start: " "%#010x %#010x %#010x %#010x %#010x\n"
+	qdf_print("ppdu_start: " "%#010x %#010x %#010x %#010x %#010x\n"
 		  "%#010x %#010x %#010x %#010x %#010x\n",
 		  (unsigned int)(((uint32_t *) &rx_desc->ppdu_start)[0]),
 		  (unsigned int)(((uint32_t *) &rx_desc->ppdu_start)[1]),
@@ -252,7 +252,7 @@ static inline void htt_print_rx_desc(struct htt_host_rx_desc_base *rx_desc)
 		  (unsigned int)(((uint32_t *) &rx_desc->ppdu_start)[7]),
 		  (unsigned int)(((uint32_t *) &rx_desc->ppdu_start)[8]),
 		  (unsigned int)(((uint32_t *) &rx_desc->ppdu_start)[9]));
-	cdf_print("ppdu_end:" "%#010x %#010x %#010x %#010x %#010x\n"
+	qdf_print("ppdu_end:" "%#010x %#010x %#010x %#010x %#010x\n"
 		  "%#010x %#010x %#010x %#010x %#010x\n"
 		  "%#010x,%#010x %#010x %#010x %#010x\n"
 		  "%#010x %#010x %#010x %#010x %#010x\n" "%#010x %#010x\n",
@@ -278,7 +278,7 @@ static inline void htt_print_rx_desc(struct htt_host_rx_desc_base *rx_desc)
 		  (unsigned int)(((uint32_t *) &rx_desc->ppdu_end)[19]),
 		  (unsigned int)(((uint32_t *) &rx_desc->ppdu_end)[20]),
 		  (unsigned int)(((uint32_t *) &rx_desc->ppdu_end)[21]));
-	cdf_print
+	qdf_print
 		("---------------------------------------------------------\n");
 }
 
@@ -536,7 +536,7 @@ void htt_rx_dbg_rxbuf_init(struct htt_pdev_t *pdev)
 				 HTT_RX_RING_BUFF_DBG_LIST *
 				 sizeof(struct rx_buf_debug));
 	if (!pdev->rx_buff_list) {
-		cdf_print("HTT: debug RX buffer allocation failed\n");
+		qdf_print("HTT: debug RX buffer allocation failed\n");
 		CDF_ASSERT(0);
 	}
 }

core/dp/htt/htt_rx.c

@@ -40,7 +40,7 @@
  */
 
 #include <cdf_memory.h>         /* cdf_mem_malloc,free, etc. */
-#include <cdf_types.h>          /* cdf_print, bool */
+#include <qdf_types.h>          /* qdf_print, bool */
 #include <cdf_nbuf.h>           /* cdf_nbuf_t, etc. */
 #include <qdf_timer.h>		/* qdf_timer_free */
 
@@ -129,10 +129,10 @@ void htt_rx_hash_deinit(struct htt_pdev_t *pdev)
 			if (hash_entry->netbuf) {
 #ifdef DEBUG_DMA_DONE
 				cdf_nbuf_unmap(pdev->osdev, hash_entry->netbuf,
-					       CDF_DMA_BIDIRECTIONAL);
+					       QDF_DMA_BIDIRECTIONAL);
 #else
 				cdf_nbuf_unmap(pdev->osdev, hash_entry->netbuf,
-					       CDF_DMA_FROM_DEVICE);
+					       QDF_DMA_FROM_DEVICE);
 #endif
 				cdf_nbuf_free(hash_entry->netbuf);
 				hash_entry->paddr = 0;
@@ -229,7 +229,7 @@ void htt_rx_ring_fill_n(struct htt_pdev_t *pdev, int num)
 
 	idx = *(pdev->rx_ring.alloc_idx.vaddr);
 	while (num > 0) {
-		cdf_dma_addr_t paddr;
+		qdf_dma_addr_t paddr;
 		cdf_nbuf_t rx_netbuf;
 		int headroom;
 
@@ -278,11 +278,11 @@ void htt_rx_ring_fill_n(struct htt_pdev_t *pdev, int num)
 #ifdef DEBUG_DMA_DONE
 		status =
 			cdf_nbuf_map(pdev->osdev, rx_netbuf,
-						CDF_DMA_BIDIRECTIONAL);
+						QDF_DMA_BIDIRECTIONAL);
 #else
 		status =
 			cdf_nbuf_map(pdev->osdev, rx_netbuf,
-						CDF_DMA_FROM_DEVICE);
+						QDF_DMA_FROM_DEVICE);
 #endif
 		if (status != QDF_STATUS_SUCCESS) {
 			cdf_nbuf_free(rx_netbuf);
@@ -293,14 +293,14 @@ void htt_rx_ring_fill_n(struct htt_pdev_t *pdev, int num)
 			if (cdf_unlikely
 				    (htt_rx_hash_list_insert(pdev, paddr,
 							     rx_netbuf))) {
-				cdf_print("%s: hash insert failed!\n",
+				qdf_print("%s: hash insert failed!\n",
 					  __func__);
 #ifdef DEBUG_DMA_DONE
 				cdf_nbuf_unmap(pdev->osdev, rx_netbuf,
-					       CDF_DMA_BIDIRECTIONAL);
+					       QDF_DMA_BIDIRECTIONAL);
 #else
 				cdf_nbuf_unmap(pdev->osdev, rx_netbuf,
-					       CDF_DMA_FROM_DEVICE);
+					       QDF_DMA_FROM_DEVICE);
 #endif
 				cdf_nbuf_free(rx_netbuf);
 				goto fail;
@@ -350,7 +350,7 @@ void htt_rx_detach(struct htt_pdev_t *pdev)
 					   sizeof(uint32_t),
 					   pdev->rx_ring.target_idx.vaddr,
 					   pdev->rx_ring.target_idx.paddr,
-					   cdf_get_dma_mem_context((&pdev->
+					   qdf_get_dma_mem_context((&pdev->
 								    rx_ring.
 								    target_idx),
 								   memctx));
@@ -363,12 +363,12 @@ void htt_rx_detach(struct htt_pdev_t *pdev)
 			cdf_nbuf_unmap(pdev->osdev,
 				       pdev->rx_ring.buf.
 				       netbufs_ring[sw_rd_idx],
-				       CDF_DMA_BIDIRECTIONAL);
+				       QDF_DMA_BIDIRECTIONAL);
 #else
 			cdf_nbuf_unmap(pdev->osdev,
 				       pdev->rx_ring.buf.
 				       netbufs_ring[sw_rd_idx],
-				       CDF_DMA_FROM_DEVICE);
+				       QDF_DMA_FROM_DEVICE);
 #endif
 			cdf_nbuf_free(pdev->rx_ring.buf.
 				      netbufs_ring[sw_rd_idx]);
@@ -382,15 +382,15 @@ void htt_rx_detach(struct htt_pdev_t *pdev)
 				   sizeof(uint32_t),
 				   pdev->rx_ring.alloc_idx.vaddr,
 				   pdev->rx_ring.alloc_idx.paddr,
-				   cdf_get_dma_mem_context((&pdev->rx_ring.
+				   qdf_get_dma_mem_context((&pdev->rx_ring.
 							    alloc_idx),
 							   memctx));
 
 	cdf_os_mem_free_consistent(pdev->osdev,
-				   pdev->rx_ring.size * sizeof(cdf_dma_addr_t),
+				   pdev->rx_ring.size * sizeof(qdf_dma_addr_t),
 				   pdev->rx_ring.buf.paddrs_ring,
 				   pdev->rx_ring.base_paddr,
-				   cdf_get_dma_mem_context((&pdev->rx_ring.buf),
+				   qdf_get_dma_mem_context((&pdev->rx_ring.buf),
 							   memctx));
 }
 
@@ -486,7 +486,7 @@ htt_rx_mpdu_desc_pn_ll(htt_pdev_handle pdev,
 			((uint64_t) rx_desc->msdu_end.ext_wapi_pn_127_96) << 32;
 		break;
 	default:
-		cdf_print("Error: invalid length spec (%d bits) for PN\n",
+		qdf_print("Error: invalid length spec (%d bits) for PN\n",
 			  pn_len_bits);
 	};
 }
@@ -721,35 +721,35 @@ void htt_rx_print_rx_indication(cdf_nbuf_t rx_ind_msg, htt_pdev_handle pdev)
 
 	msg_word = (uint32_t *) cdf_nbuf_data(rx_ind_msg);
 
-	cdf_print
+	qdf_print
 		("------------------HTT RX IND-----------------------------\n");
-	cdf_print("alloc idx paddr %x (*vaddr) %d\n",
+	qdf_print("alloc idx paddr %x (*vaddr) %d\n",
 		  pdev->rx_ring.alloc_idx.paddr,
 		  *pdev->rx_ring.alloc_idx.vaddr);
 
-	cdf_print("sw_rd_idx msdu_payld %d msdu_desc %d\n",
+	qdf_print("sw_rd_idx msdu_payld %d msdu_desc %d\n",
 		  pdev->rx_ring.sw_rd_idx.msdu_payld,
 		  pdev->rx_ring.sw_rd_idx.msdu_desc);
 
-	cdf_print("dbg_ring_idx %d\n", pdev->rx_ring.dbg_ring_idx);
+	qdf_print("dbg_ring_idx %d\n", pdev->rx_ring.dbg_ring_idx);
 
-	cdf_print("fill_level %d fill_cnt %d\n", pdev->rx_ring.fill_level,
+	qdf_print("fill_level %d fill_cnt %d\n", pdev->rx_ring.fill_level,
 		  pdev->rx_ring.fill_cnt);
 
-	cdf_print("initial msdu_payld %d curr mpdu range %d curr mpdu cnt %d\n",
+	qdf_print("initial msdu_payld %d curr mpdu range %d curr mpdu cnt %d\n",
 		  pdev->rx_ring.dbg_initial_msdu_payld,
 		  pdev->rx_ring.dbg_mpdu_range, pdev->rx_ring.dbg_mpdu_count);
 
 	/* Print the RX_IND contents */
 
-	cdf_print("peer id %x RV %x FV %x ext_tid %x msg_type %x\n",
+	qdf_print("peer id %x RV %x FV %x ext_tid %x msg_type %x\n",
 		  HTT_RX_IND_PEER_ID_GET(*msg_word),
 		  HTT_RX_IND_REL_VALID_GET(*msg_word),
 		  HTT_RX_IND_FLUSH_VALID_GET(*msg_word),
 		  HTT_RX_IND_EXT_TID_GET(*msg_word),
 		  HTT_T2H_MSG_TYPE_GET(*msg_word));
 
-	cdf_print("num_mpdu_ranges %x rel_seq_num_end %x rel_seq_num_start %x\n"
+	qdf_print("num_mpdu_ranges %x rel_seq_num_end %x rel_seq_num_start %x\n"
 		  " flush_seq_num_end %x flush_seq_num_start %x\n",
 		  HTT_RX_IND_NUM_MPDU_RANGES_GET(*(msg_word + 1)),
 		  HTT_RX_IND_REL_SEQ_NUM_END_GET(*(msg_word + 1)),
@@ -757,7 +757,7 @@ void htt_rx_print_rx_indication(cdf_nbuf_t rx_ind_msg, htt_pdev_handle pdev)
 		  HTT_RX_IND_FLUSH_SEQ_NUM_END_GET(*(msg_word + 1)),
 		  HTT_RX_IND_FLUSH_SEQ_NUM_START_GET(*(msg_word + 1)));
 
-	cdf_print("fw_rx_desc_bytes %x\n",
+	qdf_print("fw_rx_desc_bytes %x\n",
 		  HTT_RX_IND_FW_RX_DESC_BYTES_GET(*
 						  (msg_word + 2 +
 						   HTT_RX_PPDU_DESC_SIZE32)));
@@ -767,7 +767,7 @@ void htt_rx_print_rx_indication(cdf_nbuf_t rx_ind_msg, htt_pdev_handle pdev)
 		HTT_ENDIAN_BYTE_IDX_SWAP(HTT_RX_IND_FW_RX_DESC_BYTE_OFFSET +
 					 pdev->rx_ind_msdu_byte_idx);
 
-	cdf_print("msdu byte idx %x msdu desc %x\n", pdev->rx_ind_msdu_byte_idx,
+	qdf_print("msdu byte idx %x msdu desc %x\n", pdev->rx_ind_msdu_byte_idx,
 		  HTT_RX_IND_FW_RX_DESC_BYTES_GET(*
 						  (msg_word + 2 +
 						   HTT_RX_PPDU_DESC_SIZE32)));
@@ -781,10 +781,10 @@ void htt_rx_print_rx_indication(cdf_nbuf_t rx_ind_msg, htt_pdev_handle pdev)
 		htt_rx_ind_mpdu_range_info(pdev, rx_ind_msg, mpdu_range,
 					   &status, &num_mpdus);
 
-		cdf_print("mpdu_range %x status %x num_mpdus %x\n",
+		qdf_print("mpdu_range %x status %x num_mpdus %x\n",
 			  pdev->rx_ind_msdu_byte_idx, status, num_mpdus);
 	}
-	cdf_print
+	qdf_print
 		("---------------------------------------------------------\n");
 }
 #endif
@@ -832,9 +832,9 @@ htt_rx_amsdu_pop_ll(htt_pdev_handle pdev,
 		 */
 		cdf_nbuf_set_pktlen(msdu, HTT_RX_BUF_SIZE);
 #ifdef DEBUG_DMA_DONE
-		cdf_nbuf_unmap(pdev->osdev, msdu, CDF_DMA_BIDIRECTIONAL);
+		cdf_nbuf_unmap(pdev->osdev, msdu, QDF_DMA_BIDIRECTIONAL);
 #else
-		cdf_nbuf_unmap(pdev->osdev, msdu, CDF_DMA_FROM_DEVICE);
+		cdf_nbuf_unmap(pdev->osdev, msdu, QDF_DMA_FROM_DEVICE);
 #endif
 
 		/* cache consistency has been taken care of by cdf_nbuf_unmap */
@@ -872,7 +872,7 @@ htt_rx_amsdu_pop_ll(htt_pdev_handle pdev,
 
 			int dbg_iter = MAX_DONE_BIT_CHECK_ITER;
 
-			cdf_print("malformed frame\n");
+			qdf_print("malformed frame\n");
 
 			while (dbg_iter &&
 			       (!((*(uint32_t *) &rx_desc->attention) &
@@ -883,7 +883,7 @@ htt_rx_amsdu_pop_ll(htt_pdev_handle pdev,
 						     (void *)((char *)rx_desc +
 						 HTT_RX_STD_DESC_RESERVATION));
 
-				cdf_print("debug iter %d success %d\n",
+				qdf_print("debug iter %d success %d\n",
 					  dbg_iter,
 					  pdev->rx_ring.dbg_sync_success);
 
@@ -894,7 +894,7 @@ htt_rx_amsdu_pop_ll(htt_pdev_handle pdev,
 					   & RX_ATTENTION_0_MSDU_DONE_MASK))) {
 
 #ifdef HTT_RX_RESTORE
-				cdf_print("RX done bit error detected!\n");
+				qdf_print("RX done bit error detected!\n");
 				cdf_nbuf_set_next(msdu, NULL);
 				*tail_msdu = msdu;
 				pdev->rx_ring.rx_reset = 1;
@@ -906,7 +906,7 @@ htt_rx_amsdu_pop_ll(htt_pdev_handle pdev,
 #endif
 			}
 			pdev->rx_ring.dbg_sync_success++;
-			cdf_print("debug iter %d success %d\n", dbg_iter,
+			qdf_print("debug iter %d success %d\n", dbg_iter,
 				  pdev->rx_ring.dbg_sync_success);
 		}
 #else
@@ -1080,9 +1080,9 @@ htt_rx_offload_msdu_pop_ll(htt_pdev_handle pdev,
 	htt_rx_mpdu_desc_list_next(pdev, NULL);
 	cdf_nbuf_set_pktlen(buf, HTT_RX_BUF_SIZE);
 #ifdef DEBUG_DMA_DONE
-	cdf_nbuf_unmap(pdev->osdev, buf, CDF_DMA_BIDIRECTIONAL);
+	cdf_nbuf_unmap(pdev->osdev, buf, QDF_DMA_BIDIRECTIONAL);
 #else
-	cdf_nbuf_unmap(pdev->osdev, buf, CDF_DMA_FROM_DEVICE);
+	cdf_nbuf_unmap(pdev->osdev, buf, QDF_DMA_FROM_DEVICE);
 #endif
 	msdu_hdr = (uint32_t *) cdf_nbuf_data(buf);
 
@@ -1122,14 +1122,14 @@ htt_rx_offload_paddr_msdu_pop_ll(htt_pdev_handle pdev,
 	*head_buf = *tail_buf = buf = htt_rx_in_order_netbuf_pop(pdev, paddr);
 
 	if (cdf_unlikely(NULL == buf)) {
-		cdf_print("%s: netbuf pop failed!\n", __func__);
+		qdf_print("%s: netbuf pop failed!\n", __func__);
 		return 0;
 	}
 	cdf_nbuf_set_pktlen(buf, HTT_RX_BUF_SIZE);
 #ifdef DEBUG_DMA_DONE
-	cdf_nbuf_unmap(pdev->osdev, buf, CDF_DMA_BIDIRECTIONAL);
+	cdf_nbuf_unmap(pdev->osdev, buf, QDF_DMA_BIDIRECTIONAL);
 #else
-	cdf_nbuf_unmap(pdev->osdev, buf, CDF_DMA_FROM_DEVICE);
+	cdf_nbuf_unmap(pdev->osdev, buf, QDF_DMA_FROM_DEVICE);
 #endif
 	msdu_hdr = (uint32_t *) cdf_nbuf_data(buf);
 
@@ -1195,7 +1195,7 @@ htt_rx_amsdu_rx_in_order_pop_ll(htt_pdev_handle pdev,
 		HTT_RX_IN_ORD_PADDR_IND_PADDR_GET(*msg_word));
 
 	if (cdf_unlikely(NULL == msdu)) {
-		cdf_print("%s: netbuf pop failed!\n", __func__);
+		qdf_print("%s: netbuf pop failed!\n", __func__);
 		*tail_msdu = NULL;
 		return 0;
 	}
@@ -1208,9 +1208,9 @@ htt_rx_amsdu_rx_in_order_pop_ll(htt_pdev_handle pdev,
 		 */
 		cdf_nbuf_set_pktlen(msdu, HTT_RX_BUF_SIZE);
 #ifdef DEBUG_DMA_DONE
-		cdf_nbuf_unmap(pdev->osdev, msdu, CDF_DMA_BIDIRECTIONAL);
+		cdf_nbuf_unmap(pdev->osdev, msdu, QDF_DMA_BIDIRECTIONAL);
 #else
-		cdf_nbuf_unmap(pdev->osdev, msdu, CDF_DMA_FROM_DEVICE);
+		cdf_nbuf_unmap(pdev->osdev, msdu, QDF_DMA_FROM_DEVICE);
 #endif
 
 		/* cache consistency has been taken care of by cdf_nbuf_unmap */
@@ -1274,7 +1274,7 @@ htt_rx_amsdu_rx_in_order_pop_ll(htt_pdev_handle pdev,
 					HTT_RX_IN_ORD_PADDR_IND_PADDR_GET(
 						*msg_word));
 				if (cdf_unlikely(NULL == next)) {
-					cdf_print("%s: netbuf pop failed!\n",
+					qdf_print("%s: netbuf pop failed!\n",
 								 __func__);
 					*tail_msdu = NULL;
 					return 0;
@@ -1306,7 +1306,7 @@ htt_rx_amsdu_rx_in_order_pop_ll(htt_pdev_handle pdev,
 				pdev,
 				HTT_RX_IN_ORD_PADDR_IND_PADDR_GET(*msg_word));
 			if (cdf_unlikely(NULL == next)) {
-				cdf_print("%s: netbuf pop failed!\n",
+				qdf_print("%s: netbuf pop failed!\n",
 					  __func__);
 				*tail_msdu = NULL;
 				return 0;
@@ -1921,7 +1921,7 @@ static inline void htt_list_remove(struct htt_list_node *node)
 #define HTT_RX_HASH_COUNT_RESET(hash_bucket) ((hash_bucket).count = 0)
 
 #define HTT_RX_HASH_COUNT_PRINT(hash_bucket) \
-	RX_HASH_LOG(cdf_print(" count %d\n", (hash_bucket).count))
+	RX_HASH_LOG(qdf_print(" count %d\n", (hash_bucket).count))
 #else                           /* RX_HASH_DEBUG */
 /* Hash cookie related macros */
 #define HTT_RX_HASH_COOKIE_SET(hash_element)    /* no-op */
@@ -1982,7 +1982,7 @@ htt_rx_hash_list_insert(struct htt_pdev_t *pdev, uint32_t paddr,
 	htt_list_add_tail(&pdev->rx_ring.hash_table[i].listhead,
 			  &hash_element->listnode);
 
-	RX_HASH_LOG(cdf_print("rx hash: %s: paddr 0x%x netbuf %p bucket %d\n",
+	RX_HASH_LOG(qdf_print("rx hash: %s: paddr 0x%x netbuf %p bucket %d\n",
 			      __func__, paddr, netbuf, (int)i));
 
 	HTT_RX_HASH_COUNT_INCR(pdev->rx_ring.hash_table[i]);
@@ -2029,12 +2029,12 @@ cdf_nbuf_t htt_rx_hash_list_lookup(struct htt_pdev_t *pdev, uint32_t paddr)
 		}
 	}
 
-	RX_HASH_LOG(cdf_print("rx hash: %s: paddr 0x%x, netbuf %p, bucket %d\n",
+	RX_HASH_LOG(qdf_print("rx hash: %s: paddr 0x%x, netbuf %p, bucket %d\n",
 			      __func__, paddr, netbuf, (int)i));
 	HTT_RX_HASH_COUNT_PRINT(pdev->rx_ring.hash_table[i]);
 
 	if (netbuf == NULL) {
-		cdf_print("rx hash: %s: no entry found for 0x%x!!!\n",
+		qdf_print("rx hash: %s: no entry found for 0x%x!!!\n",
 			  __func__, paddr);
 		HTT_ASSERT_ALWAYS(0);
 	}
@@ -2056,7 +2056,7 @@ int htt_rx_hash_init(struct htt_pdev_t *pdev)
 			       sizeof(struct htt_rx_hash_bucket));
 
 	if (NULL == pdev->rx_ring.hash_table) {
-		cdf_print("rx hash table allocation failed!\n");
+		qdf_print("rx hash table allocation failed!\n");
 		return 1;
 	}
 
@@ -2075,7 +2075,7 @@ int htt_rx_hash_init(struct htt_pdev_t *pdev)
 				       sizeof(struct htt_rx_hash_entry));
 
 		if (NULL == pdev->rx_ring.hash_table[i].entries) {
-			cdf_print("rx hash bucket %d entries alloc failed\n",
+			qdf_print("rx hash bucket %d entries alloc failed\n",
 				(int)i);
 			while (i) {
 				i--;
@@ -2097,7 +2097,7 @@ int htt_rx_hash_init(struct htt_pdev_t *pdev)
 	}
 
 	pdev->rx_ring.listnode_offset =
-		cdf_offsetof(struct htt_rx_hash_entry, listnode);
+		qdf_offsetof(struct htt_rx_hash_entry, listnode);
 
 	return 0;
 }
@@ -2115,7 +2115,7 @@ void htt_rx_hash_dump_table(struct htt_pdev_t *pdev)
 				(struct htt_rx_hash_entry *)((char *)list_iter -
 							     pdev->rx_ring.
 							     listnode_offset);
-			cdf_print("hash_table[%d]: netbuf %p paddr 0x%x\n", i,
+			qdf_print("hash_table[%d]: netbuf %p paddr 0x%x\n", i,
 				  hash_entry->netbuf, hash_entry->paddr);
 		}
 	}
@@ -2128,8 +2128,8 @@ void htt_rx_hash_dump_table(struct htt_pdev_t *pdev)
  */
 int htt_rx_attach(struct htt_pdev_t *pdev)
 {
-	cdf_dma_addr_t paddr;
-	uint32_t ring_elem_size = sizeof(cdf_dma_addr_t);
+	qdf_dma_addr_t paddr;
+	uint32_t ring_elem_size = sizeof(qdf_dma_addr_t);
 
 	pdev->rx_ring.size = htt_rx_ring_size(pdev);
 	HTT_ASSERT2(CDF_IS_PWR2(pdev->rx_ring.size));
@@ -2154,7 +2154,7 @@ int htt_rx_attach(struct htt_pdev_t *pdev)
 			 cdf_os_mem_alloc_consistent(pdev->osdev,
 				 sizeof(uint32_t),
 				 &paddr,
-				 cdf_get_dma_mem_context(
+				 qdf_get_dma_mem_context(
 					(&pdev->rx_ring.target_idx),
 					 memctx));
 
@@ -2178,7 +2178,7 @@ int htt_rx_attach(struct htt_pdev_t *pdev)
 			pdev->osdev,
 			 pdev->rx_ring.size * ring_elem_size,
 			 &paddr,
-			 cdf_get_dma_mem_context(
+			 qdf_get_dma_mem_context(
 				(&pdev->rx_ring.buf),
 				 memctx));
 	if (!pdev->rx_ring.buf.paddrs_ring)
@@ -2190,7 +2190,7 @@ int htt_rx_attach(struct htt_pdev_t *pdev)
 			pdev->osdev,
 			 sizeof(uint32_t),
 			 &paddr,
-			 cdf_get_dma_mem_context(
+			 qdf_get_dma_mem_context(
 				(&pdev->rx_ring.alloc_idx),
 				 memctx));
 
@@ -2211,7 +2211,7 @@ int htt_rx_attach(struct htt_pdev_t *pdev)
 	qdf_timer_init(pdev->osdev,
 		 &pdev->rx_ring.refill_retry_timer,
 		 htt_rx_ring_refill_retry, (void *)pdev,
-		 CDF_TIMER_TYPE_SW);
+		 QDF_TIMER_TYPE_SW);
 
 	pdev->rx_ring.fill_cnt = 0;
 #ifdef DEBUG_DMA_DONE
@@ -2227,7 +2227,7 @@ int htt_rx_attach(struct htt_pdev_t *pdev)
 	htt_rx_ring_fill_n(pdev, pdev->rx_ring.fill_level);
 
 	if (pdev->cfg.is_full_reorder_offload) {
-		cdf_print("HTT: full reorder offload enabled\n");
+		qdf_print("HTT: full reorder offload enabled\n");
 		htt_rx_amsdu_pop = htt_rx_amsdu_rx_in_order_pop_ll;
 		htt_rx_frag_pop = htt_rx_amsdu_rx_in_order_pop_ll;
 		htt_rx_mpdu_desc_list_next =
@@ -2258,10 +2258,10 @@ int htt_rx_attach(struct htt_pdev_t *pdev)
 
 fail3:
 	cdf_os_mem_free_consistent(pdev->osdev,
-				   pdev->rx_ring.size * sizeof(cdf_dma_addr_t),
+				   pdev->rx_ring.size * sizeof(qdf_dma_addr_t),
 				   pdev->rx_ring.buf.paddrs_ring,
 				   pdev->rx_ring.base_paddr,
-				   cdf_get_dma_mem_context((&pdev->rx_ring.buf),
+				   qdf_get_dma_mem_context((&pdev->rx_ring.buf),
 							   memctx));
 
 fail2:
@@ -2270,7 +2270,7 @@ fail2:
 					   sizeof(uint32_t),
 					   pdev->rx_ring.target_idx.vaddr,
 					   pdev->rx_ring.target_idx.paddr,
-					   cdf_get_dma_mem_context((&pdev->
+					   qdf_get_dma_mem_context((&pdev->
 								    rx_ring.
 								    target_idx),
 								   memctx));
@@ -2306,11 +2306,11 @@ int htt_rx_ipa_uc_alloc_wdi2_rsc(struct htt_pdev_t *pdev,
 			rx_ind_ring_elements *
 			sizeof(struct ipa_uc_rx_ring_elem_t),
 			&pdev->ipa_uc_rx_rsc.rx2_ind_ring_base.paddr,
-			cdf_get_dma_mem_context((&pdev->ipa_uc_rx_rsc.
+			qdf_get_dma_mem_context((&pdev->ipa_uc_rx_rsc.
 						 rx2_ind_ring_base),
 						memctx));
 	if (!pdev->ipa_uc_rx_rsc.rx2_ind_ring_base.vaddr) {
-		cdf_print("%s: RX IND RING alloc fail", __func__);
+		qdf_print("%s: RX IND RING alloc fail", __func__);
 		return -ENOBUFS;
 	}
 
@@ -2326,17 +2326,17 @@ int htt_rx_ipa_uc_alloc_wdi2_rsc(struct htt_pdev_t *pdev,
 			pdev->osdev,
 			4,
 			&pdev->ipa_uc_rx_rsc.rx2_ipa_prc_done_idx.paddr,
-			cdf_get_dma_mem_context((&pdev->ipa_uc_rx_rsc.
+			qdf_get_dma_mem_context((&pdev->ipa_uc_rx_rsc.
 						 rx_ipa_prc_done_idx),
 						memctx));
 	if (!pdev->ipa_uc_rx_rsc.rx2_ipa_prc_done_idx.vaddr) {
-		cdf_print("%s: RX PROC DONE IND alloc fail", __func__);
+		qdf_print("%s: RX PROC DONE IND alloc fail", __func__);
 		cdf_os_mem_free_consistent(
 			pdev->osdev,
 			pdev->ipa_uc_rx_rsc.rx2_ind_ring_size,
 			pdev->ipa_uc_rx_rsc.rx2_ind_ring_base.vaddr,
 			pdev->ipa_uc_rx_rsc.rx2_ind_ring_base.paddr,
-			cdf_get_dma_mem_context((&pdev->ipa_uc_rx_rsc.
+			qdf_get_dma_mem_context((&pdev->ipa_uc_rx_rsc.
 						 rx2_ind_ring_base),
 						memctx));
 		return -ENOBUFS;
@@ -2374,11 +2374,11 @@ int htt_rx_ipa_uc_attach(struct htt_pdev_t *pdev,
 			rx_ind_ring_elements *
 			sizeof(struct ipa_uc_rx_ring_elem_t),
 			&pdev->ipa_uc_rx_rsc.rx_ind_ring_base.paddr,
-			cdf_get_dma_mem_context((&pdev->ipa_uc_rx_rsc.
+			qdf_get_dma_mem_context((&pdev->ipa_uc_rx_rsc.
 						 rx_ind_ring_base),
 						memctx));
 	if (!pdev->ipa_uc_rx_rsc.rx_ind_ring_base.vaddr) {
-		cdf_print("%s: RX IND RING alloc fail", __func__);
+		qdf_print("%s: RX IND RING alloc fail", __func__);
 		return -ENOBUFS;
 	}
 
@@ -2394,17 +2394,17 @@ int htt_rx_ipa_uc_attach(struct htt_pdev_t *pdev,
 			pdev->osdev,
 			4,
 			&pdev->ipa_uc_rx_rsc.rx_ipa_prc_done_idx.paddr,
-			cdf_get_dma_mem_context((&pdev->ipa_uc_rx_rsc.
+			qdf_get_dma_mem_context((&pdev->ipa_uc_rx_rsc.
 						 rx_ipa_prc_done_idx),
 						memctx));
 	if (!pdev->ipa_uc_rx_rsc.rx_ipa_prc_done_idx.vaddr) {
-		cdf_print("%s: RX PROC DONE IND alloc fail", __func__);
+		qdf_print("%s: RX PROC DONE IND alloc fail", __func__);
 		cdf_os_mem_free_consistent(
 			pdev->osdev,
 			pdev->ipa_uc_rx_rsc.rx_ind_ring_size,
 			pdev->ipa_uc_rx_rsc.rx_ind_ring_base.vaddr,
 			pdev->ipa_uc_rx_rsc.rx_ind_ring_base.paddr,
-			cdf_get_dma_mem_context((&pdev->ipa_uc_rx_rsc.
+			qdf_get_dma_mem_context((&pdev->ipa_uc_rx_rsc.
 						 rx_ind_ring_base),
 						memctx));
 		return -ENOBUFS;
@@ -2430,7 +2430,7 @@ void htt_rx_ipa_uc_free_wdi2_rsc(struct htt_pdev_t *pdev)
 			pdev->ipa_uc_rx_rsc.rx2_ind_ring_size,
 			pdev->ipa_uc_rx_rsc.rx2_ind_ring_base.vaddr,
 			pdev->ipa_uc_rx_rsc.rx2_ind_ring_base.paddr,
-			cdf_get_dma_mem_context((&pdev->ipa_uc_rx_rsc.
+			qdf_get_dma_mem_context((&pdev->ipa_uc_rx_rsc.
 						 rx2_ind_ring_base),
 						memctx));
 	}
@@ -2442,7 +2442,7 @@ void htt_rx_ipa_uc_free_wdi2_rsc(struct htt_pdev_t *pdev)
 			pdev->ipa_uc_rx_rsc.
 			rx_ipa_prc_done_idx.vaddr,
 			pdev->ipa_uc_rx_rsc.rx2_ipa_prc_done_idx.paddr,
-			cdf_get_dma_mem_context((&pdev->ipa_uc_rx_rsc.
+			qdf_get_dma_mem_context((&pdev->ipa_uc_rx_rsc.
 						 rx_ipa_prc_done_idx),
 						memctx));
 	}
@@ -2462,7 +2462,7 @@ int htt_rx_ipa_uc_detach(struct htt_pdev_t *pdev)
 			pdev->ipa_uc_rx_rsc.rx_ind_ring_size,
 			pdev->ipa_uc_rx_rsc.rx_ind_ring_base.vaddr,
 			pdev->ipa_uc_rx_rsc.rx_ind_ring_base.paddr,
-			cdf_get_dma_mem_context((&pdev->ipa_uc_rx_rsc.
+			qdf_get_dma_mem_context((&pdev->ipa_uc_rx_rsc.
 						 rx_ind_ring_base),
 						memctx));
 	}
@@ -2474,7 +2474,7 @@ int htt_rx_ipa_uc_detach(struct htt_pdev_t *pdev)
 			pdev->ipa_uc_rx_rsc.
 			rx_ipa_prc_done_idx.vaddr,
 			pdev->ipa_uc_rx_rsc.rx_ipa_prc_done_idx.paddr,
-			cdf_get_dma_mem_context((&pdev->ipa_uc_rx_rsc.
+			qdf_get_dma_mem_context((&pdev->ipa_uc_rx_rsc.
 						 rx2_ipa_prc_done_idx),
 						memctx));
 	}

core/dp/htt/htt_t2h.c

@@ -124,11 +124,11 @@ static void htt_rx_frag_set_last_msdu(struct htt_pdev_t *pdev, cdf_nbuf_t msg)
 	start_idx = pdev->rx_ring.sw_rd_idx.msdu_payld;
 	msdu = pdev->rx_ring.buf.netbufs_ring[start_idx];
 	cdf_nbuf_set_pktlen(msdu, HTT_RX_BUF_SIZE);
-	cdf_nbuf_unmap(pdev->osdev, msdu, CDF_DMA_FROM_DEVICE);
+	cdf_nbuf_unmap(pdev->osdev, msdu, QDF_DMA_FROM_DEVICE);
 	rx_desc = htt_rx_desc(msdu);
 	*((uint8_t *) &rx_desc->fw_desc.u.val) = *p_fw_msdu_rx_desc;
 	rx_desc->msdu_end.last_msdu = 1;
-	cdf_nbuf_map(pdev->osdev, msdu, CDF_DMA_FROM_DEVICE);
+	cdf_nbuf_map(pdev->osdev, msdu, QDF_DMA_FROM_DEVICE);
 }
 
 /* Target to host Msg/event  handler  for low priority messages*/
@@ -146,20 +146,20 @@ void htt_t2h_lp_msg_handler(void *context, cdf_nbuf_t htt_t2h_msg)
 		cdf_runtime_pm_put();
 		pdev->tgt_ver.major = HTT_VER_CONF_MAJOR_GET(*msg_word);
 		pdev->tgt_ver.minor = HTT_VER_CONF_MINOR_GET(*msg_word);
-		cdf_print
+		qdf_print
 			("target uses HTT version %d.%d; host uses %d.%d",
 			pdev->tgt_ver.major, pdev->tgt_ver.minor,
 			HTT_CURRENT_VERSION_MAJOR,
 			HTT_CURRENT_VERSION_MINOR);
 		if (pdev->tgt_ver.major != HTT_CURRENT_VERSION_MAJOR)
-			cdf_print
+			qdf_print
 			      ("*** Incompatible host/target HTT versions!");
 		/* abort if the target is incompatible with the host */
 		cdf_assert(pdev->tgt_ver.major ==
 			   HTT_CURRENT_VERSION_MAJOR);
 		if (pdev->tgt_ver.minor != HTT_CURRENT_VERSION_MINOR) {
-			cdf_print("*** Warning: host/target HTT versions are ");
-			cdf_print(" different, though compatible!");
+			qdf_print("*** Warning: host/target HTT versions are ");
+			qdf_print(" different, though compatible!");
 		}
 		break;
 	}
@@ -293,7 +293,7 @@ void htt_t2h_lp_msg_handler(void *context, cdf_nbuf_t htt_t2h_msg)
 			cdf_runtime_pm_put();
 			HTT_TX_SCHED(pdev);
 		} else {
-			cdf_print("Ignoring HTT_T2H_MSG_TYPE_MGMT_TX_COMPL_IND indication");
+			qdf_print("Ignoring HTT_T2H_MSG_TYPE_MGMT_TX_COMPL_IND indication");
 		}
 		break;
 	}
@@ -374,7 +374,7 @@ void htt_t2h_lp_msg_handler(void *context, cdf_nbuf_t htt_t2h_msg)
 				       (struct htt_wdi_ipa_op_response_t) +
 				       len);
 		if (!op_msg_buffer) {
-			cdf_print("OPCODE messsage buffer alloc fail");
+			qdf_print("OPCODE messsage buffer alloc fail");
 			break;
 		}
 		cdf_mem_copy(op_msg_buffer,
@@ -435,7 +435,7 @@ void htt_t2h_lp_msg_handler(void *context, cdf_nbuf_t htt_t2h_msg)
 			peer = ol_txrx_peer_find_by_id(pdev->txrx_pdev,
 				 peer_id);
 			if (!peer) {
-				cdf_print("%s: invalid peer id %d\n",
+				qdf_print("%s: invalid peer id %d\n",
 					 __func__, peer_id);
 				cdf_assert(0);
 				break;
@@ -461,7 +461,7 @@ void htt_t2h_lp_msg_handler(void *context, cdf_nbuf_t htt_t2h_msg)
 		}
 		default:
 		{
-			cdf_print("%s: unhandled error type %d\n",
+			qdf_print("%s: unhandled error type %d\n",
 			 __func__,
 			 HTT_RX_OFLD_PKT_ERR_MSG_SUB_TYPE_GET(*msg_word));
 		break;
@@ -497,7 +497,7 @@ void htt_t2h_msg_handler(void *context, HTC_PACKET *pkt)
 	}
 #ifdef HTT_RX_RESTORE
 	if (cdf_unlikely(pdev->rx_ring.rx_reset)) {
-		cdf_print("rx restore ..\n");
+		qdf_print("rx restore ..\n");
 		cdf_nbuf_free(htt_t2h_msg);
 		return;
 	}
@@ -510,7 +510,7 @@ void htt_t2h_msg_handler(void *context, HTC_PACKET *pkt)
 	msg_type = HTT_T2H_MSG_TYPE_GET(*msg_word);
 
 #if defined(HELIUMPLUS_DEBUG)
-	cdf_print("%s %d: msg_word 0x%x msg_type %d",
+	qdf_print("%s %d: msg_word 0x%x msg_type %d",
 		  __func__, __LINE__, *msg_word, msg_type);
 #endif
 
@@ -523,15 +523,15 @@ void htt_t2h_msg_handler(void *context, HTC_PACKET *pkt)
 		uint8_t tid;
 
 		if (cdf_unlikely(pdev->cfg.is_full_reorder_offload)) {
-			cdf_print("HTT_T2H_MSG_TYPE_RX_IND not supported ");
-			cdf_print("with full reorder offload\n");
+			qdf_print("HTT_T2H_MSG_TYPE_RX_IND not supported ");
+			qdf_print("with full reorder offload\n");
 			break;
 		}
 		peer_id = HTT_RX_IND_PEER_ID_GET(*msg_word);
 		tid = HTT_RX_IND_EXT_TID_GET(*msg_word);
 
 		if (tid >= OL_TXRX_NUM_EXT_TIDS) {
-			cdf_print("HTT_T2H_MSG_TYPE_RX_IND, invalid tid %d\n",
+			qdf_print("HTT_T2H_MSG_TYPE_RX_IND, invalid tid %d\n",
 				tid);
 			break;
 		}
@@ -650,9 +650,9 @@ void htt_t2h_msg_handler(void *context, HTC_PACKET *pkt)
 		uint8_t offload_ind, frag_ind;
 
 		if (cdf_unlikely(!pdev->cfg.is_full_reorder_offload)) {
-			cdf_print("HTT_T2H_MSG_TYPE_RX_IN_ORD_PADDR_IND not ");
-			cdf_print("supported when full reorder offload is ");
-			cdf_print("disabled in the configuration.\n");
+			qdf_print("HTT_T2H_MSG_TYPE_RX_IN_ORD_PADDR_IND not ");
+			qdf_print("supported when full reorder offload is ");
+			qdf_print("disabled in the configuration.\n");
 			break;
 		}
 
@@ -662,7 +662,7 @@ void htt_t2h_msg_handler(void *context, HTC_PACKET *pkt)
 		frag_ind = HTT_RX_IN_ORD_PADDR_IND_FRAG_GET(*msg_word);
 
 #if defined(HELIUMPLUS_DEBUG)
-		cdf_print("%s %d: peerid %d tid %d offloadind %d fragind %d\n",
+		qdf_print("%s %d: peerid %d tid %d offloadind %d fragind %d\n",
 			  __func__, __LINE__, peer_id, tid, offload_ind,
 			  frag_ind);
 #endif

core/dp/htt/htt_tx.c

@@ -37,7 +37,7 @@
  *      tx frame to HTC.
  */
 #include <osdep.h>              /* uint32_t, offsetof, etc. */
-#include <cdf_types.h>          /* cdf_dma_addr_t */
+#include <qdf_types.h>          /* qdf_dma_addr_t */
 #include <cdf_memory.h>         /* cdf_os_mem_alloc_consistent et al */
 #include <cdf_nbuf.h>           /* cdf_nbuf_t, etc. */
 #include <qdf_time.h>           /* qdf_mdelay */
@@ -83,7 +83,7 @@ do {                                                                           \
 uint32_t *g_dbg_htt_desc_end_addr, *g_dbg_htt_desc_start_addr;
 #endif
 
-static cdf_dma_addr_t htt_tx_get_paddr(htt_pdev_handle pdev,
+static qdf_dma_addr_t htt_tx_get_paddr(htt_pdev_handle pdev,
 				char *target_vaddr);
 
 #ifdef HELIUMPLUS
@@ -160,7 +160,7 @@ static int htt_tx_frag_desc_attach(struct htt_pdev_t *pdev,
 	pdev->frag_descs.pool_elems = desc_pool_elems;
 	cdf_mem_multi_pages_alloc(pdev->osdev, &pdev->frag_descs.desc_pages,
 		pdev->frag_descs.size, desc_pool_elems,
-		cdf_get_dma_mem_context((&pdev->frag_descs), memctx), false);
+		qdf_get_dma_mem_context((&pdev->frag_descs), memctx), false);
 	if ((0 == pdev->frag_descs.desc_pages.num_pages) ||
 		(NULL == pdev->frag_descs.desc_pages.dma_pages)) {
 		TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
@@ -181,7 +181,7 @@ static int htt_tx_frag_desc_attach(struct htt_pdev_t *pdev,
 static void htt_tx_frag_desc_detach(struct htt_pdev_t *pdev)
 {
 	cdf_mem_multi_pages_free(pdev->osdev, &pdev->frag_descs.desc_pages,
-		cdf_get_dma_mem_context((&pdev->frag_descs), memctx), false);
+		qdf_get_dma_mem_context((&pdev->frag_descs), memctx), false);
 }
 
 /**
@@ -330,7 +330,7 @@ int htt_tx_attach(struct htt_pdev_t *pdev, int desc_pool_elems)
 	pool_size = pdev->tx_descs.pool_elems * pdev->tx_descs.size;
 	cdf_mem_multi_pages_alloc(pdev->osdev, &pdev->tx_descs.desc_pages,
 		pdev->tx_descs.size, pdev->tx_descs.pool_elems,
-		cdf_get_dma_mem_context((&pdev->tx_descs), memctx), false);
+		qdf_get_dma_mem_context((&pdev->tx_descs), memctx), false);
 	if ((0 == pdev->tx_descs.desc_pages.num_pages) ||
 		(NULL == pdev->tx_descs.desc_pages.dma_pages)) {
 		TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
@@ -382,7 +382,7 @@ int htt_tx_attach(struct htt_pdev_t *pdev, int desc_pool_elems)
 
 free_htt_desc:
 	cdf_mem_multi_pages_free(pdev->osdev, &pdev->tx_descs.desc_pages,
-		cdf_get_dma_mem_context((&pdev->tx_descs), memctx), false);
+		qdf_get_dma_mem_context((&pdev->tx_descs), memctx), false);
 out_fail:
 	return -ENOBUFS;
 }
@@ -390,13 +390,13 @@ out_fail:
 void htt_tx_detach(struct htt_pdev_t *pdev)
 {
 	if (!pdev) {
-		cdf_print("htt tx detach invalid instance");
+		qdf_print("htt tx detach invalid instance");
 		return;
 	}
 
 	htt_tx_frag_desc_detach(pdev);
 	cdf_mem_multi_pages_free(pdev->osdev, &pdev->tx_descs.desc_pages,
-		cdf_get_dma_mem_context((&pdev->tx_descs), memctx), false);
+		qdf_get_dma_mem_context((&pdev->tx_descs), memctx), false);
 }
 
 /**
@@ -407,7 +407,7 @@ void htt_tx_detach(struct htt_pdev_t *pdev)
  *
  * Return: Physical address of descriptor
  */
-static cdf_dma_addr_t htt_tx_get_paddr(htt_pdev_handle pdev,
+static qdf_dma_addr_t htt_tx_get_paddr(htt_pdev_handle pdev,
 				char *target_vaddr)
 {
 	uint16_t i;
@@ -646,7 +646,7 @@ htt_tx_resume_handler(void *context) { }
 cdf_nbuf_t
 htt_tx_send_batch(htt_pdev_handle pdev, cdf_nbuf_t head_msdu, int num_msdus)
 {
-	cdf_print("*** %s curently only applies for HL systems\n", __func__);
+	qdf_print("*** %s curently only applies for HL systems\n", __func__);
 	cdf_assert(0);
 	return head_msdu;
 
@@ -821,28 +821,28 @@ void htt_tx_desc_display(void *tx_desc)
 	htt_tx_desc = (struct htt_tx_msdu_desc_t *)tx_desc;
 
 	/* only works for little-endian */
-	cdf_print("HTT tx desc (@ %p):", htt_tx_desc);
-	cdf_print("  msg type = %d", htt_tx_desc->msg_type);
-	cdf_print("  pkt subtype = %d", htt_tx_desc->pkt_subtype);
-	cdf_print("  pkt type = %d", htt_tx_desc->pkt_type);
-	cdf_print("  vdev ID = %d", htt_tx_desc->vdev_id);
-	cdf_print("  ext TID = %d", htt_tx_desc->ext_tid);
-	cdf_print("  postponed = %d", htt_tx_desc->postponed);
-	cdf_print("  extension = %d", htt_tx_desc->extension);
-	cdf_print("  cksum_offload = %d", htt_tx_desc->cksum_offload);
-	cdf_print("  tx_compl_req= %d", htt_tx_desc->tx_compl_req);
-	cdf_print("  length = %d", htt_tx_desc->len);
-	cdf_print("  id = %d", htt_tx_desc->id);
+	qdf_print("HTT tx desc (@ %p):", htt_tx_desc);
+	qdf_print("  msg type = %d", htt_tx_desc->msg_type);
+	qdf_print("  pkt subtype = %d", htt_tx_desc->pkt_subtype);
+	qdf_print("  pkt type = %d", htt_tx_desc->pkt_type);
+	qdf_print("  vdev ID = %d", htt_tx_desc->vdev_id);
+	qdf_print("  ext TID = %d", htt_tx_desc->ext_tid);
+	qdf_print("  postponed = %d", htt_tx_desc->postponed);
+	qdf_print("  extension = %d", htt_tx_desc->extension);
+	qdf_print("  cksum_offload = %d", htt_tx_desc->cksum_offload);
+	qdf_print("  tx_compl_req= %d", htt_tx_desc->tx_compl_req);
+	qdf_print("  length = %d", htt_tx_desc->len);
+	qdf_print("  id = %d", htt_tx_desc->id);
 #if HTT_PADDR64
-	cdf_print("  frag desc addr.lo = %#x",
+	qdf_print("  frag desc addr.lo = %#x",
 		  htt_tx_desc->frags_desc_ptr.lo);
-	cdf_print("  frag desc addr.hi = %#x",
+	qdf_print("  frag desc addr.hi = %#x",
 		  htt_tx_desc->frags_desc_ptr.hi);
 #else /* ! HTT_PADDR64 */
-	cdf_print("  frag desc addr = %#x", htt_tx_desc->frags_desc_ptr);
+	qdf_print("  frag desc addr = %#x", htt_tx_desc->frags_desc_ptr);
 #endif /* HTT_PADDR64 */
-	cdf_print("  peerid = %d", htt_tx_desc->peerid);
-	cdf_print("  chanfreq = %d", htt_tx_desc->chanfreq);
+	qdf_print("  peerid = %d", htt_tx_desc->peerid);
+	qdf_print("  chanfreq = %d", htt_tx_desc->chanfreq);
 }
 #endif
 
@@ -866,7 +866,7 @@ int htt_tx_ipa_uc_wdi_tx_buf_alloc(struct htt_pdev_t *pdev,
 {
 	unsigned int tx_buffer_count;
 	cdf_nbuf_t buffer_vaddr;
-	cdf_dma_addr_t buffer_paddr;
+	qdf_dma_addr_t buffer_paddr;
 	uint32_t *header_ptr;
 	uint32_t *ring_vaddr;
 #define IPA_UC_TX_BUF_FRAG_DESC_OFFSET 16
@@ -879,7 +879,7 @@ int htt_tx_ipa_uc_wdi_tx_buf_alloc(struct htt_pdev_t *pdev,
 		buffer_vaddr = cdf_nbuf_alloc(pdev->osdev,
 					      uc_tx_buf_sz, 0, 4, false);
 		if (!buffer_vaddr) {
-			cdf_print("%s: TX BUF alloc fail, loop index: %d",
+			qdf_print("%s: TX BUF alloc fail, loop index: %d",
 				  __func__, tx_buffer_count);
 			return tx_buffer_count;
 		}
@@ -896,7 +896,7 @@ int htt_tx_ipa_uc_wdi_tx_buf_alloc(struct htt_pdev_t *pdev,
 		*header_ptr |= ((uint16_t) uc_tx_partition_base +
 				tx_buffer_count) << 16;
 
-		cdf_nbuf_map(pdev->osdev, buffer_vaddr, CDF_DMA_BIDIRECTIONAL);
+		cdf_nbuf_map(pdev->osdev, buffer_vaddr, QDF_DMA_BIDIRECTIONAL);
 		buffer_paddr = cdf_nbuf_get_frag_paddr(buffer_vaddr, 0);
 		header_ptr++;
 		*header_ptr = (uint32_t) (buffer_paddr +
@@ -939,7 +939,7 @@ int htt_tx_ipa_uc_wdi_tx_buf_alloc(struct htt_pdev_t *pdev,
 		buffer_vaddr = cdf_nbuf_alloc(pdev->osdev,
 					      uc_tx_buf_sz, 0, 4, false);
 		if (!buffer_vaddr) {
-			cdf_print("%s: TX BUF alloc fail, loop index: %d",
+			qdf_print("%s: TX BUF alloc fail, loop index: %d",
 				  __func__, tx_buffer_count);
 			return tx_buffer_count;
 		}
@@ -956,7 +956,7 @@ int htt_tx_ipa_uc_wdi_tx_buf_alloc(struct htt_pdev_t *pdev,
 		*header_ptr |= ((uint16_t) uc_tx_partition_base +
 				tx_buffer_count) << 16;
 
-		cdf_nbuf_map(pdev->osdev, buffer_vaddr, CDF_DMA_BIDIRECTIONAL);
+		cdf_nbuf_map(pdev->osdev, buffer_vaddr, QDF_DMA_BIDIRECTIONAL);
 		buffer_paddr = cdf_nbuf_get_frag_paddr(buffer_vaddr, 0);
 		header_ptr++;
 
@@ -1014,11 +1014,11 @@ int htt_tx_ipa_uc_attach(struct htt_pdev_t *pdev,
 			pdev->osdev,
 			4,
 			&pdev->ipa_uc_tx_rsc.tx_ce_idx.paddr,
-			cdf_get_dma_mem_context(
+			qdf_get_dma_mem_context(
 				(&pdev->ipa_uc_tx_rsc.tx_ce_idx),
 				memctx));
 	if (!pdev->ipa_uc_tx_rsc.tx_ce_idx.vaddr) {
-		cdf_print("%s: CE Write Index WORD alloc fail", __func__);
+		qdf_print("%s: CE Write Index WORD alloc fail", __func__);
 		return -ENOBUFS;
 	}
 
@@ -1029,11 +1029,11 @@ int htt_tx_ipa_uc_attach(struct htt_pdev_t *pdev,
 			pdev->osdev,
 			tx_comp_ring_size,
 			&pdev->ipa_uc_tx_rsc.tx_comp_base.paddr,
-			cdf_get_dma_mem_context((&pdev->ipa_uc_tx_rsc.
+			qdf_get_dma_mem_context((&pdev->ipa_uc_tx_rsc.
 						 tx_comp_base),
 						memctx));
 	if (!pdev->ipa_uc_tx_rsc.tx_comp_base.vaddr) {
-		cdf_print("%s: TX COMP ring alloc fail", __func__);
+		qdf_print("%s: TX COMP ring alloc fail", __func__);
 		return_code = -ENOBUFS;
 		goto free_tx_ce_idx;
 	}
@@ -1045,7 +1045,7 @@ int htt_tx_ipa_uc_attach(struct htt_pdev_t *pdev,
 		(cdf_nbuf_t *) cdf_mem_malloc(uc_tx_buf_cnt *
 					      sizeof(cdf_nbuf_t));
 	if (!pdev->ipa_uc_tx_rsc.tx_buf_pool_vaddr_strg) {
-		cdf_print("%s: TX BUF POOL vaddr storage alloc fail", __func__);
+		qdf_print("%s: TX BUF POOL vaddr storage alloc fail", __func__);
 		return_code = -ENOBUFS;
 		goto free_tx_comp_base;
 	}
@@ -1063,7 +1063,7 @@ free_tx_comp_base:
 				   tx_comp_ring_size,
 				   pdev->ipa_uc_tx_rsc.tx_comp_base.vaddr,
 				   pdev->ipa_uc_tx_rsc.tx_comp_base.paddr,
-				   cdf_get_dma_mem_context((&pdev->
+				   qdf_get_dma_mem_context((&pdev->
 							    ipa_uc_tx_rsc.
 							    tx_comp_base),
 							   memctx));
@@ -1072,7 +1072,7 @@ free_tx_ce_idx:
 				   4,
 				   pdev->ipa_uc_tx_rsc.tx_ce_idx.vaddr,
 				   pdev->ipa_uc_tx_rsc.tx_ce_idx.paddr,
-				   cdf_get_dma_mem_context((&pdev->
+				   qdf_get_dma_mem_context((&pdev->
 							    ipa_uc_tx_rsc.
 							    tx_ce_idx),
 							   memctx));
@@ -1089,7 +1089,7 @@ int htt_tx_ipa_uc_detach(struct htt_pdev_t *pdev)
 			4,
 			pdev->ipa_uc_tx_rsc.tx_ce_idx.vaddr,
 			pdev->ipa_uc_tx_rsc.tx_ce_idx.paddr,
-			cdf_get_dma_mem_context(
+			qdf_get_dma_mem_context(
 				(&pdev->ipa_uc_tx_rsc.tx_ce_idx),
 				memctx));
 	}
@@ -1100,7 +1100,7 @@ int htt_tx_ipa_uc_detach(struct htt_pdev_t *pdev)
 			ol_cfg_ipa_uc_tx_max_buf_cnt(pdev->ctrl_pdev) * sizeof(cdf_nbuf_t),
 			pdev->ipa_uc_tx_rsc.tx_comp_base.vaddr,
 			pdev->ipa_uc_tx_rsc.tx_comp_base.paddr,
-			cdf_get_dma_mem_context((&pdev->ipa_uc_tx_rsc.
+			qdf_get_dma_mem_context((&pdev->ipa_uc_tx_rsc.
 						 tx_comp_base),
 						memctx));
 	}
@@ -1111,7 +1111,7 @@ int htt_tx_ipa_uc_detach(struct htt_pdev_t *pdev)
 			cdf_nbuf_unmap(pdev->osdev,
 				       pdev->ipa_uc_tx_rsc.
 				       tx_buf_pool_vaddr_strg[idx],
-				       CDF_DMA_FROM_DEVICE);
+				       QDF_DMA_FROM_DEVICE);
 			cdf_nbuf_free(pdev->ipa_uc_tx_rsc.
 				      tx_buf_pool_vaddr_strg[idx]);
 		}
@@ -1127,7 +1127,7 @@ int htt_tx_ipa_uc_detach(struct htt_pdev_t *pdev)
 #if defined(FEATURE_TSO)
 void
 htt_tx_desc_fill_tso_info(htt_pdev_handle pdev, void *desc,
-	 struct cdf_tso_info_t *tso_info)
+	 struct qdf_tso_info_t *tso_info)
 {
 	u_int32_t *word;
 	int i;

core/dp/htt/htt_types.h

@@ -29,7 +29,7 @@
 #define _HTT_TYPES__H_
 
 #include <osdep.h>              /* uint16_t, dma_addr_t */
-#include <cdf_types.h>          /* cdf_device_t */
+#include <qdf_types.h>          /* qdf_device_t */
 #include <cdf_lock.h>           /* cdf_spinlock_t */
 #include <qdf_timer.h>		/* qdf_timer_t */
 #include <qdf_atomic.h>         /* qdf_atomic_inc */
@@ -122,8 +122,8 @@ struct htt_rx_hash_bucket {
    firmware shared memory structure */
 struct uc_shared_mem_t {
 	uint32_t *vaddr;
-	cdf_dma_addr_t paddr;
-	cdf_dma_mem_context(memctx);
+	qdf_dma_addr_t paddr;
+	qdf_dma_mem_context(memctx);
 };
 
 /* Micro controller datapath offload
@@ -149,13 +149,13 @@ struct htt_ipa_uc_tx_resource_t {
  * @rx2_ind_ring_size: rx process done ring size
  */
 struct htt_ipa_uc_rx_resource_t {
-	cdf_dma_addr_t rx_rdy_idx_paddr;
+	qdf_dma_addr_t rx_rdy_idx_paddr;
 	struct uc_shared_mem_t rx_ind_ring_base;
 	struct uc_shared_mem_t rx_ipa_prc_done_idx;
 	uint32_t rx_ind_ring_size;
 
 	/* 2nd RX ring */
-	cdf_dma_addr_t rx2_rdy_idx_paddr;
+	qdf_dma_addr_t rx2_rdy_idx_paddr;
 	struct uc_shared_mem_t rx2_ind_ring_base;
 	struct uc_shared_mem_t rx2_ipa_prc_done_idx;
 	uint32_t rx2_ind_ring_size;
@@ -168,7 +168,7 @@ struct htt_ipa_uc_rx_resource_t {
  * @rx_packet_leng: packet length
  */
 struct ipa_uc_rx_ring_elem_t {
-	cdf_dma_addr_t rx_packet_paddr;
+	qdf_dma_addr_t rx_packet_paddr;
 	uint32_t vdev_id;
 	uint32_t rx_packet_leng;
 };
@@ -218,7 +218,7 @@ struct htt_pdev_t {
 	ol_pdev_handle ctrl_pdev;
 	ol_txrx_pdev_handle txrx_pdev;
 	HTC_HANDLE htc_pdev;
-	cdf_device_t osdev;
+	qdf_device_t osdev;
 
 	HTC_ENDPOINT_ID htc_endpoint;
 
@@ -270,7 +270,7 @@ struct htt_pdev_t {
 #else   /* ! HTT_PADDR64 */
 			uint32_t *paddrs_ring;
 #endif
-			cdf_dma_mem_context(memctx);
+			qdf_dma_mem_context(memctx);
 		} buf;
 		/*
 		 * Base address of ring, as a "physical" device address rather
@@ -294,7 +294,7 @@ struct htt_pdev_t {
 		struct {
 			uint32_t *vaddr;
 			uint32_t paddr;
-			cdf_dma_mem_context(memctx);
+			qdf_dma_mem_context(memctx);
 		} target_idx;
 
 		/*
@@ -310,7 +310,7 @@ struct htt_pdev_t {
 		struct {
 			uint32_t *vaddr;
 			uint32_t paddr;
-			cdf_dma_mem_context(memctx);
+			qdf_dma_mem_context(memctx);
 		} alloc_idx;
 
 		/* sw_rd_idx -
@@ -357,14 +357,14 @@ struct htt_pdev_t {
 		uint16_t alloc_cnt;
 		struct cdf_mem_multi_page_t desc_pages;
 		uint32_t *freelist;
-		cdf_dma_mem_context(memctx);
+		qdf_dma_mem_context(memctx);
 	} tx_descs;
 #if defined(HELIUMPLUS_PADDR64)
 	struct {
 		int size; /* of each Fragment/MSDU-Ext descriptor */
 		int pool_elems;
 		struct cdf_mem_multi_page_t desc_pages;
-		cdf_dma_mem_context(memctx);
+		qdf_dma_mem_context(memctx);
 	} frag_descs;
 #endif /* defined(HELIUMPLUS_PADDR64) */
 

core/dp/ol/inc/ol_cfg.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2015 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -28,7 +28,7 @@
 #ifndef _OL_CFG__H_
 #define _OL_CFG__H_
 
-#include <cdf_types.h>          /* uint32_t */
+#include <qdf_types.h>          /* uint32_t */
 #include <ol_ctrl_api.h>        /* ol_pdev_handle */
 #include <cds_ieee80211_common.h>   /* ieee80211_qosframe_htc_addr4 */
 #include <enet.h>               /* LLC_SNAP_HDR_LEN */

core/dp/ol/inc/ol_htt_api.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014-2015 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011, 2014-2016 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -35,7 +35,7 @@
 #ifndef _OL_HTT_API__H_
 #define _OL_HTT_API__H_
 
-#include <cdf_types.h>          /* cdf_device_t */
+#include <qdf_types.h>          /* qdf_device_t */
 #include <cdf_nbuf.h>           /* cdf_nbuf_t */
 #include <athdefs.h>            /* A_STATUS */
 #include <htc_api.h>            /* HTC_HANDLE */
@@ -53,7 +53,7 @@ typedef struct htt_pdev_t *htt_pdev_handle;
 htt_pdev_handle
 htt_pdev_alloc(ol_txrx_pdev_handle txrx_pdev,
 	ol_pdev_handle ctrl_pdev,
-	HTC_HANDLE htc_pdev, cdf_device_t osdev);
+	HTC_HANDLE htc_pdev, qdf_device_t osdev);
 
 /**
  * @brief Allocate and initialize a HTT instance.
@@ -218,25 +218,25 @@ int htt_h2t_ipa_uc_rsc_cfg_msg(struct htt_pdev_t *pdev);
 
 int
 htt_ipa_uc_get_resource(htt_pdev_handle pdev,
-			cdf_dma_addr_t *ce_sr_base_paddr,
+			qdf_dma_addr_t *ce_sr_base_paddr,
 			uint32_t *ce_sr_ring_size,
-			cdf_dma_addr_t *ce_reg_paddr,
-			cdf_dma_addr_t *tx_comp_ring_base_paddr,
+			qdf_dma_addr_t *ce_reg_paddr,
+			qdf_dma_addr_t *tx_comp_ring_base_paddr,
 			uint32_t *tx_comp_ring_size,
 			uint32_t *tx_num_alloc_buffer,
-			cdf_dma_addr_t *rx_rdy_ring_base_paddr,
+			qdf_dma_addr_t *rx_rdy_ring_base_paddr,
 			uint32_t *rx_rdy_ring_size,
-			cdf_dma_addr_t *rx_proc_done_idx_paddr,
+			qdf_dma_addr_t *rx_proc_done_idx_paddr,
 			void **rx_proc_done_idx_vaddr,
-			cdf_dma_addr_t *rx2_rdy_ring_base_paddr,
+			qdf_dma_addr_t *rx2_rdy_ring_base_paddr,
 			uint32_t *rx2_rdy_ring_size,
-			cdf_dma_addr_t *rx2_proc_done_idx_paddr,
+			qdf_dma_addr_t *rx2_proc_done_idx_paddr,
 			void **rx2_proc_done_idx_vaddr);
 
 int
 htt_ipa_uc_set_doorbell_paddr(htt_pdev_handle pdev,
-			      cdf_dma_addr_t ipa_uc_tx_doorbell_paddr,
-			      cdf_dma_addr_t ipa_uc_rx_doorbell_paddr);
+			      qdf_dma_addr_t ipa_uc_tx_doorbell_paddr,
+			      qdf_dma_addr_t ipa_uc_rx_doorbell_paddr);
 
 int
 htt_h2t_ipa_uc_set_active(struct htt_pdev_t *pdev, bool uc_active, bool is_tx);
@@ -280,19 +280,19 @@ static inline int htt_h2t_ipa_uc_rsc_cfg_msg(struct htt_pdev_t *pdev)
  */
 static inline int
 htt_ipa_uc_get_resource(htt_pdev_handle pdev,
-			cdf_dma_addr_t *ce_sr_base_paddr,
+			qdf_dma_addr_t *ce_sr_base_paddr,
 			uint32_t *ce_sr_ring_size,
-			cdf_dma_addr_t *ce_reg_paddr,
-			cdf_dma_addr_t *tx_comp_ring_base_paddr,
+			qdf_dma_addr_t *ce_reg_paddr,
+			qdf_dma_addr_t *tx_comp_ring_base_paddr,
 			uint32_t *tx_comp_ring_size,
 			uint32_t *tx_num_alloc_buffer,
-			cdf_dma_addr_t *rx_rdy_ring_base_paddr,
+			qdf_dma_addr_t *rx_rdy_ring_base_paddr,
 			uint32_t *rx_rdy_ring_size,
-			cdf_dma_addr_t *rx_proc_done_idx_paddr,
+			qdf_dma_addr_t *rx_proc_done_idx_paddr,
 			void **rx_proc_done_idx_vaddr,
-			cdf_dma_addr_t *rx2_rdy_ring_base_paddr,
+			qdf_dma_addr_t *rx2_rdy_ring_base_paddr,
 			uint32_t *rx2_rdy_ring_size,
-			cdf_dma_addr_t *rx2_proc_done_idx_paddr,
+			qdf_dma_addr_t *rx2_proc_done_idx_paddr,
 			void **rx2_proc_done_idx_vaddr)
 {
 	return 0;

core/dp/ol/inc/ol_htt_rx_api.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2015 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -41,7 +41,7 @@
 /* #include <osapi_linux.h>     / * uint16_t, etc. * / */
 #include <osdep.h>              /* uint16_t, etc. */
 #include <cdf_nbuf.h>           /* cdf_nbuf_t */
-#include <cdf_types.h>          /* bool */
+#include <qdf_types.h>          /* bool */
 
 #include <htt.h>                /* HTT_RX_IND_MPDU_STATUS */
 #include <ol_htt_api.h>         /* htt_pdev_handle */

core/dp/ol/inc/ol_htt_tx_api.h

@@ -287,35 +287,35 @@ struct htt_msdu_info_t {
 
 static inline void htt_msdu_info_dump(struct htt_msdu_info_t *msdu_info)
 {
-	CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
+	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
 		  "HTT MSDU info object (%p)\n", msdu_info);
-	CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
+	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
 		  "  ethertype: %#x\n", msdu_info->info.ethertype);
-	CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
+	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
 		  "  peer_id: %d\n", msdu_info->info.peer_id);
-	CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
+	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
 		  "  vdev_id: %d\n", msdu_info->info.vdev_id);
-	CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
+	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
 		  "  ext_tid: %d\n", msdu_info->info.ext_tid);
-	CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
+	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
 		  "  l2_hdr_type: %d\n", msdu_info->info.l2_hdr_type);
-	CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
+	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
 		  "  frame_type: %d\n", msdu_info->info.frame_type);
-	CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
+	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
 		  "  frame_subtype: %d\n", msdu_info->info.frame_subtype);
-	CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
+	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
 		  "  is_unicast: %u\n", msdu_info->info.is_unicast);
-	CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
+	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
 		  "  l3_hdr_offset: %u\n", msdu_info->info.l3_hdr_offset);
-	CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
+	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
 		  "  use 6 Mbps: %d\n", msdu_info->action.use_6mbps);
-	CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
+	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
 		  "  do_encrypt: %d\n", msdu_info->action.do_encrypt);
-	CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
+	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
 		  "  do_tx_complete: %d\n", msdu_info->action.do_tx_complete);
-	CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
+	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
 		  "  is_unicast: %u\n", msdu_info->info.is_unicast);
-	CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
+	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
 		  "  is_unicast: %u\n", msdu_info->info.is_unicast);
 }
 
@@ -533,7 +533,7 @@ htt_tx_desc_init(htt_pdev_handle pdev,
 		 cdf_dma_addr_t htt_tx_desc_paddr,
 		 uint16_t msdu_id,
 		 cdf_nbuf_t msdu, struct htt_msdu_info_t *msdu_info,
-		 struct cdf_tso_info_t *tso_info,
+		 struct qdf_tso_info_t *tso_info,
 		 struct ocb_tx_ctrl_hdr_t *tx_ctrl,
 		 uint8_t is_dsrc)
 {
@@ -573,7 +573,7 @@ htt_tx_desc_init(htt_pdev_handle pdev,
 
 		ce_pkt_type = htt_to_ce_pkt_type[pkt_type];
 		if (0xffffffff == ce_pkt_type) {
-			CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_DEBUG,
+			CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_DEBUG,
 			"Invalid HTT pkt type %d\n", pkt_type);
 			return;
 		}
@@ -696,9 +696,9 @@ htt_tx_desc_init(htt_pdev_handle pdev,
 	if (cdf_likely(pdev->cfg.ce_classify_enabled &&
 		(msdu_info->info.l2_hdr_type != htt_pkt_type_mgmt))) {
 		uint32_t pkt_offset = cdf_nbuf_get_frag_len(msdu, 0);
-		data_attr = hw_classify << CDF_CE_TX_CLASSIFY_BIT_S;
-		data_attr |= ce_pkt_type << CDF_CE_TX_PKT_TYPE_BIT_S;
-		data_attr |= pkt_offset  << CDF_CE_TX_PKT_OFFSET_BIT_S;
+		data_attr = hw_classify << QDF_CE_TX_CLASSIFY_BIT_S;
+		data_attr |= ce_pkt_type << QDF_CE_TX_PKT_TYPE_BIT_S;
+		data_attr |= pkt_offset  << QDF_CE_TX_PKT_OFFSET_BIT_S;
 	}
 
 	cdf_nbuf_data_attr_set(msdu, data_attr);
@@ -979,7 +979,7 @@ void htt_tx_desc_set_chanfreq(void *htt_tx_desc, uint16_t chanfreq)
 #if defined(FEATURE_TSO)
 void
 htt_tx_desc_fill_tso_info(htt_pdev_handle pdev, void *desc,
-	 struct cdf_tso_info_t *tso_info);
+	 struct qdf_tso_info_t *tso_info);
 #else
 #define htt_tx_desc_fill_tso_info(pdev, desc, tso_info)
 #endif

core/dp/ol/inc/ol_txrx_ctrl_api.h

@@ -34,7 +34,7 @@
 
 #include <athdefs.h>            /* A_STATUS */
 #include <cdf_nbuf.h>           /* cdf_nbuf_t */
-#include <cdf_types.h>          /* cdf_device_t */
+#include <qdf_types.h>          /* qdf_device_t */
 #include <htc_api.h>            /* HTC_HANDLE */
 
 #include <ol_osif_api.h>        /* ol_osif_vdev_handle */
@@ -139,7 +139,7 @@ enum netif_reason_type {
 
 ol_txrx_pdev_handle
 ol_txrx_pdev_alloc(ol_pdev_handle ctrl_pdev,
-		   HTC_HANDLE htc_pdev, cdf_device_t osdev);
+		   HTC_HANDLE htc_pdev, qdf_device_t osdev);
 
 /**
  * @brief Set up the data SW subsystem.
@@ -897,7 +897,7 @@ struct txrx_pdev_cfg_param_t {
  * @param osdev - OS handle needed as an argument for some OS primitives
  * @return the control device object
  */
-ol_pdev_handle ol_pdev_cfg_attach(cdf_device_t osdev,
+ol_pdev_handle ol_pdev_cfg_attach(qdf_device_t osdev,
 				  struct txrx_pdev_cfg_param_t cfg_param);
 
 QDF_STATUS ol_txrx_get_vdevid(struct ol_txrx_peer_t *peer, uint8_t *vdev_id);
@@ -1092,26 +1092,26 @@ void ol_vdev_rx_set_intrabss_fwd(ol_txrx_vdev_handle vdev, bool val);
 #ifdef IPA_OFFLOAD
 void
 ol_txrx_ipa_uc_get_resource(ol_txrx_pdev_handle pdev,
-			    cdf_dma_addr_t *ce_sr_base_paddr,
+			    qdf_dma_addr_t *ce_sr_base_paddr,
 			    uint32_t *ce_sr_ring_size,
-			    cdf_dma_addr_t *ce_reg_paddr,
-			    cdf_dma_addr_t *tx_comp_ring_base_paddr,
+			    qdf_dma_addr_t *ce_reg_paddr,
+			    qdf_dma_addr_t *tx_comp_ring_base_paddr,
 			    uint32_t *tx_comp_ring_size,
 			    uint32_t *tx_num_alloc_buffer,
-			    cdf_dma_addr_t *rx_rdy_ring_base_paddr,
+			    qdf_dma_addr_t *rx_rdy_ring_base_paddr,
 			    uint32_t *rx_rdy_ring_size,
-			    cdf_dma_addr_t *rx_proc_done_idx_paddr,
+			    qdf_dma_addr_t *rx_proc_done_idx_paddr,
 			    void **rx_proc_done_idx_vaddr,
-			    cdf_dma_addr_t *rx2_rdy_ring_base_paddr,
+			    qdf_dma_addr_t *rx2_rdy_ring_base_paddr,
 			    uint32_t *rx2_rdy_ring_size,
-			    cdf_dma_addr_t *rx2_proc_done_idx_paddr,
+			    qdf_dma_addr_t *rx2_proc_done_idx_paddr,
 			    void **rx2_proc_done_idx_vaddr);
 
 
 void
 ol_txrx_ipa_uc_set_doorbell_paddr(ol_txrx_pdev_handle pdev,
-				  cdf_dma_addr_t ipa_tx_uc_doorbell_paddr,
-				  cdf_dma_addr_t ipa_rx_uc_doorbell_paddr);
+				  qdf_dma_addr_t ipa_tx_uc_doorbell_paddr,
+				  qdf_dma_addr_t ipa_rx_uc_doorbell_paddr);
 
 void
 ol_txrx_ipa_uc_set_active(ol_txrx_pdev_handle pdev, bool uc_active, bool is_tx);
@@ -1151,19 +1151,19 @@ void ol_txrx_ipa_uc_get_stat(ol_txrx_pdev_handle pdev);
  */
 static inline void
 ol_txrx_ipa_uc_get_resource(ol_txrx_pdev_handle pdev,
-			    cdf_dma_addr_t *ce_sr_base_paddr,
+			    qdf_dma_addr_t *ce_sr_base_paddr,
 			    uint32_t *ce_sr_ring_size,
-			    cdf_dma_addr_t *ce_reg_paddr,
-			    cdf_dma_addr_t *tx_comp_ring_base_paddr,
+			    qdf_dma_addr_t *ce_reg_paddr,
+			    qdf_dma_addr_t *tx_comp_ring_base_paddr,
 			    uint32_t *tx_comp_ring_size,
 			    uint32_t *tx_num_alloc_buffer,
-			    cdf_dma_addr_t *rx_rdy_ring_base_paddr,
+			    qdf_dma_addr_t *rx_rdy_ring_base_paddr,
 			    uint32_t *rx_rdy_ring_size,
-			    cdf_dma_addr_t *rx_proc_done_idx_paddr,
+			    qdf_dma_addr_t *rx_proc_done_idx_paddr,
 			    void **rx_proc_done_idx_vaddr,
-			    cdf_dma_addr_t *rx2_rdy_ring_base_paddr,
+			    qdf_dma_addr_t *rx2_rdy_ring_base_paddr,
 			    uint32_t *rx2_rdy_ring_size,
-			    cdf_dma_addr_t *rx2_proc_done_idx_paddr,
+			    qdf_dma_addr_t *rx2_proc_done_idx_paddr,
 			    void **rx2_proc_done_idx_vaddr)
 {
 	return;
@@ -1182,8 +1182,8 @@ ol_txrx_ipa_uc_get_resource(ol_txrx_pdev_handle pdev,
  */
 static inline void
 ol_txrx_ipa_uc_set_doorbell_paddr(ol_txrx_pdev_handle pdev,
-				  cdf_dma_addr_t ipa_tx_uc_doorbell_paddr,
-				  cdf_dma_addr_t ipa_rx_uc_doorbell_paddr)
+				  qdf_dma_addr_t ipa_tx_uc_doorbell_paddr,
+				  qdf_dma_addr_t ipa_rx_uc_doorbell_paddr)
 {
 	return;
 }

core/dp/ol/inc/ol_txrx_htt_api.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2015 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -41,7 +41,7 @@
 static inline uint16_t *ol_tx_msdu_id_storage(cdf_nbuf_t msdu)
 {
 	cdf_assert(cdf_nbuf_headroom(msdu) >= (sizeof(uint16_t) * 2 - 1));
-	return (uint16_t *) (((cdf_size_t) (cdf_nbuf_head(msdu) + 1)) & ~0x1);
+	return (uint16_t *) (((qdf_size_t) (cdf_nbuf_head(msdu) + 1)) & ~0x1);
 }
 
 /**

core/dp/ol/inc/ol_txrx_stats.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014-2015 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012, 2014-2016 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -50,7 +50,7 @@ struct ol_txrx_stats_elem {
 #define NUM_MAX_TSO_MSDUS_MASK (NUM_MAX_TSO_MSDUS - 1)
 
 struct ol_txrx_stats_tso_msdu {
-	struct cdf_tso_seg_t tso_segs[NUM_MAX_TSO_SEGS];
+	struct qdf_tso_seg_t tso_segs[NUM_MAX_TSO_SEGS];
 	uint32_t num_seg;
 	uint32_t tso_seg_idx;
 };

core/dp/txrx/ol_cfg.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2015 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -75,7 +75,7 @@ uint8_t ol_defrag_timeout_check(void)
  * Many of these should actually be determined dynamically instead.
  */
 
-ol_pdev_handle ol_pdev_cfg_attach(cdf_device_t osdev,
+ol_pdev_handle ol_pdev_cfg_attach(qdf_device_t osdev,
 				  struct txrx_pdev_cfg_param_t cfg_param)
 {
 	struct txrx_pdev_cfg_t *cfg_ctx;

core/dp/txrx/ol_osif_txrx_api.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014-2015 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011, 2014-2016 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -46,6 +46,6 @@
  * @param osdev
  */
 
-void ol_osif_ath_tasklet(cdf_device_t osdev);
+void ol_osif_ath_tasklet(qdf_device_t osdev);
 
 #endif /* _OL_OSIF_TXRX_API_H_ */

core/dp/txrx/ol_rx.c

@@ -27,7 +27,7 @@
 
 #include <cdf_nbuf.h>               /* cdf_nbuf_t, etc. */
 #include <cdf_util.h>               /* cdf_os_cpu_to_le64 */
-#include <cdf_types.h>              /* bool */
+#include <qdf_types.h>              /* bool */
 #include <cds_ieee80211_common.h>   /* ieee80211_frame */
 
 /* external API header files */
@@ -75,10 +75,10 @@ void ol_rx_data_process(struct ol_txrx_peer_t *peer,
 
 static void ol_rx_restore_handler(struct work_struct *htt_rx)
 {
-	CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO,
+	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO,
 		  "Enter: %s", __func__);
 	cnss_device_self_recovery();
-	CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO,
+	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO,
 		  "Exit: %s", __func__);
 }
 
@@ -91,7 +91,7 @@ void ol_rx_trigger_restore(htt_pdev_handle htt_pdev, cdf_nbuf_t head_msdu,
 
 	while (head_msdu) {
 		next = cdf_nbuf_next(head_msdu);
-		CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO,
+		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO,
 			  "freeing %p\n", head_msdu);
 		cdf_nbuf_free(head_msdu);
 		head_msdu = next;
@@ -1126,7 +1126,7 @@ DONE:
 					   type 0x8152 and push that to the
 					   front of the packet to indicate the
 					   RX stats header. */
-					eth_header.ether_type = CDF_SWAP_U16(
+					eth_header.ether_type = QDF_SWAP_U16(
 						ETHERTYPE_OCB_RX);
 					cdf_nbuf_push_head(msdu,
 							   sizeof(eth_header));
@@ -1248,7 +1248,7 @@ ol_rx_in_order_indication_handler(ol_txrx_pdev_handle pdev,
 	}
 
 #if defined(HELIUMPLUS_DEBUG)
-	cdf_print("%s %d: rx_ind_msg 0x%p peer_id %d tid %d is_offload %d\n",
+	qdf_print("%s %d: rx_ind_msg 0x%p peer_id %d tid %d is_offload %d\n",
 		  __func__, __LINE__, rx_ind_msg, peer_id, tid, is_offload);
 #endif
 

core/dp/txrx/ol_rx_defrag.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2015 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -31,7 +31,7 @@
 #include <cdf_nbuf.h>
 #include <cds_ieee80211_common.h>
 #include <cdf_util.h>
-#include <cdf_types.h>
+#include <qdf_types.h>
 #include <cdf_memory.h>
 #include <ol_txrx_internal.h>
 #include <ol_txrx_dbg.h>
@@ -125,9 +125,9 @@ ol_rx_reorder_flush_frag(htt_pdev_handle htt_pdev,
 			 struct ol_txrx_peer_t *peer,
 			 unsigned tid, int seq_num);
 
-static inline void xor_block(uint8_t *b, const uint8_t *a, cdf_size_t len)
+static inline void xor_block(uint8_t *b, const uint8_t *a, qdf_size_t len)
 {
-	cdf_size_t i;
+	qdf_size_t i;
 
 	for (i = 0; i < len; i++)
 		b[i] ^= a[i];

core/dp/txrx/ol_rx_fwd.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014-2015 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011, 2014-2016 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -118,7 +118,7 @@ static inline void ol_rx_fwd_to_tx(struct ol_txrx_vdev_t *vdev, cdf_nbuf_t msdu)
 	 * Map the netbuf, so it's accessible to the DMA that
 	 * sends it to the target.
 	 */
-	cdf_nbuf_map_single(pdev->osdev, msdu, CDF_DMA_TO_DEVICE);
+	cdf_nbuf_map_single(pdev->osdev, msdu, QDF_DMA_TO_DEVICE);
 	cdf_nbuf_set_next(msdu, NULL);  /* add NULL terminator */
 
 	msdu = OL_TX_LL(vdev, msdu);
@@ -129,7 +129,7 @@ static inline void ol_rx_fwd_to_tx(struct ol_txrx_vdev_t *vdev, cdf_nbuf_t msdu)
 		 * We could store the frame and try again later,
 		 * but the simplest solution is to discard the frames.
 		 */
-		cdf_nbuf_unmap_single(pdev->osdev, msdu, CDF_DMA_TO_DEVICE);
+		cdf_nbuf_unmap_single(pdev->osdev, msdu, QDF_DMA_TO_DEVICE);
 		cdf_nbuf_tx_free(msdu, NBUF_PKT_ERROR);
 	}
 }

core/dp/txrx/ol_rx_pn.c

@@ -329,12 +329,12 @@ void ol_rx_pn_trace_display(ol_txrx_pdev_handle pdev, int just_once)
 	}
 
 	i = start;
-	CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO,
+	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO,
 		  "                                 seq     PN");
-	CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO,
+	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO,
 		  "   count  idx    peer   tid uni  num    LSBs");
 	do {
-		CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO,
+		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO,
 			  "  %6lld %4d  %p %2d   %d %4d %8d",
 			  cnt, i,
 			  pdev->rx_pn_trace.data[i].peer,

core/dp/txrx/ol_rx_reorder.c

@@ -798,22 +798,22 @@ ol_rx_reorder_trace_display(ol_txrx_pdev_handle pdev, int just_once, int limit)
 	}
 
 	i = start;
-	CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO,
+	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO,
 		  "           log       array seq");
-	CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO,
+	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO,
 		  "   count   idx  tid   idx  num (LSBs)");
 	do {
 		uint16_t seq_num, reorder_idx;
 		seq_num = pdev->rx_reorder_trace.data[i].seq_num;
 		reorder_idx = pdev->rx_reorder_trace.data[i].reorder_idx;
 		if (seq_num < (1 << 14)) {
-			CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO,
+			CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO,
 				  "  %6lld  %4d  %3d  %4d  %4d (%d)",
 				  cnt, i, pdev->rx_reorder_trace.data[i].tid,
 				  reorder_idx, seq_num, seq_num & 63);
 		} else {
 			int err = TXRX_SEQ_NUM_ERR(seq_num);
-			CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO,
+			CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO,
 				  "  %6lld  %4d err %d (%d MPDUs)",
 				  cnt, i, err,
 				  pdev->rx_reorder_trace.data[i].num_mpdus);

core/dp/txrx/ol_rx_reorder_timeout.c

@@ -172,7 +172,7 @@ void ol_rx_reorder_timeout_init(struct ol_txrx_pdev_t *pdev)
 {
 	int i;
 
-	for (i = 0; i < CDF_ARRAY_SIZE(pdev->rx.reorder_timeout.access_cats);
+	for (i = 0; i < QDF_ARRAY_SIZE(pdev->rx.reorder_timeout.access_cats);
 		i++) {
 		struct ol_tx_reorder_cat_timeout_t *rx_reorder_timeout_ac;
 		rx_reorder_timeout_ac =
@@ -206,7 +206,7 @@ void ol_rx_reorder_timeout_cleanup(struct ol_txrx_pdev_t *pdev)
 {
 	int i;
 
-	for (i = 0; i < CDF_ARRAY_SIZE(pdev->rx.reorder_timeout.access_cats);
+	for (i = 0; i < QDF_ARRAY_SIZE(pdev->rx.reorder_timeout.access_cats);
 		i++) {
 		struct ol_tx_reorder_cat_timeout_t *rx_reorder_timeout_ac;
 		rx_reorder_timeout_ac =

core/dp/txrx/ol_tx.c

@@ -111,7 +111,7 @@ static inline uint8_t ol_tx_prepare_tso(ol_txrx_vdev_handle vdev,
 				struct cdf_tso_seg_elem_t *next_seg;
 				struct cdf_tso_seg_elem_t *free_seg =
 					msdu_info->tso_info.tso_seg_list;
-				cdf_print("TSO seg alloc failed!\n");
+				qdf_print("TSO seg alloc failed!\n");
 				while (free_seg) {
 					next_seg = free_seg->next;
 					ol_tso_free_segment(vdev->pdev,
@@ -145,14 +145,14 @@ static inline uint8_t ol_tx_prepare_tso(ol_txrx_vdev_handle vdev,
 cdf_nbuf_t ol_tx_send_data_frame(uint8_t sta_id, cdf_nbuf_t skb,
 				 uint8_t proto_type)
 {
-	void *cdf_ctx = cds_get_context(CDF_MODULE_ID_CDF_DEVICE);
-	struct ol_txrx_pdev_t *pdev = cds_get_context(CDF_MODULE_ID_TXRX);
+	void *cdf_ctx = cds_get_context(QDF_MODULE_ID_QDF_DEVICE);
+	struct ol_txrx_pdev_t *pdev = cds_get_context(QDF_MODULE_ID_TXRX);
 	struct ol_txrx_peer_t *peer;
 	cdf_nbuf_t ret;
 	QDF_STATUS status;
 
 	if (cdf_unlikely(!pdev)) {
-		CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_WARN,
+		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_WARN,
 			"%s:pdev is null", __func__);
 		return skb;
 	}
@@ -163,27 +163,27 @@ cdf_nbuf_t ol_tx_send_data_frame(uint8_t sta_id, cdf_nbuf_t skb,
 	}
 
 	if (sta_id >= WLAN_MAX_STA_COUNT) {
-		CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_WARN,
+		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_WARN,
 			"%s:Invalid sta id", __func__);
 		return skb;
 	}
 
 	peer = ol_txrx_peer_find_by_local_id(pdev, sta_id);
 	if (!peer) {
-		CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_WARN,
+		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_WARN,
 			"%s:Invalid peer", __func__);
 		return skb;
 	}
 
 	if (peer->state < ol_txrx_peer_state_conn) {
-		CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_WARN,
+		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_WARN,
 			"%s: station to be yet registered..dropping pkt", __func__);
 		return skb;
 	}
 
-	status = cdf_nbuf_map_single(cdf_ctx, skb, CDF_DMA_TO_DEVICE);
+	status = cdf_nbuf_map_single(cdf_ctx, skb, QDF_DMA_TO_DEVICE);
 	if (cdf_unlikely(status != QDF_STATUS_SUCCESS)) {
-		CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_WARN,
+		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_WARN,
 			"%s: nbuf map failed", __func__);
 		return skb;
 	}
@@ -199,9 +199,9 @@ cdf_nbuf_t ol_tx_send_data_frame(uint8_t sta_id, cdf_nbuf_t skb,
 	cdf_nbuf_set_next(skb, NULL);
 	ret = OL_TX_LL(peer->vdev, skb);
 	if (ret) {
-		CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_WARN,
+		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_WARN,
 			"%s: Failed to tx", __func__);
-		cdf_nbuf_unmap_single(cdf_ctx, ret, CDF_DMA_TO_DEVICE);
+		cdf_nbuf_unmap_single(cdf_ctx, ret, QDF_DMA_TO_DEVICE);
 		return ret;
 	}
 
@@ -219,7 +219,7 @@ cdf_nbuf_t ol_tx_send_data_frame(uint8_t sta_id, cdf_nbuf_t skb,
 cdf_nbuf_t ol_tx_send_ipa_data_frame(void *vdev,
 			cdf_nbuf_t skb)
 {
-	ol_txrx_pdev_handle pdev = cds_get_context(CDF_MODULE_ID_TXRX);
+	ol_txrx_pdev_handle pdev = cds_get_context(QDF_MODULE_ID_TXRX);
 	cdf_nbuf_t ret;
 
 	if (cdf_unlikely(!pdev)) {
@@ -270,7 +270,7 @@ cdf_nbuf_t ol_tx_ll(ol_txrx_vdev_handle vdev, cdf_nbuf_t msdu_list)
 		msdu_info.peer = NULL;
 
 		if (cdf_unlikely(ol_tx_prepare_tso(vdev, msdu, &msdu_info))) {
-			cdf_print("ol_tx_prepare_tso failed\n");
+			qdf_print("ol_tx_prepare_tso failed\n");
 			TXRX_STATS_MSDU_LIST_INCR(vdev->pdev,
 				 tx.dropped.host_reject, msdu);
 			return msdu;
@@ -460,7 +460,7 @@ ol_tx_prepare_ll_fast(struct ol_txrx_pdev_t *pdev,
 			 msdu_info->tso_info.curr_seg->seg);
 	} else {
 		for (i = 1; i < num_frags; i++) {
-			cdf_size_t frag_len;
+			qdf_size_t frag_len;
 			cdf_dma_addr_t frag_paddr;
 
 			frag_len = cdf_nbuf_get_frag_len(msdu, i);
@@ -469,7 +469,7 @@ ol_tx_prepare_ll_fast(struct ol_txrx_pdev_t *pdev,
 			htt_tx_desc_frag(pdev->htt_pdev, tx_desc->htt_frag_desc,
 					 i - 1, frag_paddr, frag_len);
 #if defined(HELIUMPLUS_DEBUG)
-			cdf_print("%s:%d: htt_fdesc=%p frag=%d frag_paddr=0x%0llx len=%zu",
+			qdf_print("%s:%d: htt_fdesc=%p frag=%d frag_paddr=0x%0llx len=%zu",
 				  __func__, __LINE__, tx_desc->htt_frag_desc,
 				  i-1, frag_paddr, frag_len);
 			dump_pkt(netbuf, frag_paddr, 64);
@@ -540,7 +540,7 @@ ol_tx_ll_fast(ol_txrx_vdev_handle vdev, cdf_nbuf_t msdu_list)
 		msdu_info.peer = NULL;
 
 		if (cdf_unlikely(ol_tx_prepare_tso(vdev, msdu, &msdu_info))) {
-			cdf_print("ol_tx_prepare_tso failed\n");
+			qdf_print("ol_tx_prepare_tso failed\n");
 			TXRX_STATS_MSDU_LIST_INCR(vdev->pdev,
 				 tx.dropped.host_reject, msdu);
 			return msdu;
@@ -732,7 +732,7 @@ static inline cdf_nbuf_t
 ol_tx_ll_wrapper(ol_txrx_vdev_handle vdev, cdf_nbuf_t msdu_list)
 {
 	struct hif_opaque_softc *hif_device =
-		(struct hif_opaque_softc *)cds_get_context(CDF_MODULE_ID_HIF);
+		(struct hif_opaque_softc *)cds_get_context(QDF_MODULE_ID_HIF);
 
 	if (cdf_likely(hif_device && hif_is_fastpath_mode_enabled(hif_device)))
 		msdu_list = ol_tx_ll_fast(vdev, msdu_list);
@@ -800,7 +800,7 @@ static void ol_tx_vdev_ll_pause_queue_send_base(struct ol_txrx_vdev_t *vdev)
 			 */
 			if (tx_msdu) {
 				cdf_nbuf_unmap(vdev->pdev->osdev, tx_msdu,
-					       CDF_DMA_TO_DEVICE);
+					       QDF_DMA_TO_DEVICE);
 				cdf_nbuf_tx_free(tx_msdu, NBUF_PKT_ERROR);
 			}
 		}
@@ -979,7 +979,7 @@ void ol_tx_pdev_ll_pause_queue_send_all(struct ol_txrx_pdev_t *pdev)
 				 */
 				if (tx_msdu) {
 					cdf_nbuf_unmap(pdev->osdev, tx_msdu,
-						       CDF_DMA_TO_DEVICE);
+						       QDF_DMA_TO_DEVICE);
 					cdf_nbuf_tx_free(tx_msdu,
 							 NBUF_PKT_ERROR);
 				}
@@ -1137,7 +1137,7 @@ bool parse_ocb_tx_header(cdf_nbuf_t msdu,
 
 	/* Check if TX control header is present */
 	eth_hdr_p = (struct ether_header *) cdf_nbuf_data(msdu);
-	if (eth_hdr_p->ether_type != CDF_SWAP_U16(ETHERTYPE_OCB_TX))
+	if (eth_hdr_p->ether_type != QDF_SWAP_U16(ETHERTYPE_OCB_TX))
 		/* TX control header is not present. Nothing to do.. */
 		return true;
 
@@ -1195,11 +1195,11 @@ void dump_frag_desc(char *msg, struct ol_tx_desc_t *tx_desc)
 	uint32_t                *frag_ptr_i_p;
 	int                     i;
 
-	cdf_print("OL TX Descriptor 0x%p msdu_id %d\n",
+	qdf_print("OL TX Descriptor 0x%p msdu_id %d\n",
 		 tx_desc, tx_desc->id);
-	cdf_print("HTT TX Descriptor vaddr: 0x%p paddr: 0x%llx",
+	qdf_print("HTT TX Descriptor vaddr: 0x%p paddr: 0x%llx",
 		 tx_desc->htt_tx_desc, tx_desc->htt_tx_desc_paddr);
-	cdf_print("%s %d: Fragment Descriptor 0x%p (paddr=0x%llx)",
+	qdf_print("%s %d: Fragment Descriptor 0x%p (paddr=0x%llx)",
 		 __func__, __LINE__, tx_desc->htt_frag_desc, tx_desc->htt_frag_desc_paddr);
 
 	/* it looks from htt_tx_desc_frag() that tx_desc->htt_frag_desc
@@ -1287,7 +1287,7 @@ ol_txrx_mgmt_send(ol_txrx_vdev_handle vdev,
 
 	tx_msdu_info.peer = NULL;
 
-	cdf_nbuf_map_single(pdev->osdev, tx_mgmt_frm, CDF_DMA_TO_DEVICE);
+	cdf_nbuf_map_single(pdev->osdev, tx_mgmt_frm, QDF_DMA_TO_DEVICE);
 	/* For LL tx_comp_req is not used so initialized to 0 */
 	tx_msdu_info.htt.action.tx_comp_req = 0;
 	tx_desc = ol_tx_desc_ll(pdev, vdev, tx_mgmt_frm, &tx_msdu_info);
@@ -1320,7 +1320,7 @@ ol_txrx_mgmt_send(ol_txrx_vdev_handle vdev,
 	}
 	if (!tx_desc) {
 		cdf_nbuf_unmap_single(pdev->osdev, tx_mgmt_frm,
-				      CDF_DMA_TO_DEVICE);
+				      QDF_DMA_TO_DEVICE);
 		return -EINVAL;       /* can't accept the tx mgmt frame */
 	}
 	TXRX_STATS_MSDU_INCR(pdev, tx.mgmt, tx_mgmt_frm);

core/dp/txrx/ol_tx_desc.c

@@ -233,7 +233,7 @@ void ol_tx_desc_free(struct ol_txrx_pdev_t *pdev, struct ol_tx_desc_t *tx_desc)
 
 	if (tx_desc->pkt_type == ol_tx_frm_tso) {
 		if (cdf_unlikely(tx_desc->tso_desc == NULL)) {
-			cdf_print("%s %d TSO desc is NULL!\n",
+			qdf_print("%s %d TSO desc is NULL!\n",
 				 __func__, __LINE__);
 			cdf_assert(0);
 		} else {
@@ -262,7 +262,7 @@ void ol_tx_desc_free(struct ol_txrx_pdev_t *pdev, struct ol_tx_desc_t *tx_desc)
 #if defined(FEATURE_TSO)
 	if (tx_desc->pkt_type == ol_tx_frm_tso) {
 		if (cdf_unlikely(tx_desc->tso_desc == NULL))
-			cdf_print("%s %d TSO desc is NULL!\n",
+			qdf_print("%s %d TSO desc is NULL!\n",
 				 __func__, __LINE__);
 		else
 			ol_tso_free_segment(pdev, tx_desc->tso_desc);
@@ -286,7 +286,7 @@ void ol_tx_desc_free(struct ol_txrx_pdev_t *pdev, struct ol_tx_desc_t *tx_desc)
 		if (pool->avail_desc == pool->flow_pool_size) {
 			cdf_spin_unlock_bh(&pool->flow_pool_lock);
 			ol_tx_free_invalid_flow_pool(pool);
-			cdf_print("%s %d pool is INVALID State!!\n",
+			qdf_print("%s %d pool is INVALID State!!\n",
 				 __func__, __LINE__);
 			return;
 		}
@@ -294,7 +294,7 @@ void ol_tx_desc_free(struct ol_txrx_pdev_t *pdev, struct ol_tx_desc_t *tx_desc)
 	case FLOW_POOL_ACTIVE_UNPAUSED:
 		break;
 	default:
-		cdf_print("%s %d pool is INACTIVE State!!\n",
+		qdf_print("%s %d pool is INACTIVE State!!\n",
 				 __func__, __LINE__);
 		break;
 	};
@@ -309,7 +309,7 @@ dump_frag_desc(char *msg, struct ol_tx_desc_t *tx_desc);
 void
 dump_pkt(cdf_nbuf_t nbuf, cdf_dma_addr_t nbuf_paddr, int len)
 {
-	cdf_print("%s: Pkt: VA 0x%p PA 0x%llx len %d\n", __func__,
+	qdf_print("%s: Pkt: VA 0x%p PA 0x%llx len %d\n", __func__,
 		  cdf_nbuf_data(nbuf), nbuf_paddr, len);
 	print_hex_dump(KERN_DEBUG, "Pkt:   ", DUMP_PREFIX_ADDRESS, 16, 4,
 		       cdf_nbuf_data(nbuf), len, true);
@@ -404,7 +404,7 @@ struct ol_tx_desc_t *ol_tx_desc_ll(struct ol_txrx_pdev_t *pdev,
 			 msdu_info->tso_info.curr_seg->seg);
 	} else {
 		for (i = 1; i < num_frags; i++) {
-			cdf_size_t frag_len;
+			qdf_size_t frag_len;
 			cdf_dma_addr_t frag_paddr;
 #ifdef HELIUMPLUS_DEBUG
 			void *frag_vaddr;
@@ -416,7 +416,7 @@ struct ol_tx_desc_t *ol_tx_desc_ll(struct ol_txrx_pdev_t *pdev,
 			htt_tx_desc_frag(pdev->htt_pdev, tx_desc->htt_frag_desc, i - 1,
 				 frag_paddr, frag_len);
 #if defined(HELIUMPLUS_DEBUG)
-			cdf_print("%s:%d: htt_fdesc=%p frag=%d frag_vaddr=0x%p frag_paddr=0x%llx len=%zu\n",
+			qdf_print("%s:%d: htt_fdesc=%p frag=%d frag_vaddr=0x%p frag_paddr=0x%llx len=%zu\n",
 				  __func__, __LINE__, tx_desc->htt_frag_desc,
 				  i-1, frag_vaddr, frag_paddr, frag_len);
 			dump_pkt(netbuf, frag_paddr, 64);
@@ -448,7 +448,7 @@ void ol_tx_desc_frame_list_free(struct ol_txrx_pdev_t *pdev,
 		/* restore original hdr offset */
 		OL_TX_RESTORE_HDR(tx_desc, msdu);
 #endif
-		cdf_nbuf_unmap(pdev->osdev, msdu, CDF_DMA_TO_DEVICE);
+		cdf_nbuf_unmap(pdev->osdev, msdu, QDF_DMA_TO_DEVICE);
 		/* free the tx desc */
 		ol_tx_desc_free(pdev, tx_desc);
 		/* link the netbuf into a list to free as a batch */
@@ -484,7 +484,7 @@ void ol_tx_desc_frame_free_nonstd(struct ol_txrx_pdev_t *pdev,
 		}
 		/* let the code below unmap and free the frame */
 	}
-	cdf_nbuf_unmap(pdev->osdev, tx_desc->netbuf, CDF_DMA_TO_DEVICE);
+	cdf_nbuf_unmap(pdev->osdev, tx_desc->netbuf, QDF_DMA_TO_DEVICE);
 	/* check the frame type to see what kind of special steps are needed */
 	if ((tx_desc->pkt_type >= OL_TXRX_MGMT_TYPE_BASE) &&
 		   (tx_desc->pkt_type != 0xff)) {
@@ -502,7 +502,7 @@ void ol_tx_desc_frame_free_nonstd(struct ol_txrx_pdev_t *pdev,
 		 * table pointer needs to be reset.
 		 */
 #if defined(HELIUMPLUS_DEBUG)
-		cdf_print("%s %d: Frag Descriptor Reset [%d] to 0x%x\n",
+		qdf_print("%s %d: Frag Descriptor Reset [%d] to 0x%x\n",
 			  __func__, __LINE__, tx_desc->id,
 			  frag_desc_paddr);
 #endif /* HELIUMPLUS_DEBUG */

core/dp/txrx/ol_tx_queue.c

@@ -39,7 +39,7 @@
 #include <ol_tx.h>              /* ol_tx_vdev_ll_pause_queue_send */
 #include <ol_tx_queue.h>
 #include <ol_txrx_dbg.h>        /* ENABLE_TX_QUEUE_LOG */
-#include <cdf_types.h>          /* bool */
+#include <qdf_types.h>          /* bool */
 
 #if defined(QCA_LL_LEGACY_TX_FLOW_CONTROL)
 
@@ -96,7 +96,7 @@ void ol_txrx_vdev_flush(ol_txrx_vdev_handle vdev)
 		cdf_nbuf_set_next(vdev->ll_pause.txq.head, NULL);
 		cdf_nbuf_unmap(vdev->pdev->osdev,
 			       vdev->ll_pause.txq.head,
-			       CDF_DMA_TO_DEVICE);
+			       QDF_DMA_TO_DEVICE);
 		cdf_nbuf_tx_free(vdev->ll_pause.txq.head,
 				 NBUF_PKT_ERROR);
 		vdev->ll_pause.txq.head = next;
@@ -414,13 +414,13 @@ void ol_tx_throttle_init(struct ol_txrx_pdev_t *pdev)
 	qdf_timer_init(pdev->osdev,
 			       &pdev->tx_throttle.phase_timer,
 			       ol_tx_pdev_throttle_phase_timer, pdev,
-			       CDF_TIMER_TYPE_SW);
+			       QDF_TIMER_TYPE_SW);
 
 #ifdef QCA_LL_LEGACY_TX_FLOW_CONTROL
 	qdf_timer_init(pdev->osdev,
 			       &pdev->tx_throttle.tx_timer,
 			       ol_tx_pdev_throttle_tx_timer, pdev,
-			       CDF_TIMER_TYPE_SW);
+			       QDF_TIMER_TYPE_SW);
 #endif
 
 	pdev->tx_throttle.tx_threshold = THROTTLE_TX_THRESHOLD;

core/dp/txrx/ol_tx_queue.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -34,7 +34,7 @@
 
 #include <cdf_nbuf.h>           /* cdf_nbuf_t */
 #include <ol_txrx_types.h>      /* ol_txrx_vdev_t, etc. */
-#include <cdf_types.h>          /* bool */
+#include <qdf_types.h>          /* bool */
 
 /*--- function prototypes for optional queue log feature --------------------*/
 #if defined(ENABLE_TX_QUEUE_LOG)

core/dp/txrx/ol_tx_send.c

@@ -363,7 +363,7 @@ ol_tx_delay_compute(struct ol_txrx_pdev_t *pdev,
 		qdf_atomic_init(&(_tx_desc)->ref_cnt);			\
 		/* restore orginal hdr offset */			\
 		OL_TX_RESTORE_HDR((_tx_desc), (_netbuf));		\
-		cdf_nbuf_unmap((_pdev)->osdev, (_netbuf), CDF_DMA_TO_DEVICE); \
+		cdf_nbuf_unmap((_pdev)->osdev, (_netbuf), QDF_DMA_TO_DEVICE); \
 		cdf_nbuf_free((_netbuf));				\
 		((union ol_tx_desc_list_elem_t *)(_tx_desc))->next =	\
 			(_lcl_freelist);				\
@@ -379,7 +379,7 @@ ol_tx_delay_compute(struct ol_txrx_pdev_t *pdev,
 	do {								\
 		/* restore orginal hdr offset */			\
 		OL_TX_RESTORE_HDR((_tx_desc), (_netbuf));		\
-		cdf_nbuf_unmap((_pdev)->osdev, (_netbuf), CDF_DMA_TO_DEVICE); \
+		cdf_nbuf_unmap((_pdev)->osdev, (_netbuf), QDF_DMA_TO_DEVICE); \
 		cdf_nbuf_free((_netbuf));				\
 		((union ol_tx_desc_list_elem_t *)(_tx_desc))->next =	\
 			(_lcl_freelist);				\
@@ -776,7 +776,7 @@ static inline uint8_t *ol_tx_dest_addr_find(struct ol_txrx_pdev_t *pdev,
 	} else if (pdev->frame_format == wlan_frm_fmt_802_3) {
 		hdr_ptr = datap;
 	} else {
-		CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
 			  "Invalid standard frame type: %d",
 			  pdev->frame_format);
 		cdf_assert(0);

core/dp/txrx/ol_txrx.c

@@ -29,7 +29,7 @@
 /* header files for OS primitives */
 #include <osdep.h>              /* uint32_t, etc. */
 #include <cdf_memory.h>         /* cdf_mem_malloc,free */
-#include <cdf_types.h>          /* cdf_device_t, cdf_print */
+#include <qdf_types.h>          /* qdf_device_t, qdf_print */
 #include <cdf_lock.h>           /* cdf_spinlock */
 #include <qdf_atomic.h>         /* qdf_atomic_read */
 
@@ -89,9 +89,9 @@
  */
 void ol_tx_set_is_mgmt_over_wmi_enabled(uint8_t value)
 {
-	struct ol_txrx_pdev_t *pdev = cds_get_context(CDF_MODULE_ID_TXRX);
+	struct ol_txrx_pdev_t *pdev = cds_get_context(QDF_MODULE_ID_TXRX);
 	if (!pdev) {
-		cdf_print("%s: pdev is NULL\n", __func__);
+		qdf_print("%s: pdev is NULL\n", __func__);
 		return;
 	}
 	pdev->is_mgmt_over_wmi_enabled = value;
@@ -105,9 +105,9 @@ void ol_tx_set_is_mgmt_over_wmi_enabled(uint8_t value)
  */
 uint8_t ol_tx_get_is_mgmt_over_wmi_enabled(void)
 {
-	struct ol_txrx_pdev_t *pdev = cds_get_context(CDF_MODULE_ID_TXRX);
+	struct ol_txrx_pdev_t *pdev = cds_get_context(QDF_MODULE_ID_TXRX);
 	if (!pdev) {
-		cdf_print("%s: pdev is NULL\n", __func__);
+		qdf_print("%s: pdev is NULL\n", __func__);
 		return 0;
 	}
 	return pdev->is_mgmt_over_wmi_enabled;
@@ -133,7 +133,7 @@ ol_txrx_find_peer_by_addr_and_vdev(ol_txrx_pdev_handle pdev,
 QDF_STATUS ol_txrx_get_vdevid(struct ol_txrx_peer_t *peer, uint8_t *vdev_id)
 {
 	if (!peer) {
-		CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
 				  "peer argument is null!!");
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -148,21 +148,21 @@ void *ol_txrx_get_vdev_by_sta_id(uint8_t sta_id)
 	ol_txrx_pdev_handle pdev = NULL;
 
 	if (sta_id >= WLAN_MAX_STA_COUNT) {
-		CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
 			  "Invalid sta id passed");
 		return NULL;
 	}
 
-	pdev = cds_get_context(CDF_MODULE_ID_TXRX);
+	pdev = cds_get_context(QDF_MODULE_ID_TXRX);
 	if (!pdev) {
-		CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
 			      "PDEV not found for sta_id [%d]", sta_id);
 		return NULL;
 	}
 
 	peer = ol_txrx_peer_find_by_local_id(pdev, sta_id);
 	if (!peer) {
-		CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
 			      "PEER [%d] not found", sta_id);
 		return NULL;
 	}
@@ -311,9 +311,9 @@ static inline void setup_fastpath_ce_handles(struct hif_opaque_softc *osc,
  */
 void ol_tx_set_desc_global_pool_size(uint32_t num_msdu_desc)
 {
-	struct ol_txrx_pdev_t *pdev = cds_get_context(CDF_MODULE_ID_TXRX);
+	struct ol_txrx_pdev_t *pdev = cds_get_context(QDF_MODULE_ID_TXRX);
 	if (!pdev) {
-		cdf_print("%s: pdev is NULL\n", __func__);
+		qdf_print("%s: pdev is NULL\n", __func__);
 		return;
 	}
 	pdev->num_msdu_desc = num_msdu_desc;
@@ -399,7 +399,7 @@ uint32_t ol_tx_get_total_free_desc(struct ol_txrx_pdev_t *pdev)
  */
 ol_txrx_pdev_handle
 ol_txrx_pdev_alloc(ol_pdev_handle ctrl_pdev,
-		    HTC_HANDLE htc_pdev, cdf_device_t osdev)
+		    HTC_HANDLE htc_pdev, qdf_device_t osdev)
 {
 	struct ol_txrx_pdev_t *pdev;
 	int i;
@@ -500,7 +500,7 @@ ol_txrx_pdev_attach(ol_txrx_pdev_handle pdev)
 	uint16_t fail_idx = 0;
 	int ret = 0;
 	uint16_t desc_pool_size;
-	struct hif_opaque_softc *osc =  cds_get_context(CDF_MODULE_ID_HIF);
+	struct hif_opaque_softc *osc =  cds_get_context(QDF_MODULE_ID_HIF);
 
 	uint16_t desc_element_size = sizeof(union ol_tx_desc_list_elem_t);
 	union ol_tx_desc_list_elem_t *c_element;
@@ -555,7 +555,7 @@ ol_txrx_pdev_attach(ol_txrx_pdev_handle pdev)
 		pdev->tx_desc.desc_reserved_size, desc_pool_size, 0, true);
 	if ((0 == pdev->tx_desc.desc_pages.num_pages) ||
 		(NULL == pdev->tx_desc.desc_pages.cacheable_pages)) {
-		CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
 			"Page alloc fail");
 		goto page_alloc_fail;
 	}
@@ -568,7 +568,7 @@ ol_txrx_pdev_attach(ol_txrx_pdev_handle pdev)
 		desc_per_page = desc_per_page >> 1;
 	}
 	pdev->tx_desc.page_divider = (sig_bit - 1);
-	CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
 		"page_divider 0x%x, offset_filter 0x%x num elem %d, ol desc num page %d, ol desc per page %d",
 		pdev->tx_desc.page_divider, pdev->tx_desc.offset_filter,
 		desc_pool_size, pdev->tx_desc.desc_pages.num_pages,
@@ -588,8 +588,8 @@ ol_txrx_pdev_attach(ol_txrx_pdev_handle pdev)
 	for (i = 0; i < desc_pool_size; i++) {
 		void *htt_tx_desc;
 		void *htt_frag_desc = NULL;
-		cdf_dma_addr_t frag_paddr = 0;
-		cdf_dma_addr_t paddr;
+		qdf_dma_addr_t frag_paddr = 0;
+		qdf_dma_addr_t paddr;
 
 		if (i == (desc_pool_size - 1))
 			c_element->next = NULL;
@@ -599,7 +599,7 @@ ol_txrx_pdev_attach(ol_txrx_pdev_handle pdev)
 
 		htt_tx_desc = htt_tx_desc_alloc(pdev->htt_pdev, &paddr, i);
 		if (!htt_tx_desc) {
-			CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_FATAL,
+			CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_FATAL,
 				  "%s: failed to alloc HTT tx desc (%d of %d)",
 				__func__, i, desc_pool_size);
 			fail_idx = i;
@@ -611,7 +611,7 @@ ol_txrx_pdev_attach(ol_txrx_pdev_handle pdev)
 		ret = htt_tx_frag_alloc(pdev->htt_pdev,
 					i, &frag_paddr, &htt_frag_desc);
 		if (ret) {
-			CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+			CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
 				"%s: failed to alloc HTT frag dsc (%d/%d)",
 				__func__, i, desc_pool_size);
 			/* Is there a leak here, is this handling correct? */
@@ -625,7 +625,7 @@ ol_txrx_pdev_attach(ol_txrx_pdev_handle pdev)
 			c_element->tx_desc.htt_frag_desc = htt_frag_desc;
 			c_element->tx_desc.htt_frag_desc_paddr = frag_paddr;
 		}
-		CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
+		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
 			"%s:%d - %d FRAG VA 0x%p FRAG PA 0x%llx",
 			__func__, __LINE__, i,
 			c_element->tx_desc.htt_frag_desc,
@@ -660,7 +660,7 @@ ol_txrx_pdev_attach(ol_txrx_pdev_handle pdev)
 		else
 			pdev->htt_pkt_type = htt_pkt_type_ethernet;
 	} else {
-		CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
 			  "%s Invalid standard frame type: %d",
 			  __func__, pdev->frame_format);
 		goto control_init_fail;
@@ -727,7 +727,7 @@ ol_txrx_pdev_attach(ol_txrx_pdev_handle pdev)
 			? 0 : 1;
 		break;
 	default:
-		CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
 			  "Invalid std frame type; [en/de]cap: f:%x t:%x r:%x",
 			  pdev->frame_format,
 			  pdev->target_tx_tran_caps, pdev->target_rx_tran_caps);
@@ -777,7 +777,7 @@ ol_txrx_pdev_attach(ol_txrx_pdev_handle pdev)
 			} else {
 #define TRACESTR01 "invalid config: if rx PN check is on the host,"\
 "rx->tx forwarding check needs to also be on the host"
-				CDF_TRACE(CDF_MODULE_ID_TXRX,
+				CDF_TRACE(QDF_MODULE_ID_TXRX,
 					  CDF_TRACE_LEVEL_ERROR,
 					  "%s: %s", __func__, TRACESTR01);
 #undef TRACESTR01
@@ -961,7 +961,7 @@ A_STATUS ol_txrx_pdev_attach_target(ol_txrx_pdev_handle pdev)
 void ol_txrx_pdev_detach(ol_txrx_pdev_handle pdev, int force)
 {
 	int i;
-	struct hif_opaque_softc *osc =  cds_get_context(CDF_MODULE_ID_HIF);
+	struct hif_opaque_softc *osc =  cds_get_context(QDF_MODULE_ID_HIF);
 
 	/*checking to ensure txrx pdev structure is not NULL */
 	if (!pdev) {
@@ -1111,7 +1111,7 @@ ol_txrx_vdev_attach(ol_txrx_pdev_handle pdev,
 	qdf_timer_init(pdev->osdev,
 			       &vdev->ll_pause.timer,
 			       ol_tx_vdev_ll_pause_queue_send, vdev,
-			       CDF_TIMER_TYPE_SW);
+			       QDF_TIMER_TYPE_SW);
 	qdf_atomic_init(&vdev->os_q_paused);
 	qdf_atomic_set(&vdev->os_q_paused, 0);
 	vdev->tx_fl_lwm = 0;
@@ -1622,7 +1622,7 @@ ol_txrx_peer_update(ol_txrx_vdev_handle vdev,
 	}
 	default:
 	{
-		CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
 			  "ERROR: unknown param %d in %s", select,
 			  __func__);
 		break;
@@ -1892,7 +1892,7 @@ static void ol_txrx_dump_tx_desc(ol_txrx_pdev_handle pdev_handle)
  */
 QDF_STATUS ol_txrx_wait_for_pending_tx(int timeout)
 {
-	ol_txrx_pdev_handle txrx_pdev = cds_get_context(CDF_MODULE_ID_TXRX);
+	ol_txrx_pdev_handle txrx_pdev = cds_get_context(QDF_MODULE_ID_TXRX);
 
 	if (txrx_pdev == NULL) {
 		TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
@@ -1976,11 +1976,11 @@ unsigned g_txrx_print_level = TXRX_PRINT_LEVEL_ERR;     /* default */
 void ol_txrx_print_level_set(unsigned level)
 {
 #ifndef TXRX_PRINT_ENABLE
-	CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_FATAL,
+	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_FATAL,
 		  "The driver is compiled without TXRX prints enabled.\n"
 		  "To enable them, recompile with TXRX_PRINT_ENABLE defined");
 #else
-	CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO,
+	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO,
 		  "TXRX printout level changed from %d to %d",
 		  g_txrx_print_level, level);
 	g_txrx_print_level = level;
@@ -2263,7 +2263,7 @@ int ol_txrx_debug(ol_txrx_vdev_handle vdev, int debug_specs)
 #if defined(TXRX_DEBUG_LEVEL) && TXRX_DEBUG_LEVEL > 5
 		ol_txrx_pdev_display(vdev->pdev, 0);
 #else
-		CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_FATAL,
+		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_FATAL,
 			  "The pdev,vdev,peer display functions are disabled.\n"
 			  "To enable them, recompile with TXRX_DEBUG_LEVEL > 5");
 #endif
@@ -2275,7 +2275,7 @@ int ol_txrx_debug(ol_txrx_vdev_handle vdev, int debug_specs)
 #if defined(ENABLE_TXRX_PROT_ANALYZE)
 		ol_txrx_prot_ans_display(vdev->pdev);
 #else
-		CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_FATAL,
+		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_FATAL,
 			  "txrx protocol analysis is disabled.\n"
 			  "To enable it, recompile with "
 			  "ENABLE_TXRX_PROT_ANALYZE defined");
@@ -2285,7 +2285,7 @@ int ol_txrx_debug(ol_txrx_vdev_handle vdev, int debug_specs)
 #if defined(ENABLE_RX_REORDER_TRACE)
 		ol_rx_reorder_trace_display(vdev->pdev, 0, 0);
 #else
-		CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_FATAL,
+		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_FATAL,
 			  "rx reorder seq num trace is disabled.\n"
 			  "To enable it, recompile with "
 			  "ENABLE_RX_REORDER_TRACE defined");
@@ -2308,20 +2308,20 @@ void ol_txrx_pdev_display(ol_txrx_pdev_handle pdev, int indent)
 {
 	struct ol_txrx_vdev_t *vdev;
 
-	CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
+	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
 		  "%*s%s:\n", indent, " ", "txrx pdev");
-	CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
+	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
 		  "%*spdev object: %p", indent + 4, " ", pdev);
-	CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
+	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
 		  "%*svdev list:", indent + 4, " ");
 	TAILQ_FOREACH(vdev, &pdev->vdev_list, vdev_list_elem) {
 		ol_txrx_vdev_display(vdev, indent + 8);
 	}
 	ol_txrx_peer_find_display(pdev, indent + 4);
-	CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
+	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
 		  "%*stx desc pool: %d elems @ %p", indent + 4, " ",
 		  pdev->tx_desc.pool_size, pdev->tx_desc.array);
-	CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, " ");
+	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, " ");
 	htt_display(pdev->htt_pdev, indent);
 }
 
@@ -2329,17 +2329,17 @@ void ol_txrx_vdev_display(ol_txrx_vdev_handle vdev, int indent)
 {
 	struct ol_txrx_peer_t *peer;
 
-	CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
+	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
 		  "%*stxrx vdev: %p\n", indent, " ", vdev);
-	CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
+	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
 		  "%*sID: %d\n", indent + 4, " ", vdev->vdev_id);
-	CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
+	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
 		  "%*sMAC addr: %d:%d:%d:%d:%d:%d",
 		  indent + 4, " ",
 		  vdev->mac_addr.raw[0], vdev->mac_addr.raw[1],
 		  vdev->mac_addr.raw[2], vdev->mac_addr.raw[3],
 		  vdev->mac_addr.raw[4], vdev->mac_addr.raw[5]);
-	CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
+	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
 		  "%*speer list:", indent + 4, " ");
 	TAILQ_FOREACH(peer, &vdev->peer_list, peer_list_elem) {
 		ol_txrx_peer_display(peer, indent + 8);
@@ -2350,11 +2350,11 @@ void ol_txrx_peer_display(ol_txrx_peer_handle peer, int indent)
 {
 	int i;
 
-	CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
+	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
 		  "%*stxrx peer: %p", indent, " ", peer);
 	for (i = 0; i < MAX_NUM_PEER_ID_PER_PEER; i++) {
 		if (peer->peer_ids[i] != HTT_INVALID_PEER) {
-			CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
+			CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
 				  "%*sID: %d", indent + 4, " ",
 				  peer->peer_ids[i]);
 		}
@@ -2368,13 +2368,13 @@ void ol_txrx_stats_display_tso(ol_txrx_pdev_handle pdev)
 	int msdu_idx;
 	int seg_idx;
 
-	CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
 		"TSO pkts %lld, bytes %lld\n",
 		pdev->stats.pub.tx.tso.tso_pkts.pkts,
 		pdev->stats.pub.tx.tso.tso_pkts.bytes);
 
 	for (msdu_idx = 0; msdu_idx < NUM_MAX_TSO_MSDUS; msdu_idx++) {
-		CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
 			"curr msdu idx: %d curr seg idx: %d num segs %d\n",
 			TXRX_STATS_TSO_MSDU_IDX(pdev),
 			TXRX_STATS_TSO_SEG_IDX(pdev),
@@ -2383,16 +2383,16 @@ void ol_txrx_stats_display_tso(ol_txrx_pdev_handle pdev)
 			 ((seg_idx < TXRX_STATS_TSO_MSDU_NUM_SEG(pdev, msdu_idx)) &&
 			  (seg_idx < NUM_MAX_TSO_SEGS));
 			 seg_idx++) {
-			struct cdf_tso_seg_t tso_seg =
+			struct qdf_tso_seg_t tso_seg =
 				 TXRX_STATS_TSO_SEG(pdev, msdu_idx, seg_idx);
 
-			CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+			CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
 				 "msdu idx: %d seg idx: %d\n",
 				 msdu_idx, seg_idx);
-			CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+			CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
 				 "tso_enable: %d\n",
 				 tso_seg.tso_flags.tso_enable);
-			CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+			CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
 				 "fin %d syn %d rst %d psh %d ack %d\n"
 				 "urg %d ece %d cwr %d ns %d\n",
 				 tso_seg.tso_flags.fin, tso_seg.tso_flags.syn,
@@ -2400,7 +2400,7 @@ void ol_txrx_stats_display_tso(ol_txrx_pdev_handle pdev)
 				 tso_seg.tso_flags.ack, tso_seg.tso_flags.urg,
 				 tso_seg.tso_flags.ece, tso_seg.tso_flags.cwr,
 				 tso_seg.tso_flags.ns);
-			CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+			CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
 				 "tcp_seq_num: 0x%x ip_id: %d\n",
 				 tso_seg.tso_flags.tcp_seq_num,
 				 tso_seg.tso_flags.ip_id);
@@ -2410,7 +2410,7 @@ void ol_txrx_stats_display_tso(ol_txrx_pdev_handle pdev)
 #else
 void ol_txrx_stats_display_tso(ol_txrx_pdev_handle pdev)
 {
-	CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
 	 "TSO is not supported\n");
 }
 #endif
@@ -2430,7 +2430,7 @@ ol_txrx_stats(uint8_t vdev_id, char *buffer, unsigned buf_len)
 
 	ol_txrx_vdev_handle vdev = ol_txrx_get_vdev_from_vdev_id(vdev_id);
 	if (!vdev) {
-		CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
 			"%s: vdev is NULL", __func__);
 		snprintf(buffer, buf_len, "vdev not found");
 		return len;
@@ -2453,8 +2453,8 @@ ol_txrx_stats(uint8_t vdev_id, char *buffer, unsigned buf_len)
 
 void ol_txrx_stats_display(ol_txrx_pdev_handle pdev)
 {
-	CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, "txrx stats:");
-	CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, "txrx stats:");
+	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
 		  "  tx: sent %lld msdus (%lld B), "
 		  "      rejected %lld (%lld B), dropped %lld (%lld B)",
 		  pdev->stats.pub.tx.delivered.pkts,
@@ -2467,7 +2467,7 @@ void ol_txrx_stats_display(ol_txrx_pdev_handle pdev)
 		  pdev->stats.pub.tx.dropped.download_fail.bytes
 		  + pdev->stats.pub.tx.dropped.target_discard.bytes
 		  + pdev->stats.pub.tx.dropped.no_ack.bytes);
-	CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
 		  "    download fail: %lld (%lld B), "
 		  "target discard: %lld (%lld B), "
 		  "no ack: %lld (%lld B)",
@@ -2477,7 +2477,7 @@ void ol_txrx_stats_display(ol_txrx_pdev_handle pdev)
 		  pdev->stats.pub.tx.dropped.target_discard.bytes,
 		  pdev->stats.pub.tx.dropped.no_ack.pkts,
 		  pdev->stats.pub.tx.dropped.no_ack.bytes);
-	CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
 		  "Tx completion per interrupt:\n"
 		  "Single Packet  %d\n"
 		  " 2-10 Packets  %d\n"
@@ -2495,7 +2495,7 @@ void ol_txrx_stats_display(ol_txrx_pdev_handle pdev)
 		  pdev->stats.pub.tx.comp_histogram.pkts_41_50,
 		  pdev->stats.pub.tx.comp_histogram.pkts_51_60,
 		  pdev->stats.pub.tx.comp_histogram.pkts_61_plus);
-	CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
 		  "  rx: %lld ppdus, %lld mpdus, %lld msdus, %lld bytes, %lld errs",
 		  pdev->stats.priv.rx.normal.ppdus,
 		  pdev->stats.priv.rx.normal.mpdus,
@@ -2503,7 +2503,7 @@ void ol_txrx_stats_display(ol_txrx_pdev_handle pdev)
 		  pdev->stats.pub.rx.delivered.bytes,
 		  pdev->stats.priv.rx.err.mpdu_bad);
 
-	CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
 		  "  fwd to stack %d, fwd to fw %d, fwd to stack & fw  %d\n",
 		  pdev->stats.pub.rx.intra_bss_fwd.packets_stack,
 		  pdev->stats.pub.rx.intra_bss_fwd.packets_fwd,
@@ -2569,14 +2569,14 @@ static ol_txrx_vdev_handle ol_txrx_get_vdev_from_sta_id(uint8_t sta_id)
 	ol_txrx_pdev_handle pdev = NULL;
 
 	if (sta_id >= WLAN_MAX_STA_COUNT) {
-		CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
 			"Invalid sta id passed");
 		return NULL;
 	}
 
-	pdev = cds_get_context(CDF_MODULE_ID_TXRX);
+	pdev = cds_get_context(QDF_MODULE_ID_TXRX);
 	if (!pdev) {
-		CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
 			"PDEV not found for sta_id [%d]", sta_id);
 		return NULL;
 	}
@@ -2584,7 +2584,7 @@ static ol_txrx_vdev_handle ol_txrx_get_vdev_from_sta_id(uint8_t sta_id)
 	peer = ol_txrx_peer_find_by_local_id(pdev, sta_id);
 
 	if (!peer) {
-		CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
 			"PEER [%d] not found", sta_id);
 		return NULL;
 	}
@@ -2606,7 +2606,7 @@ int ol_txrx_register_tx_flow_control (uint8_t vdev_id,
 {
 	ol_txrx_vdev_handle vdev = ol_txrx_get_vdev_from_vdev_id(vdev_id);
 	if (NULL == vdev) {
-		CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
 			"%s: Invalid vdev_id %d", __func__, vdev_id);
 		return -EINVAL;
 	}
@@ -2628,7 +2628,7 @@ int ol_txrx_deregister_tx_flow_control_cb(uint8_t vdev_id)
 {
 	ol_txrx_vdev_handle vdev = ol_txrx_get_vdev_from_vdev_id(vdev_id);
 	if (NULL == vdev) {
-		CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
 				"%s: Invalid vdev_id", __func__);
 		return -EINVAL;
 	}
@@ -2655,7 +2655,7 @@ ol_txrx_get_tx_resource(uint8_t sta_id,
 {
 	ol_txrx_vdev_handle vdev = ol_txrx_get_vdev_from_sta_id(sta_id);
 	if (NULL == vdev) {
-		CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
 			"%s: Invalid sta_id %d", __func__, sta_id);
 		/* Return true so caller do not understand that resource
 		 * is less than low_watermark.
@@ -2692,7 +2692,7 @@ ol_txrx_ll_set_tx_pause_q_depth(uint8_t vdev_id, int pause_q_depth)
 {
 	ol_txrx_vdev_handle vdev = ol_txrx_get_vdev_from_vdev_id(vdev_id);
 	if (NULL == vdev) {
-		CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
 			"%s: Invalid vdev_id %d", __func__, vdev_id);
 		return -EINVAL;
 	}
@@ -2750,19 +2750,19 @@ inline void ol_txrx_flow_control_cb(ol_txrx_vdev_handle vdev,
  */
 void
 ol_txrx_ipa_uc_get_resource(ol_txrx_pdev_handle pdev,
-			    cdf_dma_addr_t *ce_sr_base_paddr,
+			    qdf_dma_addr_t *ce_sr_base_paddr,
 			    uint32_t *ce_sr_ring_size,
-			    cdf_dma_addr_t *ce_reg_paddr,
-			    cdf_dma_addr_t *tx_comp_ring_base_paddr,
+			    qdf_dma_addr_t *ce_reg_paddr,
+			    qdf_dma_addr_t *tx_comp_ring_base_paddr,
 			    uint32_t *tx_comp_ring_size,
 			    uint32_t *tx_num_alloc_buffer,
-			    cdf_dma_addr_t *rx_rdy_ring_base_paddr,
+			    qdf_dma_addr_t *rx_rdy_ring_base_paddr,
 			    uint32_t *rx_rdy_ring_size,
-			    cdf_dma_addr_t *rx_proc_done_idx_paddr,
+			    qdf_dma_addr_t *rx_proc_done_idx_paddr,
 			    void **rx_proc_done_idx_vaddr,
-			    cdf_dma_addr_t *rx2_rdy_ring_base_paddr,
+			    qdf_dma_addr_t *rx2_rdy_ring_base_paddr,
 			    uint32_t *rx2_rdy_ring_size,
-			    cdf_dma_addr_t *rx2_proc_done_idx2_paddr,
+			    qdf_dma_addr_t *rx2_proc_done_idx2_paddr,
 			    void **rx2_proc_done_idx2_vaddr)
 {
 	htt_ipa_uc_get_resource(pdev->htt_pdev,
@@ -2793,8 +2793,8 @@ ol_txrx_ipa_uc_get_resource(ol_txrx_pdev_handle pdev,
  */
 void
 ol_txrx_ipa_uc_set_doorbell_paddr(ol_txrx_pdev_handle pdev,
-				  cdf_dma_addr_t ipa_tx_uc_doorbell_paddr,
-				  cdf_dma_addr_t ipa_rx_uc_doorbell_paddr)
+				  qdf_dma_addr_t ipa_tx_uc_doorbell_paddr,
+				  qdf_dma_addr_t ipa_rx_uc_doorbell_paddr)
 {
 	htt_ipa_uc_set_doorbell_paddr(pdev->htt_pdev,
 				      ipa_tx_uc_doorbell_paddr,
@@ -2833,7 +2833,7 @@ void ol_txrx_ipa_uc_fw_op_event_handler(void *context,
 	ol_txrx_pdev_handle pdev = (ol_txrx_pdev_handle)context;
 
 	if (cdf_unlikely(!pdev)) {
-		CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
 			      "%s: Invalid context", __func__);
 		cdf_mem_free(rxpkt);
 		return;
@@ -2842,7 +2842,7 @@ void ol_txrx_ipa_uc_fw_op_event_handler(void *context,
 	if (pdev->ipa_uc_op_cb) {
 		pdev->ipa_uc_op_cb(rxpkt, pdev->osif_dev);
 	} else {
-		CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
 			      "%s: ipa_uc_op_cb NULL", __func__);
 		cdf_mem_free(rxpkt);
 	}
@@ -2866,7 +2866,7 @@ void ol_txrx_ipa_uc_op_response(ol_txrx_pdev_handle pdev, uint8_t *op_msg)
 
 	pkt = cds_alloc_ol_rx_pkt(sched_ctx);
 	if (cdf_unlikely(!pkt)) {
-		CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
 			      "%s: Not able to allocate context", __func__);
 		return;
 	}
@@ -2884,7 +2884,7 @@ void ol_txrx_ipa_uc_op_response(ol_txrx_pdev_handle pdev,
 	if (pdev->ipa_uc_op_cb) {
 		pdev->ipa_uc_op_cb(op_msg, pdev->osif_dev);
 	} else {
-		CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
 		    "%s: IPA callback function is not registered", __func__);
 		cdf_mem_free(op_msg);
 		return;
@@ -2923,9 +2923,9 @@ void ol_txrx_display_stats(uint16_t value)
 {
 	ol_txrx_pdev_handle pdev;
 
-	pdev = cds_get_context(CDF_MODULE_ID_TXRX);
+	pdev = cds_get_context(QDF_MODULE_ID_TXRX);
 	if (!pdev) {
-		CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
 			"%s: pdev is NULL", __func__);
 		return;
 	}
@@ -2944,7 +2944,7 @@ void ol_txrx_display_stats(uint16_t value)
 		cdf_nbuf_tx_desc_count_display();
 		break;
 	default:
-		CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
 					"%s: Unknown value", __func__);
 		break;
 	}
@@ -2954,9 +2954,9 @@ void ol_txrx_clear_stats(uint16_t value)
 {
 	ol_txrx_pdev_handle pdev;
 
-	pdev = cds_get_context(CDF_MODULE_ID_TXRX);
+	pdev = cds_get_context(QDF_MODULE_ID_TXRX);
 	if (!pdev) {
-		CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
 			"%s: pdev is NULL", __func__);
 		return;
 	}
@@ -2972,7 +2972,7 @@ void ol_txrx_clear_stats(uint16_t value)
 		cdf_nbuf_tx_desc_count_clear();
 		break;
 	default:
-		CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
 					"%s: Unknown value", __func__);
 		break;
 	}
@@ -3050,7 +3050,7 @@ void ol_rx_data_process(struct ol_txrx_peer_t *peer,
 	 * IPA kernel module API should not be called on SIRQ CTXT */
 	cdf_nbuf_t buf, next_buf;
 	ol_rx_callback_fp data_rx = NULL;
-	ol_txrx_pdev_handle pdev = cds_get_context(CDF_MODULE_ID_TXRX);
+	ol_txrx_pdev_handle pdev = cds_get_context(QDF_MODULE_ID_TXRX);
 
 	if ((!peer) || (!pdev)) {
 		TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "peer/pdev is NULL");
@@ -3145,7 +3145,7 @@ QDF_STATUS ol_txrx_register_peer(ol_rx_callback_fp rxcb,
 				 struct ol_txrx_desc_type *sta_desc)
 {
 	struct ol_txrx_peer_t *peer;
-	struct ol_txrx_pdev_t *pdev = cds_get_context(CDF_MODULE_ID_TXRX);
+	struct ol_txrx_pdev_t *pdev = cds_get_context(QDF_MODULE_ID_TXRX);
 	union ol_txrx_peer_update_param_t param;
 	struct privacy_exemption privacy_filter;
 
@@ -3194,7 +3194,7 @@ QDF_STATUS ol_txrx_register_peer(ol_rx_callback_fp rxcb,
 QDF_STATUS ol_txrx_clear_peer(uint8_t sta_id)
 {
 	struct ol_txrx_peer_t *peer;
-	struct ol_txrx_pdev_t *pdev = cds_get_context(CDF_MODULE_ID_TXRX);
+	struct ol_txrx_pdev_t *pdev = cds_get_context(QDF_MODULE_ID_TXRX);
 
 	if (!pdev) {
 		TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "%s: Unable to find pdev!",
@@ -3251,7 +3251,7 @@ QDF_STATUS ol_txrx_register_ocb_peer(void *cds_ctx, uint8_t *mac_addr,
 		return QDF_STATUS_E_FAILURE;
 	}
 
-	pdev = cds_get_context(CDF_MODULE_ID_TXRX);
+	pdev = cds_get_context(QDF_MODULE_ID_TXRX);
 	if (!pdev) {
 		TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "%s: Unable to find pdev!",
 			   __func__);
@@ -3326,7 +3326,7 @@ exit:
  */
 QDF_STATUS ol_txrx_register_pause_cb(ol_tx_pause_callback_fp pause_cb)
 {
-	struct ol_txrx_pdev_t *pdev = cds_get_context(CDF_MODULE_ID_TXRX);
+	struct ol_txrx_pdev_t *pdev = cds_get_context(QDF_MODULE_ID_TXRX);
 	if (!pdev || !pause_cb) {
 		TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "pdev or pause_cb is NULL");
 		return QDF_STATUS_E_INVAL;
@@ -3356,7 +3356,7 @@ void ol_txrx_lro_flush_handler(void *context,
 	ol_txrx_pdev_handle pdev = (ol_txrx_pdev_handle)context;
 
 	if (cdf_unlikely(!pdev)) {
-		CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
 			 "%s: Invalid context", __func__);
 		cdf_assert(0);
 		return;
@@ -3365,7 +3365,7 @@ void ol_txrx_lro_flush_handler(void *context,
 	if (pdev->lro_info.lro_flush_cb)
 		pdev->lro_info.lro_flush_cb(pdev->lro_info.lro_data);
 	else
-		CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
 			 "%s: lro_flush_cb NULL", __func__);
 }
 
@@ -3392,7 +3392,7 @@ void ol_txrx_lro_flush(void *data)
 	} else {
 		pkt = cds_alloc_ol_rx_pkt(sched_ctx);
 		if (cdf_unlikely(!pkt)) {
-			CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+			CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
 				 "%s: Not able to allocate context", __func__);
 			return;
 		}
@@ -3419,8 +3419,8 @@ void ol_txrx_lro_flush(void *data)
 void ol_register_lro_flush_cb(void (handler)(void *), void *data)
 {
 	struct hif_opaque_softc *hif_device =
-		(struct hif_opaque_softc *)cds_get_context(CDF_MODULE_ID_HIF);
-	struct ol_txrx_pdev_t *pdev = cds_get_context(CDF_MODULE_ID_TXRX);
+		(struct hif_opaque_softc *)cds_get_context(QDF_MODULE_ID_HIF);
+	struct ol_txrx_pdev_t *pdev = cds_get_context(QDF_MODULE_ID_TXRX);
 
 	pdev->lro_info.lro_flush_cb = handler;
 	pdev->lro_info.lro_data = data;
@@ -3440,8 +3440,8 @@ void ol_register_lro_flush_cb(void (handler)(void *), void *data)
 void ol_deregister_lro_flush_cb(void)
 {
 	struct hif_opaque_softc *hif_device =
-		(struct hif_opaque_softc *)cds_get_context(CDF_MODULE_ID_HIF);
-	struct ol_txrx_pdev_t *pdev = cds_get_context(CDF_MODULE_ID_TXRX);
+		(struct hif_opaque_softc *)cds_get_context(QDF_MODULE_ID_HIF);
+	struct ol_txrx_pdev_t *pdev = cds_get_context(QDF_MODULE_ID_TXRX);
 
 	hif_lro_flush_cb_deregister(hif_device);
 

core/dp/txrx/ol_txrx.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2014 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -48,7 +48,7 @@ void ol_txrx_peer_unref_delete(struct ol_txrx_peer_t *peer);
  */
 static inline ol_txrx_vdev_handle ol_txrx_get_vdev_from_vdev_id(uint8_t vdev_id)
 {
-	ol_txrx_pdev_handle pdev = cds_get_context(CDF_MODULE_ID_TXRX);
+	ol_txrx_pdev_handle pdev = cds_get_context(QDF_MODULE_ID_TXRX);
 	ol_txrx_vdev_handle vdev = NULL;
 
 	if (cdf_unlikely(!pdev)) {

core/dp/txrx/ol_txrx_event.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -33,7 +33,7 @@ static inline wdi_event_subscribe *wdi_event_next_sub(wdi_event_subscribe *
 						      wdi_sub)
 {
 	if (!wdi_sub) {
-		CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
 			  "Invalid subscriber in %s\n", __func__);
 		return NULL;
 	}
@@ -84,12 +84,12 @@ wdi_event_handler(enum WDI_EVENT event,
 	 * Input validation
 	 */
 	if (!event) {
-		CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
 			  "Invalid WDI event in %s\n", __func__);
 		return;
 	}
 	if (!txrx_pdev) {
-		CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
 			  "Invalid pdev in WDI event handler\n");
 		return;
 	}
@@ -113,17 +113,17 @@ wdi_event_sub(struct ol_txrx_pdev_t *txrx_pdev,
 	wdi_event_subscribe *wdi_sub;
 	/* Input validation */
 	if (!txrx_pdev) {
-		CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
 			  "Invalid txrx_pdev in %s", __func__);
 		return A_ERROR;
 	}
 	if (!event_cb_sub) {
-		CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
 			  "Invalid callback in %s", __func__);
 		return A_ERROR;
 	}
 	if ((!event) || (event >= WDI_EVENT_LAST) || (event < WDI_EVENT_BASE)) {
-		CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
 			  "Invalid event in %s", __func__);
 		return A_ERROR;
 	}
@@ -157,7 +157,7 @@ wdi_event_unsub(struct ol_txrx_pdev_t *txrx_pdev,
 
 	/* Input validation */
 	if (!event_cb_sub) {
-		CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
 			  "Invalid callback in %s", __func__);
 		return A_ERROR;
 	}
@@ -179,7 +179,7 @@ A_STATUS wdi_event_attach(struct ol_txrx_pdev_t *txrx_pdev)
 {
 	/* Input validation */
 	if (!txrx_pdev) {
-		CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
 			  "Invalid device in %s\nWDI event attach failed",
 			  __func__);
 		return A_ERROR;
@@ -190,7 +190,7 @@ A_STATUS wdi_event_attach(struct ol_txrx_pdev_t *txrx_pdev)
 					    sizeof(wdi_event_subscribe *) *
 					    WDI_NUM_EVENTS);
 	if (!txrx_pdev->wdi_event_list) {
-		CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
 			  "Insufficient memory for the WDI event lists\n");
 		return A_NO_MEMORY;
 	}
@@ -202,13 +202,13 @@ A_STATUS wdi_event_detach(struct ol_txrx_pdev_t *txrx_pdev)
 	int i;
 	wdi_event_subscribe *wdi_sub;
 	if (!txrx_pdev) {
-		CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
 			  "Invalid device in %s\nWDI detach failed",
 			  __func__);
 		return A_ERROR;
 	}
 	if (!txrx_pdev->wdi_event_list) {
-		CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
 			  "%s: wdi_event_list is NULL", __func__);
 		return A_ERROR;
 	}

core/dp/txrx/ol_txrx_flow_control.c

@@ -141,7 +141,7 @@ void ol_tx_deregister_flow_control(struct ol_txrx_pdev_t *pdev)
  */
 void ol_tx_dump_flow_pool_info(void)
 {
-	struct ol_txrx_pdev_t *pdev = cds_get_context(CDF_MODULE_ID_TXRX);
+	struct ol_txrx_pdev_t *pdev = cds_get_context(QDF_MODULE_ID_TXRX);
 	struct ol_tx_flow_pool_t *pool = NULL;
 	struct ol_tx_flow_pool_t tmp_pool;
 
@@ -202,7 +202,7 @@ void ol_tx_dump_flow_pool_info(void)
  */
 void ol_tx_clear_flow_pool_stats(void)
 {
-	struct ol_txrx_pdev_t *pdev = cds_get_context(CDF_MODULE_ID_TXRX);
+	struct ol_txrx_pdev_t *pdev = cds_get_context(QDF_MODULE_ID_TXRX);
 
 	if (!pdev) {
 		TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "%s: pdev is null\n",
@@ -277,7 +277,7 @@ static int ol_tx_move_desc_n(struct ol_tx_flow_pool_t *src_pool,
 int
 ol_tx_distribute_descs_to_deficient_pools(struct ol_tx_flow_pool_t *src_pool)
 {
-	struct ol_txrx_pdev_t *pdev = cds_get_context(CDF_MODULE_ID_TXRX);
+	struct ol_txrx_pdev_t *pdev = cds_get_context(QDF_MODULE_ID_TXRX);
 	struct ol_tx_flow_pool_t *dst_pool = NULL;
 	uint16_t desc_count = src_pool->avail_desc;
 	uint16_t desc_move_count = 0;
@@ -321,7 +321,7 @@ ol_tx_distribute_descs_to_deficient_pools(struct ol_tx_flow_pool_t *src_pool)
 struct ol_tx_flow_pool_t *ol_tx_create_flow_pool(uint8_t flow_pool_id,
 						 uint16_t flow_pool_size)
 {
-	struct ol_txrx_pdev_t *pdev = cds_get_context(CDF_MODULE_ID_TXRX);
+	struct ol_txrx_pdev_t *pdev = cds_get_context(QDF_MODULE_ID_TXRX);
 	struct ol_tx_flow_pool_t *pool;
 	uint16_t size = 0, i;
 	struct ol_tx_desc_t *tx_desc;
@@ -392,7 +392,7 @@ struct ol_tx_flow_pool_t *ol_tx_create_flow_pool(uint8_t flow_pool_id,
  */
 int ol_tx_delete_flow_pool(struct ol_tx_flow_pool_t *pool)
 {
-	struct ol_txrx_pdev_t *pdev = cds_get_context(CDF_MODULE_ID_TXRX);
+	struct ol_txrx_pdev_t *pdev = cds_get_context(QDF_MODULE_ID_TXRX);
 	uint16_t i, size;
 	union ol_tx_desc_list_elem_t *temp_list = NULL;
 	struct ol_tx_desc_t *tx_desc = NULL;
@@ -464,7 +464,7 @@ int ol_tx_delete_flow_pool(struct ol_tx_flow_pool_t *pool)
  */
 int ol_tx_free_invalid_flow_pool(struct ol_tx_flow_pool_t *pool)
 {
-	struct ol_txrx_pdev_t *pdev = cds_get_context(CDF_MODULE_ID_TXRX);
+	struct ol_txrx_pdev_t *pdev = cds_get_context(QDF_MODULE_ID_TXRX);
 
 	if ((!pdev) || (!pool) || (pool->status != FLOW_POOL_INVALID)) {
 		TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
@@ -495,7 +495,7 @@ int ol_tx_free_invalid_flow_pool(struct ol_tx_flow_pool_t *pool)
  */
 struct ol_tx_flow_pool_t *ol_tx_get_flow_pool(uint8_t flow_pool_id)
 {
-	struct ol_txrx_pdev_t *pdev = cds_get_context(CDF_MODULE_ID_TXRX);
+	struct ol_txrx_pdev_t *pdev = cds_get_context(QDF_MODULE_ID_TXRX);
 	struct ol_tx_flow_pool_t *pool = NULL;
 	bool is_found = false;
 
@@ -591,7 +591,7 @@ void ol_tx_flow_pool_vdev_unmap(struct ol_tx_flow_pool_t *pool,
 void ol_tx_flow_pool_map_handler(uint8_t flow_id, uint8_t flow_type,
 				 uint8_t flow_pool_id, uint16_t flow_pool_size)
 {
-	struct ol_txrx_pdev_t *pdev = cds_get_context(CDF_MODULE_ID_TXRX);
+	struct ol_txrx_pdev_t *pdev = cds_get_context(QDF_MODULE_ID_TXRX);
 	struct ol_tx_flow_pool_t *pool;
 	uint8_t pool_create = 0;
 	enum htt_flow_type type = flow_type;
@@ -651,7 +651,7 @@ void ol_tx_flow_pool_map_handler(uint8_t flow_id, uint8_t flow_type,
 void ol_tx_flow_pool_unmap_handler(uint8_t flow_id, uint8_t flow_type,
 							  uint8_t flow_pool_id)
 {
-	struct ol_txrx_pdev_t *pdev = cds_get_context(CDF_MODULE_ID_TXRX);
+	struct ol_txrx_pdev_t *pdev = cds_get_context(QDF_MODULE_ID_TXRX);
 	struct ol_tx_flow_pool_t *pool;
 	enum htt_flow_type type = flow_type;
 

core/dp/txrx/ol_txrx_internal.h

@@ -103,14 +103,14 @@ extern unsigned g_txrx_print_level;
 #ifdef TXRX_PRINT_ENABLE
 
 #include <stdarg.h>             /* va_list */
-#include <cdf_types.h>          /* cdf_vprint */
+#include <qdf_types.h>          /* qdf_vprint */
 
 /* Supress 4296 - expression is always true
 * It will fire if level is TXRX_PRINT_LEVEL_FATAL_ERR (0)
 * because g_txrx_print_level is unsigned */
 #define ol_txrx_print(level, fmt, ...)  {		\
 		if (level <= g_txrx_print_level)	\
-			cdf_print(fmt, ## __VA_ARGS__); }
+			qdf_print(fmt, ## __VA_ARGS__); }
 #define TXRX_PRINT(level, fmt, ...) \
 	ol_txrx_print(level, "TXRX: " fmt, ## __VA_ARGS__)
 
@@ -118,7 +118,7 @@ extern unsigned g_txrx_print_level;
 
 #define ol_txrx_print_verbose(fmt, ...) {		  \
 	if (TXRX_PRINT_LEVEL_INFO3 <= g_txrx_print_level) \
-		cdf_print(fmt, ## __VA_ARGS__); }
+		qdf_print(fmt, ## __VA_ARGS__); }
 #define TXRX_PRINT_VERBOSE(fmt, ...) \
 	ol_txrx_print_verbose("TXRX: " fmt, ## __VA_ARGS__)
 #else
@@ -141,7 +141,7 @@ extern unsigned g_txrx_print_level;
 #endif
 
 #if DEBUG_CREDIT
-#define TX_CREDIT_DEBUG_PRINT(fmt, ...) cdf_print(fmt, ## __VA_ARGS__)
+#define TX_CREDIT_DEBUG_PRINT(fmt, ...) qdf_print(fmt, ## __VA_ARGS__)
 #else
 #define TX_CREDIT_DEBUG_PRINT(fmt, ...)
 #endif
@@ -149,11 +149,11 @@ extern unsigned g_txrx_print_level;
 /*--- tx scheduler debug printouts ---*/
 
 #ifdef HOST_TX_SCHED_DEBUG
-#define TX_SCHED_DEBUG_PRINT(fmt, ...) cdf_print(fmt, ## __VA_ARGS__)
+#define TX_SCHED_DEBUG_PRINT(fmt, ...) qdf_print(fmt, ## __VA_ARGS__)
 #else
 #define TX_SCHED_DEBUG_PRINT(fmt, ...)
 #endif
-#define TX_SCHED_DEBUG_PRINT_ALWAYS(fmt, ...) cdf_print(fmt, ## __VA_ARGS__)
+#define TX_SCHED_DEBUG_PRINT_ALWAYS(fmt, ...) qdf_print(fmt, ## __VA_ARGS__)
 
 #define OL_TXRX_LIST_APPEND(head, tail, elem) \
 	do {						\
@@ -381,7 +381,7 @@ ol_txrx_frms_dump(const char *name,
 	uint8_t *p;
 
 	if (name) {
-		CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO, "%s\n",
+		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO, "%s\n",
 			  name);
 	}
 	while (frm) {
@@ -435,7 +435,7 @@ ol_txrx_frms_dump(const char *name,
 				ip_prot = ipv6_hdr->next_hdr;
 				tcp_offset = l2_hdr_size + IPV6_HDR_LEN;
 			} else {
-				CDF_TRACE(CDF_MODULE_ID_TXRX,
+				CDF_TRACE(QDF_MODULE_ID_TXRX,
 					  CDF_TRACE_LEVEL_INFO,
 					  "frame %p non-IP ethertype (%x)\n",
 					  frm, ethtype);
@@ -451,12 +451,12 @@ ol_txrx_frms_dump(const char *name,
 					(tcp_hdr->seq_num[1] << 16) |
 					(tcp_hdr->seq_num[1] << 8) |
 					(tcp_hdr->seq_num[1] << 0);
-				CDF_TRACE(CDF_MODULE_ID_TXRX,
+				CDF_TRACE(QDF_MODULE_ID_TXRX,
 					  CDF_TRACE_LEVEL_INFO,
 					  "frame %p: TCP seq num = %d\n", frm,
 					  tcp_seq_num);
 #else
-				CDF_TRACE(CDF_MODULE_ID_TXRX,
+				CDF_TRACE(QDF_MODULE_ID_TXRX,
 					  CDF_TRACE_LEVEL_INFO,
 					  "frame %p: TCP seq num = %d\n", frm,
 					  ((*(p + tcp_offset + 4)) << 24) |
@@ -465,7 +465,7 @@ ol_txrx_frms_dump(const char *name,
 					  (*(p + tcp_offset + 7)));
 #endif
 			} else {
-				CDF_TRACE(CDF_MODULE_ID_TXRX,
+				CDF_TRACE(QDF_MODULE_ID_TXRX,
 					  CDF_TRACE_LEVEL_INFO,
 					  "frame %p non-TCP IP protocol (%x)\n",
 					  frm, ip_prot);
@@ -502,12 +502,12 @@ NOT_IP_TCP:
 				i += frag_bytes;
 			}
 
-			CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO,
+			CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO,
 				  "frame %p data (%p), hex dump of bytes 0-%d of %d:\n",
 				frm, p, len_lim - 1, (int)cdf_nbuf_len(frm));
 			p = local_buf;
 			while (len_lim > 16) {
-				CDF_TRACE(CDF_MODULE_ID_TXRX,
+				CDF_TRACE(QDF_MODULE_ID_TXRX,
 					  CDF_TRACE_LEVEL_INFO,
 					  "  "        /* indent */
 					  "%02x %02x %02x %02x %02x %02x %02x %02x "
@@ -521,15 +521,15 @@ NOT_IP_TCP:
 				p += 16;
 				len_lim -= 16;
 			}
-			CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO,
+			CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO,
 				  "  " /* indent */);
 			while (len_lim > 0) {
-				CDF_TRACE(CDF_MODULE_ID_TXRX,
+				CDF_TRACE(QDF_MODULE_ID_TXRX,
 					  CDF_TRACE_LEVEL_INFO, "%02x ", *p);
 				p++;
 				len_lim--;
 			}
-			CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO,
+			CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO,
 				  "\n");
 		}
 		frm = cdf_nbuf_next(frm);

core/dp/txrx/ol_txrx_peer_find.c

@@ -29,7 +29,7 @@
 /* header files for OS primitives */
 #include <osdep.h>              /* uint32_t, etc. */
 #include <cdf_memory.h>         /* cdf_mem_malloc, etc. */
-#include <cdf_types.h>          /* cdf_device_t, cdf_print */
+#include <qdf_types.h>          /* qdf_device_t, qdf_print */
 /* header files for utilities */
 #include <cds_queue.h>          /* TAILQ */
 
@@ -457,25 +457,25 @@ void ol_txrx_peer_find_display(ol_txrx_pdev_handle pdev, int indent)
 {
 	int i, max_peers;
 
-	CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
+	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
 		  "%*speer map:\n", indent, " ");
 	max_peers = ol_cfg_max_peer_id(pdev->ctrl_pdev) + 1;
 	for (i = 0; i < max_peers; i++) {
 		if (pdev->peer_id_to_obj_map[i]) {
-			CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
+			CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
 				  "%*sid %d -> %p\n",
 				  indent + 4, " ", i,
 				  pdev->peer_id_to_obj_map[i]);
 		}
 	}
-	CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
+	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
 		  "%*speer hash table:\n", indent, " ");
 	for (i = 0; i <= pdev->peer_hash.mask; i++) {
 		if (!TAILQ_EMPTY(&pdev->peer_hash.bins[i])) {
 			struct ol_txrx_peer_t *peer;
 			TAILQ_FOREACH(peer, &pdev->peer_hash.bins[i],
 				      hash_list_elem) {
-				CDF_TRACE(CDF_MODULE_ID_TXRX,
+				CDF_TRACE(QDF_MODULE_ID_TXRX,
 					  CDF_TRACE_LEVEL_INFO_LOW,
 					  "%*shash idx %d -> %p (%02x:%02x:%02x:%02x:%02x:%02x)\n",
 					indent + 4, " ", i, peer,

core/dp/txrx/ol_txrx_types.h

@@ -216,7 +216,7 @@ enum ol_tx_queue_status {
 struct ol_txrx_msdu_info_t {
 	struct htt_msdu_info_t htt;
 	struct ol_txrx_peer_t *peer;
-	struct cdf_tso_info_t tso_info;
+	struct qdf_tso_info_t tso_info;
 };
 
 enum {
@@ -447,7 +447,7 @@ struct ol_txrx_pdev_t {
 	ol_pdev_handle ctrl_pdev;
 
 	/* osdev - handle for mem alloc / free, map / unmap */
-	cdf_device_t osdev;
+	qdf_device_t osdev;
 
 	htt_pdev_handle htt_pdev;
 

core/hdd/inc/qc_sap_ioctl.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -109,7 +109,7 @@ struct sQcSapreq_wscie {
  * Retrieve the WPS PBC Probe Request IEs.
  */
 typedef struct sQcSapreq_WPSPBCProbeReqIES {
-	struct cdf_mac_addr macaddr;
+	struct qdf_mac_addr macaddr;
 	uint16_t probeReqIELen;
 	uint8_t probeReqIE[512];
 } sQcSapreq_WPSPBCProbeReqIES_t;

core/hdd/inc/wlan_hdd_assoc.h

@@ -110,10 +110,10 @@ typedef enum {
 typedef struct connection_info_s {
 	eConnectionState connState;
 	eMib_dot11DesiredBssType connDot11DesiredBssType;
-	struct cdf_mac_addr bssId;
+	struct qdf_mac_addr bssId;
 	tCsrSSIDInfo SSID;
 	uint8_t staId[MAX_IBSS_PEERS];
-	struct cdf_mac_addr peerMacAddress[MAX_IBSS_PEERS];
+	struct qdf_mac_addr peerMacAddress[MAX_IBSS_PEERS];
 	eCsrAuthType authType;
 	eCsrEncryptionType ucEncryptionType;
 	eCsrEncryptionType mcEncryptionType;

core/hdd/inc/wlan_hdd_cfg.h

@@ -40,7 +40,7 @@
 /* Include files */
 #include <wlan_hdd_includes.h>
 #include <wlan_hdd_wmm.h>
-#include <cdf_types.h>
+#include <qdf_types.h>
 #include <csr_api.h>
 #include <sap_api.h>
 #include <wmi_unified.h>
@@ -2911,11 +2911,11 @@ struct hdd_config {
 	uint32_t nScanAgeTimeCPS;
 	uint8_t nRssiCatGap;
 	bool fIsShortPreamble;
-	struct cdf_mac_addr IbssBssid;
+	struct qdf_mac_addr IbssBssid;
 	uint32_t AdHocChannel5G;
 	uint32_t AdHocChannel24G;
 	uint8_t intfAddrMask;
-	struct cdf_mac_addr intfMacAddr[CDF_MAX_CONCURRENCY_PERSONA];
+	struct qdf_mac_addr intfMacAddr[QDF_MAX_CONCURRENCY_PERSONA];
 
 	bool apUapsdEnabled;
 	bool apRandomBssidEnabled;

core/hdd/inc/wlan_hdd_ftm.h

@@ -38,7 +38,7 @@
 #include "cds_mq.h"
 #include "cds_api.h"
 #include "msg.h"
-#include "cdf_types.h"
+#include "qdf_types.h"
 #include <wlan_ptt_sock_svc.h>
 
 enum wlan_hdd_ftm_state {

core/hdd/inc/wlan_hdd_host_offload.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2015 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -54,7 +54,7 @@ typedef struct {
 		uint8_t hostIpv4Addr[SIR_IPV4_ADDR_LEN];
 		uint8_t hostIpv6Addr[SIR_MAC_IPV6_ADDR_LEN];
 	} params;
-	struct cdf_mac_addr bssId;
+	struct qdf_mac_addr bssId;
 } tHostOffloadRequest, *tpHostOffloadRequest;
 
 #endif /* __WLAN_HDD_HOST_OFFLOAD_H__ */

core/hdd/inc/wlan_hdd_main.h

@@ -43,7 +43,7 @@
 #include <linux/skbuff.h>
 #include <net/cfg80211.h>
 #include <qdf_list.h>
-#include <cdf_types.h>
+#include <qdf_types.h>
 #include "sir_mac_prot_def.h"
 #include "csr_api.h"
 #include <wlan_hdd_assoc.h>
@@ -157,9 +157,9 @@
 #define WLAN_CHIP_VERSION   "WCNSS"
 
 #ifndef HDD_DISALLOW_LEGACY_HDDLOG
-#define hddLog(level, args ...) CDF_TRACE(CDF_MODULE_ID_HDD, level, ## args)
+#define hddLog(level, args ...) CDF_TRACE(QDF_MODULE_ID_HDD, level, ## args)
 #endif
-#define hdd_log(level, args...) CDF_TRACE(CDF_MODULE_ID_HDD, level, ## args)
+#define hdd_log(level, args...) CDF_TRACE(QDF_MODULE_ID_HDD, level, ## args)
 #define hdd_logfl(level, format, args...) hdd_log(level, FL(format), ## args)
 
 #define hdd_alert(format, args...) \
@@ -512,7 +512,7 @@ typedef struct _WLAN_BKID_LIST *pWLAN_BKID_LIST;
 struct hdd_wapi_info_s {
 	uint32_t nWapiMode;
 	bool fIsWapiSta;
-	struct cdf_mac_addr cachedMacAddr;
+	struct qdf_mac_addr cachedMacAddr;
 	uint8_t wapiAuthMode;
 } __packed;
 typedef struct hdd_wapi_info_s hdd_wapi_info_t;
@@ -531,7 +531,7 @@ typedef struct beacon_data_s {
 } beacon_data_t;
 
 /**
- * enum device_mode: Maintain one to one correspondence with tCDF_ADAPTER_MODE
+ * enum device_mode: Maintain one to one correspondence with tQDF_ADAPTER_MODE
  * @WLAN_HDD_INFRA_STATION: station mode
  * @WLAN_HDD_SOFTAP: sap mode
  * @WLAN_HDD_P2P_CLIENT: p2p client mode
@@ -691,7 +691,7 @@ typedef struct {
 	uint8_t ucSTAId;
 
 	/** MAC address of the station */
-	struct cdf_mac_addr macAddrSTA;
+	struct qdf_mac_addr macAddrSTA;
 
 	/** Current Station state so HDD knows how to deal with packet
 	 *  queue. Most recent states used to change TLSHIM STA state */
@@ -851,7 +851,7 @@ struct hdd_adapter_s {
 	uint32_t ctw;
 
 	/** Current MAC Address for the adapter  */
-	struct cdf_mac_addr macAddressCurrent;
+	struct qdf_mac_addr macAddressCurrent;
 
 	/**Event Flags*/
 	unsigned long event_flags;
@@ -997,10 +997,10 @@ struct hdd_adapter_s {
 	int temperature;
 
 	/* Time stamp for last completed RoC request */
-	v_TIME_t last_roc_ts;
+	unsigned long last_roc_ts;
 
 	/* Time stamp for start RoC request */
-	v_TIME_t start_roc_ts;
+	unsigned long start_roc_ts;
 
 	/* State for synchronous OCB requests to WMI */
 	struct sir_ocb_set_config_response ocb_set_config_resp;
@@ -1009,7 +1009,7 @@ struct hdd_adapter_s {
 	struct sir_dcc_update_ndl_response dcc_update_ndl_resp;
 
 	/* MAC addresses used for OCB interfaces */
-	struct cdf_mac_addr ocb_mac_address[CDF_MAX_CONCURRENCY_PERSONA];
+	struct qdf_mac_addr ocb_mac_address[QDF_MAX_CONCURRENCY_PERSONA];
 	int ocb_mac_addr_count;
 
 	/* BITMAP indicating pause reason */
@@ -1156,11 +1156,11 @@ struct hdd_context_s {
 	/** Concurrency Parameters*/
 	uint32_t concurrency_mode;
 
-	uint8_t no_of_open_sessions[CDF_MAX_NO_OF_MODE];
-	uint8_t no_of_active_sessions[CDF_MAX_NO_OF_MODE];
+	uint8_t no_of_open_sessions[QDF_MAX_NO_OF_MODE];
+	uint8_t no_of_active_sessions[QDF_MAX_NO_OF_MODE];
 
 	/** P2P Device MAC Address for the adapter  */
-	struct cdf_mac_addr p2pDeviceAddress;
+	struct qdf_mac_addr p2pDeviceAddress;
 
 #ifdef WLAN_FEATURE_HOLD_RX_WAKELOCK
 	cdf_wake_lock_t rx_wake_lock;
@@ -1387,7 +1387,7 @@ void wlan_hdd_release_intf_addr(hdd_context_t *pHddCtx, uint8_t *releaseAddr);
 uint8_t hdd_get_operating_channel(hdd_context_t *pHddCtx, device_mode_t mode);
 
 void hdd_set_conparam(uint32_t con_param);
-enum tCDF_GLOBAL_CON_MODE hdd_get_conparam(void);
+enum tQDF_GLOBAL_CON_MODE hdd_get_conparam(void);
 
 void hdd_abort_mac_scan(hdd_context_t *pHddCtx, uint8_t sessionId,
 			eCsrAbortReason reason);
@@ -1432,7 +1432,7 @@ void __hdd_wlan_exit(void);
 int hdd_wlan_notify_modem_power_state(int state);
 #ifdef QCA_HT_2040_COEX
 int hdd_wlan_set_ht2040_mode(hdd_adapter_t *pAdapter, uint16_t staId,
-			     struct cdf_mac_addr macAddrSTA, int width);
+			     struct qdf_mac_addr macAddrSTA, int width);
 #endif
 
 #ifdef WLAN_FEATURE_LPSS
@@ -1480,7 +1480,7 @@ static inline bool hdd_is_memdump_supported(void)
 #endif /* WLAN_FEATURE_MEMDUMP */
 
 void hdd_update_macaddr(struct hdd_config *config,
-			struct cdf_mac_addr hw_macaddr);
+			struct qdf_mac_addr hw_macaddr);
 void wlan_hdd_disable_roaming(hdd_adapter_t *pAdapter);
 void wlan_hdd_enable_roaming(hdd_adapter_t *pAdapter);
 

core/hdd/inc/wlan_hdd_mib.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2014 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.
  *
@@ -28,7 +28,7 @@
 #if !defined(WLAN_HDD_MIB_h__)
 #define WLAN_HDD_MIB_h__
 
-#include <cdf_types.h>
+#include <qdf_types.h>
 
 typedef enum {
 	eMib_dot11DesiredBssType_infrastructure = 1,
@@ -45,7 +45,7 @@ typedef enum {
 typedef struct {
 	uint32_t cEntries;
 
-	struct cdf_mac_addr BSSIDs[MIB_DOT11_DESIRED_BSSID_LIST_MAX_COUNT];
+	struct qdf_mac_addr BSSIDs[MIB_DOT11_DESIRED_BSSID_LIST_MAX_COUNT];
 
 } sMib_dot11DesiredBssidList;
 
@@ -119,7 +119,7 @@ typedef enum {
 typedef struct {
 	uint32_t cEntries;
 
-	struct cdf_mac_addr macAddrs[MIB_DOT11_MAC_EXCLUSION_LIST_MAX_COUNT];
+	struct qdf_mac_addr macAddrs[MIB_DOT11_MAC_EXCLUSION_LIST_MAX_COUNT];
 
 } sMib_dot11MacExcludeList;
 

core/hdd/inc/wlan_hdd_oemdata.h

@@ -77,7 +77,7 @@ typedef enum {
  * @patch: Version ID patch number
  * @build: Version ID build number
  */
-typedef struct cdf_packed {
+typedef struct qdf_packed {
 	uint8_t major;
 	uint8_t minor;
 	uint8_t patch;
@@ -98,7 +98,7 @@ typedef struct cdf_packed {
  * @num_channels: Num of channels IDs to follow
  * @channel_list: List of channel IDs
  */
-typedef struct cdf_packed {
+typedef struct qdf_packed {
 	uint8_t oem_target_signature[OEM_TARGET_SIGNATURE_LEN];
 	uint32_t oem_target_type;
 	uint32_t oem_fw_version;
@@ -125,7 +125,7 @@ typedef struct cdf_packed {
  *	max power, reg power and reg class id
  * @reg_info_2: regulatory information field 2 which contains antennamax
  */
-typedef struct cdf_packed {
+typedef struct qdf_packed {
 	uint32_t chan_id;
 	uint32_t reserved0;
 	uint32_t mhz;
@@ -145,7 +145,7 @@ typedef struct cdf_packed {
  * @reserved0: reserved0
  * @peer_chan_info: channel info on which peer is connected
  */
-typedef struct cdf_packed {
+typedef struct qdf_packed {
 	uint8_t peer_mac_addr[ETH_ALEN];
 	uint8_t peer_status;
 	uint8_t vdev_id;
@@ -174,7 +174,7 @@ struct oem_get_capability_rsp {
 	struct sme_oem_capability cap;
 };
 
-void hdd_send_peer_status_ind_to_oem_app(struct cdf_mac_addr *peerMac,
+void hdd_send_peer_status_ind_to_oem_app(struct qdf_mac_addr *peerMac,
 					 uint8_t peerStatus,
 					 uint8_t peerTimingMeasCap,
 					 uint8_t sessionId,

core/hdd/inc/wlan_hdd_softap_tx_rx.h

@@ -43,7 +43,7 @@ QDF_STATUS hdd_softap_init_tx_rx(hdd_adapter_t *pAdapter);
 QDF_STATUS hdd_softap_deinit_tx_rx(hdd_adapter_t *pAdapter);
 QDF_STATUS hdd_softap_init_tx_rx_sta(hdd_adapter_t *pAdapter,
 				     uint8_t STAId,
-				     struct cdf_mac_addr *pmacAddrSTA);
+				     struct qdf_mac_addr *pmacAddrSTA);
 QDF_STATUS hdd_softap_deinit_tx_rx_sta(hdd_adapter_t *pAdapter,
 				       uint8_t STAId);
 QDF_STATUS hdd_softap_rx_packet_cbk(void *cds_context,
@@ -62,17 +62,17 @@ QDF_STATUS hdd_softap_register_sta(hdd_adapter_t *pAdapter,
 				   uint8_t staId,
 				   uint8_t ucastSig,
 				   uint8_t bcastSig,
-				   struct cdf_mac_addr *pPeerMacAddress,
+				   struct qdf_mac_addr *pPeerMacAddress,
 				   bool fWmmEnabled);
 QDF_STATUS hdd_softap_register_bc_sta(hdd_adapter_t *pAdapter,
 				      bool fPrivacyBit);
 QDF_STATUS hdd_softap_deregister_bc_sta(hdd_adapter_t *pAdapter);
 QDF_STATUS hdd_softap_stop_bss(hdd_adapter_t *pHostapdAdapter);
 QDF_STATUS hdd_softap_change_sta_state(hdd_adapter_t *pAdapter,
-				       struct cdf_mac_addr *pDestMacAddress,
+				       struct qdf_mac_addr *pDestMacAddress,
 				       enum ol_txrx_peer_state state);
 QDF_STATUS hdd_softap_get_sta_id(hdd_adapter_t *pAdapter,
-				 struct cdf_mac_addr *pMacAddress,
+				 struct qdf_mac_addr *pMacAddress,
 				 uint8_t *staId);
 
 #ifdef QCA_LL_LEGACY_TX_FLOW_CONTROL

core/hdd/inc/wlan_hdd_tdls.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -361,7 +361,7 @@ typedef struct _hddTdlsPeer_t {
 typedef struct {
 	uint8_t sessionId;
 	uint8_t staId;
-	struct cdf_mac_addr peerMac;
+	struct qdf_mac_addr peerMac;
 } tdlsConnInfo_t;
 
 /**

core/hdd/inc/wlan_hdd_tx_rx.h

@@ -66,7 +66,7 @@ QDF_STATUS hdd_rx_mul_packet_cbk(void *cds_context,
 #endif /* IPA_OFFLOAD */
 
 QDF_STATUS hdd_ibss_get_sta_id(hdd_station_ctx_t *pHddStaCtx,
-			       struct cdf_mac_addr *pMacAddress,
+			       struct qdf_mac_addr *pMacAddress,
 			       uint8_t *staId);
 
 #ifdef QCA_LL_LEGACY_TX_FLOW_CONTROL

core/hdd/inc/wlan_hdd_wext.h

@@ -229,7 +229,7 @@ typedef struct hdd_wext_state_s {
 	tCsrRoamProfile roamProfile;
 
 	/** BSSID to which connect request is received */
-	struct cdf_mac_addr req_bssId;
+	struct qdf_mac_addr req_bssId;
 
 	/** The association status code */
 	uint32_t statusCode;
@@ -339,7 +339,7 @@ extern int hdd_priv_get_data(struct iw_point *p_priv_data,
 extern void *mem_alloc_copy_from_user_helper(const void *wrqu_data, size_t len);
 
 extern QDF_STATUS wlan_hdd_get_linkspeed_for_peermac(hdd_adapter_t *pAdapter,
-					     struct cdf_mac_addr mac_address);
+					     struct qdf_mac_addr mac_address);
 void hdd_clear_roam_profile_ie(hdd_adapter_t *pAdapter);
 
 uint8_t *wlan_hdd_get_vendor_oui_ie_ptr(uint8_t *oui, uint8_t oui_size,

core/hdd/inc/wlan_hdd_wowl.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.
  *
@@ -102,7 +102,7 @@
  * attempt to BMPS fails, request for WoWL will be rejected.
  */
 
-#include <cdf_types.h>
+#include <qdf_types.h>
 
 #define WOWL_PTRN_MAX_SIZE          146
 #define WOWL_PTRN_MASK_MAX_SIZE      19

core/hdd/src/wlan_hdd_assoc.c

@@ -516,8 +516,8 @@ static void hdd_send_ft_event(hdd_adapter_t *pAdapter)
 
 	ftEvent.target_ap = ftIe;
 
-	ftEvent.ies = (u8 *) (ftIe + CDF_MAC_ADDR_SIZE);
-	ftEvent.ies_len = auth_resp_len - CDF_MAC_ADDR_SIZE;
+	ftEvent.ies = (u8 *) (ftIe + QDF_MAC_ADDR_SIZE);
+	ftEvent.ies_len = auth_resp_len - QDF_MAC_ADDR_SIZE;
 
 	hddLog(LOG1, FL("ftEvent.ies_len %zu"), ftEvent.ies_len);
 	hddLog(LOG1, FL("ftEvent.ric_ies_len %zu"), ftEvent.ric_ies_len);
@@ -664,7 +664,7 @@ hdd_send_update_beacon_ies_event(hdd_adapter_t *pAdapter,
 		 */
 		cdf_mem_zero(&buff[strLen + 1], IW_CUSTOM_MAX - (strLen + 1));
 		currentLen =
-			CDF_MIN(totalIeLen, IW_CUSTOM_MAX - (strLen + 1) - 1);
+			QDF_MIN(totalIeLen, IW_CUSTOM_MAX - (strLen + 1) - 1);
 		cdf_mem_copy(&buff[strLen + 1], pBeaconIes + currentOffset,
 			     currentLen);
 		currentOffset += currentLen;
@@ -699,7 +699,7 @@ static void hdd_send_association_event(struct net_device *dev,
 	union iwreq_data wrqu;
 	int we_event;
 	char *msg;
-	struct cdf_mac_addr peerMacAddr;
+	struct qdf_mac_addr peerMacAddr;
 
 	/* Added to find the auth type on the fly at run time */
 	/* rather than with cfg to see if FT is enabled */
@@ -893,9 +893,9 @@ static void hdd_conn_remove_connect_info(hdd_station_ctx_t *pHddStaCtx)
 {
 	/* Remove staId, bssId and peerMacAddress */
 	pHddStaCtx->conn_info.staId[0] = 0;
-	cdf_mem_zero(&pHddStaCtx->conn_info.bssId, CDF_MAC_ADDR_SIZE);
+	cdf_mem_zero(&pHddStaCtx->conn_info.bssId, QDF_MAC_ADDR_SIZE);
 	cdf_mem_zero(&pHddStaCtx->conn_info.peerMacAddress[0],
-		     CDF_MAC_ADDR_SIZE);
+		     QDF_MAC_ADDR_SIZE);
 
 	/* Clear all security settings */
 	pHddStaCtx->conn_info.authType = eCSR_AUTH_TYPE_OPEN_SYSTEM;
@@ -1107,7 +1107,7 @@ static QDF_STATUS hdd_dis_connect_handler(hdd_adapter_t *pAdapter,
 			 */
 			pHddStaCtx->conn_info.staId[i] = 0;
 			cdf_mem_zero(&pHddStaCtx->conn_info.peerMacAddress[i],
-				sizeof(struct cdf_mac_addr));
+				sizeof(struct qdf_mac_addr));
 			if (sta_id < (WLAN_MAX_STA_COUNT + 3))
 				pHddCtx->sta_to_adapter[sta_id] = NULL;
 		}
@@ -1162,7 +1162,7 @@ static QDF_STATUS hdd_dis_connect_handler(hdd_adapter_t *pAdapter,
  */
 void hdd_set_peer_authorized_event(uint32_t vdev_id)
 {
-	hdd_context_t *hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD);
+	hdd_context_t *hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
 	hdd_adapter_t *adapter = NULL;
 
 	adapter = hdd_get_adapter_by_vdev(hdd_ctx, vdev_id);
@@ -1188,7 +1188,7 @@ QDF_STATUS hdd_change_peer_state(hdd_adapter_t *pAdapter,
 {
 	struct ol_txrx_peer_t *peer;
 	QDF_STATUS err;
-	struct ol_txrx_pdev_t *pdev = cds_get_context(CDF_MODULE_ID_TXRX);
+	struct ol_txrx_pdev_t *pdev = cds_get_context(QDF_MODULE_ID_TXRX);
 
 	if (!pdev) {
 		hdd_err("Failed to get txrx context");
@@ -1263,7 +1263,7 @@ QDF_STATUS hdd_change_peer_state(hdd_adapter_t *pAdapter,
 static QDF_STATUS hdd_roam_register_sta(hdd_adapter_t *pAdapter,
 					tCsrRoamInfo *pRoamInfo,
 					uint8_t staId,
-					struct cdf_mac_addr *pPeerMacAddress,
+					struct qdf_mac_addr *pPeerMacAddress,
 					tSirBssDescription *pBssDesc)
 {
 	QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE;
@@ -1437,7 +1437,7 @@ static void hdd_send_re_assoc_event(struct net_device *dev,
 			roam_profile.SSID.length);
 	ssid_ie_len = 2 + roam_profile.SSID.length;
 	hdd_notice("SSIDIE:");
-	CDF_TRACE_HEX_DUMP(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_DEBUG,
+	CDF_TRACE_HEX_DUMP(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_DEBUG,
 			   buf_ssid_ie, ssid_ie_len);
 	final_req_ie = kmalloc(IW_GENERIC_IE_MAX, GFP_KERNEL);
 	if (final_req_ie == NULL)
@@ -1450,7 +1450,7 @@ static void hdd_send_re_assoc_event(struct net_device *dev,
 	cdf_mem_zero(final_req_ie + (ssid_ie_len + reqRsnLength),
 		IW_GENERIC_IE_MAX - (ssid_ie_len + reqRsnLength));
 	hdd_notice("Req RSN IE:");
-	CDF_TRACE_HEX_DUMP(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_DEBUG,
+	CDF_TRACE_HEX_DUMP(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_DEBUG,
 			   final_req_ie, (ssid_ie_len + reqRsnLength));
 	cfg80211_roamed_bss(dev, bss,
 			final_req_ie, (ssid_ie_len + reqRsnLength),
@@ -1461,7 +1461,7 @@ static void hdd_send_re_assoc_event(struct net_device *dev,
 		pCsrRoamInfo->nAssocReqLength);
 
 	hdd_notice("ReAssoc Req IE dump");
-	CDF_TRACE_HEX_DUMP(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_DEBUG,
+	CDF_TRACE_HEX_DUMP(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_DEBUG,
 		assoc_req_ies, pCsrRoamInfo->nAssocReqLength);
 
 	wlan_hdd_send_roam_auth_event(pHddCtx, pCsrRoamInfo->bssid.bytes,
@@ -1666,9 +1666,9 @@ void hdd_perform_roam_set_key_complete(hdd_adapter_t *pAdapter)
 	tCsrRoamInfo roamInfo;
 	roamInfo.fAuthRequired = false;
 	cdf_mem_copy(roamInfo.bssid.bytes,
-		     pHddStaCtx->roam_info.bssid, CDF_MAC_ADDR_SIZE);
+		     pHddStaCtx->roam_info.bssid, QDF_MAC_ADDR_SIZE);
 	cdf_mem_copy(roamInfo.peerMac.bytes,
-		     pHddStaCtx->roam_info.peerMac, CDF_MAC_ADDR_SIZE);
+		     pHddStaCtx->roam_info.peerMac, QDF_MAC_ADDR_SIZE);
 
 	cdf_ret_status =
 			hdd_roam_set_key_complete_handler(pAdapter,
@@ -1950,7 +1950,7 @@ static QDF_STATUS hdd_association_completion_handler(hdd_adapter_t *pAdapter,
 						hdd_notice(
 							"Reassoc Req IE dump");
 						CDF_TRACE_HEX_DUMP(
-							CDF_MODULE_ID_HDD,
+							QDF_MODULE_ID_HDD,
 							CDF_TRACE_LEVEL_DEBUG,
 							pFTAssocReq,
 							assocReqlen);
@@ -1986,11 +1986,11 @@ static QDF_STATUS hdd_association_completion_handler(hdd_adapter_t *pAdapter,
 						cdf_mem_copy(pHddStaCtx->
 							     roam_info.bssid,
 							     pRoamInfo->bssid.bytes,
-							     CDF_MAC_ADDR_SIZE);
+							     QDF_MAC_ADDR_SIZE);
 						cdf_mem_copy(pHddStaCtx->
 							     roam_info.peerMac,
 							     pRoamInfo->peerMac.bytes,
-							     CDF_MAC_ADDR_SIZE);
+							     QDF_MAC_ADDR_SIZE);
 						pHddStaCtx->roam_info.roamId =
 							roamId;
 						pHddStaCtx->roam_info.
@@ -2340,8 +2340,8 @@ static void hdd_roam_ibss_indication_handler(hdd_adapter_t *pAdapter,
 			(hdd_context_t *) pAdapter->pHddCtx;
 		hdd_station_ctx_t *hdd_sta_ctx =
 			WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
-		struct cdf_mac_addr broadcastMacAddr =
-			CDF_MAC_ADDR_BROADCAST_INITIALIZER;
+		struct qdf_mac_addr broadcastMacAddr =
+			QDF_MAC_ADDR_BROADCAST_INITIALIZER;
 
 		if (NULL == pRoamInfo) {
 			CDF_ASSERT(0);
@@ -2464,7 +2464,7 @@ static void hdd_roam_ibss_indication_handler(hdd_adapter_t *pAdapter,
  *	false otherwise.
  */
 static bool roam_save_ibss_station(hdd_station_ctx_t *pHddStaCtx, uint8_t staId,
-				  struct cdf_mac_addr *peerMacAddress)
+				  struct qdf_mac_addr *peerMacAddress)
 {
 	bool fSuccess = false;
 	int idx = 0;
@@ -3077,7 +3077,7 @@ hdd_roam_tdls_status_update_handler(hdd_adapter_t *pAdapter,
 				cdf_mem_zero(&pHddCtx->
 					     tdlsConnInfo[staIdx].
 					     peerMac,
-					     CDF_MAC_ADDR_SIZE);
+					     QDF_MAC_ADDR_SIZE);
 				status = QDF_STATUS_SUCCESS;
 				break;
 			}
@@ -3138,7 +3138,7 @@ hdd_roam_tdls_status_update_handler(hdd_adapter_t *pAdapter,
 					     &pHddCtx->
 					     tdlsConnInfo[staIdx].
 					     peerMac.bytes,
-					     CDF_MAC_ADDR_SIZE);
+					     QDF_MAC_ADDR_SIZE);
 				smeTdlsPeerStateParams.peerState =
 					eSME_TDLS_PEER_STATE_TEARDOWN;
 
@@ -3171,7 +3171,7 @@ hdd_roam_tdls_status_update_handler(hdd_adapter_t *pAdapter,
 				cdf_mem_zero(&pHddCtx->
 					     tdlsConnInfo[staIdx].
 					     peerMac,
-					     CDF_MAC_ADDR_SIZE);
+					     QDF_MAC_ADDR_SIZE);
 				pHddCtx->tdlsConnInfo[staIdx].staId = 0;
 				pHddCtx->tdlsConnInfo[staIdx].
 				sessionId = 255;
@@ -3184,12 +3184,12 @@ hdd_roam_tdls_status_update_handler(hdd_adapter_t *pAdapter,
 	case eCSR_ROAM_RESULT_TDLS_SHOULD_DISCOVER:
 	{
 		/* ignore TDLS_SHOULD_DISCOVER if any concurrency detected */
-		if (((1 << CDF_STA_MODE) != pHddCtx->concurrency_mode) ||
-		    (pHddCtx->no_of_active_sessions[CDF_STA_MODE] > 1)) {
+		if (((1 << QDF_STA_MODE) != pHddCtx->concurrency_mode) ||
+		    (pHddCtx->no_of_active_sessions[QDF_STA_MODE] > 1)) {
 			hddLog(LOG2,
 				FL("concurrency detected. ignore SHOULD_DISCOVER concurrency_mode: 0x%x, active_sessions: %d"),
 				 pHddCtx->concurrency_mode,
-				 pHddCtx->no_of_active_sessions[CDF_STA_MODE]);
+				 pHddCtx->no_of_active_sessions[QDF_STA_MODE]);
 			status = QDF_STATUS_E_FAILURE;
 			break;
 		}
@@ -3498,9 +3498,9 @@ hdd_indicate_cckm_pre_auth(hdd_adapter_t *pAdapter, tCsrRoamInfo *pRoamInfo)
 	pos += nBytes;
 	freeBytes -= nBytes;
 
-	cdf_mem_copy(pos, pRoamInfo->bssid.bytes, CDF_MAC_ADDR_SIZE);
-	pos += CDF_MAC_ADDR_SIZE;
-	freeBytes -= CDF_MAC_ADDR_SIZE;
+	cdf_mem_copy(pos, pRoamInfo->bssid.bytes, QDF_MAC_ADDR_SIZE);
+	pos += QDF_MAC_ADDR_SIZE;
+	freeBytes -= QDF_MAC_ADDR_SIZE;
 
 	nBytes = snprintf(pos, freeBytes, " %u:%u",
 			  pRoamInfo->timestamp[0], pRoamInfo->timestamp[1]);
@@ -3861,7 +3861,7 @@ hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *pRoamInfo, uint32_t roamId,
 	pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter);
 	pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
 
-	MTRACE(cdf_trace(CDF_MODULE_ID_HDD, TRACE_CODE_HDD_RX_SME_MSG,
+	MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_RX_SME_MSG,
 				pAdapter->sessionId, roamStatus));
 
 	switch (roamStatus) {
@@ -4388,7 +4388,7 @@ static int32_t hdd_process_genie(hdd_adapter_t *pAdapter,
 			 * in the bssid.
 			 */
 			cdf_mem_copy(PMKIDCache[i].BSSID.bytes,
-				     bssid, CDF_MAC_ADDR_SIZE);
+				     bssid, QDF_MAC_ADDR_SIZE);
 			cdf_mem_copy(PMKIDCache[i].PMKID,
 				     dot11RSNIE.pmkid[i], CSR_RSN_PMKID_SIZE);
 		}
@@ -5381,7 +5381,7 @@ static int __iw_set_ap_address(struct net_device *dev,
 	pMacAddress = (uint8_t *) wrqu->ap_addr.sa_data;
 	hddLog(LOG1, FL(" " MAC_ADDRESS_STR), MAC_ADDR_ARRAY(pMacAddress));
 	cdf_mem_copy(pHddStaCtx->conn_info.bssId.bytes, pMacAddress,
-		     sizeof(struct cdf_mac_addr));
+		     sizeof(struct qdf_mac_addr));
 	EXIT();
 
 	return 0;
@@ -5440,7 +5440,7 @@ static int __iw_get_ap_address(struct net_device *dev,
 	    eConnectionState_IbssConnected == pHddStaCtx->conn_info.connState) {
 		cdf_mem_copy(wrqu->ap_addr.sa_data,
 				pHddStaCtx->conn_info.bssId.bytes,
-				CDF_MAC_ADDR_SIZE);
+				QDF_MAC_ADDR_SIZE);
 	} else {
 		memset(wrqu->ap_addr.sa_data, 0, sizeof(wrqu->ap_addr.sa_data));
 	}

core/hdd/src/wlan_hdd_cfg80211.c

@@ -60,7 +60,7 @@
 #include "wlan_hdd_main.h"
 #include "wlan_hdd_power.h"
 #include "wlan_hdd_trace.h"
-#include "cdf_types.h"
+#include "qdf_types.h"
 #include "cdf_trace.h"
 #include "cds_utils.h"
 #include "cds_sched.h"
@@ -671,7 +671,7 @@ static int __wlan_hdd_cfg80211_get_tdls_capabilities(struct wiphy *wiphy,
 	struct sk_buff *skb;
 	uint32_t set = 0;
 
-	if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
 		return -EPERM;
 	}
@@ -1106,7 +1106,7 @@ static int __is_driver_dfs_capable(struct wiphy *wiphy,
 	if (ret_val)
 		return ret_val;
 
-	if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
 		return -EPERM;
 	}
@@ -1346,7 +1346,7 @@ static int wlan_hdd_cfg80211_start_acs(hdd_adapter_t *adapter)
 	acs_event_callback = hdd_hostapd_sap_event_cb;
 
 	cdf_mem_copy(sap_config->self_macaddr.bytes,
-		adapter->macAddressCurrent.bytes, sizeof(struct cdf_mac_addr));
+		adapter->macAddressCurrent.bytes, sizeof(struct qdf_mac_addr));
 	hddLog(LOG1, FL("ACS Started for wlan%d"), adapter->dev->ifindex);
 	status = wlansap_acs_chselect(
 #ifdef WLAN_FEATURE_MBSSID
@@ -1413,7 +1413,7 @@ static int __wlan_hdd_cfg80211_do_acs(struct wiphy *wiphy,
 	 * [QCA_WLAN_VENDOR_ATTR_ACS_CH_LIST] = { .type = NLA_NESTED },
 	 */
 
-	if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
 		return -EPERM;
 	}
@@ -1802,7 +1802,7 @@ __wlan_hdd_cfg80211_get_supported_features(struct wiphy *wiphy,
 
 	ENTER();
 
-	if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
 		return -EPERM;
 	}
@@ -1943,7 +1943,7 @@ __wlan_hdd_cfg80211_set_scanning_mac_oui(struct wiphy *wiphy,
 
 	ENTER();
 
-	if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
 		return -EPERM;
 	}
@@ -2068,7 +2068,7 @@ __wlan_hdd_cfg80211_get_features(struct wiphy *wiphy,
 	if (ret_val)
 		return ret_val;
 
-	if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
 		return -EPERM;
 	}
@@ -2187,7 +2187,7 @@ __wlan_hdd_cfg80211_set_ext_roam_params(struct wiphy *wiphy,
 	uint32_t buf_len = 0;
 	int ret;
 
-	if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
 		return -EPERM;
 	}
@@ -2379,7 +2379,7 @@ __wlan_hdd_cfg80211_set_ext_roam_params(struct wiphy *wiphy,
 			}
 			nla_memcpy(roam_params.bssid_favored[i].bytes,
 				tb2[QCA_WLAN_VENDOR_ATTR_ROAMING_PARAM_SET_LAZY_ROAM_BSSID],
-				CDF_MAC_ADDR_SIZE);
+				QDF_MAC_ADDR_SIZE);
 			hdd_debug(MAC_ADDRESS_STR,
 			    MAC_ADDR_ARRAY(roam_params.bssid_favored[i].bytes));
 			/* Parse and fetch preference factor*/
@@ -2424,7 +2424,7 @@ __wlan_hdd_cfg80211_set_ext_roam_params(struct wiphy *wiphy,
 			}
 			nla_memcpy(roam_params.bssid_avoid_list[i].bytes,
 				tb2[QCA_WLAN_VENDOR_ATTR_ROAMING_PARAM_SET_BSSID_PARAMS_BSSID],
-				CDF_MAC_ADDR_SIZE);
+				QDF_MAC_ADDR_SIZE);
 			hdd_debug(MAC_ADDRESS_STR,
 				MAC_ADDR_ARRAY(
 				roam_params.bssid_avoid_list[i].bytes));
@@ -2717,7 +2717,7 @@ static int __wlan_hdd_cfg80211_keymgmt_set_key(struct wiphy *wiphy,
 	hdd_context_t *hdd_ctx_ptr;
 	int status;
 
-	if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
 		return -EPERM;
 	}
@@ -2806,7 +2806,7 @@ __wlan_hdd_cfg80211_get_wifi_info(struct wiphy *wiphy,
 	int status;
 	struct sk_buff *reply_skb = NULL;
 
-	if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
 		return -EPERM;
 	}
@@ -2903,7 +2903,7 @@ __wlan_hdd_cfg80211_get_logger_supp_feature(struct wiphy *wiphy,
 	uint32_t features;
 	struct sk_buff *reply_skb = NULL;
 
-	if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
 		return -EPERM;
 	}
@@ -3137,7 +3137,7 @@ __wlan_hdd_cfg80211_wifi_configuration_set(struct wiphy *wiphy,
 	u32 guard_time;
 	QDF_STATUS status;
 
-	if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
 		return -EPERM;
 	}
@@ -3256,7 +3256,7 @@ static int __wlan_hdd_cfg80211_wifi_logger_start(struct wiphy *wiphy,
 	struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_WIFI_LOGGER_START_MAX + 1];
 	struct sir_wifi_start_log start_log;
 
-	if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
 		return -EPERM;
 	}
@@ -3380,7 +3380,7 @@ static int __wlan_hdd_cfg80211_wifi_logger_get_ring_data(struct wiphy *wiphy,
 	struct nlattr *tb
 		[QCA_WLAN_VENDOR_ATTR_WIFI_LOGGER_GET_RING_DATA_MAX + 1];
 
-	if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
 		return -EPERM;
 	}
@@ -3556,7 +3556,7 @@ wlan_hdd_add_tx_ptrn(hdd_adapter_t *adapter, hdd_context_t *hdd_ctx,
 	QDF_STATUS status;
 	uint32_t request_id, ret, len;
 	uint8_t pattern_id = 0;
-	struct cdf_mac_addr dst_addr;
+	struct qdf_mac_addr dst_addr;
 	uint16_t eth_type = htons(ETH_P_IP);
 
 	if (!hdd_conn_is_connected(WLAN_HDD_GET_STATION_CTX_PTR(adapter))) {
@@ -3599,7 +3599,7 @@ wlan_hdd_add_tx_ptrn(hdd_adapter_t *adapter, hdd_context_t *hdd_ctx,
 		goto fail;
 	}
 	nla_memcpy(add_req->mac_address.bytes, tb[PARAM_SRC_MAC_ADDR],
-			CDF_MAC_ADDR_SIZE);
+			QDF_MAC_ADDR_SIZE);
 	hddLog(LOG1, "input src mac address: "MAC_ADDRESS_STR,
 			MAC_ADDR_ARRAY(add_req->mac_address.bytes));
 
@@ -3613,7 +3613,7 @@ wlan_hdd_add_tx_ptrn(hdd_adapter_t *adapter, hdd_context_t *hdd_ctx,
 		hddLog(LOGE, FL("attr dst mac address failed"));
 		goto fail;
 	}
-	nla_memcpy(dst_addr.bytes, tb[PARAM_DST_MAC_ADDR], CDF_MAC_ADDR_SIZE);
+	nla_memcpy(dst_addr.bytes, tb[PARAM_DST_MAC_ADDR], QDF_MAC_ADDR_SIZE);
 	hddLog(LOG1, "input dst mac address: "MAC_ADDRESS_STR,
 			MAC_ADDR_ARRAY(dst_addr.bytes));
 
@@ -3633,11 +3633,11 @@ wlan_hdd_add_tx_ptrn(hdd_adapter_t *adapter, hdd_context_t *hdd_ctx,
 	}
 
 	len = 0;
-	cdf_mem_copy(&add_req->ucPattern[0], dst_addr.bytes, CDF_MAC_ADDR_SIZE);
-	len += CDF_MAC_ADDR_SIZE;
+	cdf_mem_copy(&add_req->ucPattern[0], dst_addr.bytes, QDF_MAC_ADDR_SIZE);
+	len += QDF_MAC_ADDR_SIZE;
 	cdf_mem_copy(&add_req->ucPattern[len], add_req->mac_address.bytes,
-			CDF_MAC_ADDR_SIZE);
-	len += CDF_MAC_ADDR_SIZE;
+			QDF_MAC_ADDR_SIZE);
+	len += QDF_MAC_ADDR_SIZE;
 	cdf_mem_copy(&add_req->ucPattern[len], &eth_type, 2);
 	len += 2;
 
@@ -3766,15 +3766,15 @@ __wlan_hdd_cfg80211_offloaded_packets(struct wiphy *wiphy,
 			[PARAM_REQUEST_ID] = { .type = NLA_U32 },
 			[PARAM_CONTROL] = { .type = NLA_U32 },
 			[PARAM_SRC_MAC_ADDR] = { .type = NLA_BINARY,
-						.len = CDF_MAC_ADDR_SIZE },
+						.len = QDF_MAC_ADDR_SIZE },
 			[PARAM_DST_MAC_ADDR] = { .type = NLA_BINARY,
-						.len = CDF_MAC_ADDR_SIZE },
+						.len = QDF_MAC_ADDR_SIZE },
 			[PARAM_PERIOD] = { .type = NLA_U32 },
 	};
 
 	ENTER();
 
-	if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
 		return -EPERM;
 	}
@@ -4317,7 +4317,7 @@ static int __wlan_hdd_cfg80211_get_link_properties(struct wiphy *wiphy,
 	hdd_adapter_t *adapter = WLAN_HDD_GET_PRIV_PTR(dev);
 	hdd_station_ctx_t *hdd_sta_ctx;
 	struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_MAX+1];
-	uint8_t peer_mac[CDF_MAC_ADDR_SIZE];
+	uint8_t peer_mac[QDF_MAC_ADDR_SIZE];
 	uint32_t sta_id;
 	struct sk_buff *reply_skb;
 	uint32_t rate_flags = 0;
@@ -4327,7 +4327,7 @@ static int __wlan_hdd_cfg80211_get_link_properties(struct wiphy *wiphy,
 
 	ENTER();
 
-	if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
 		return -EPERM;
 	}
@@ -4349,7 +4349,7 @@ static int __wlan_hdd_cfg80211_get_link_properties(struct wiphy *wiphy,
 	}
 
 	cdf_mem_copy(peer_mac, nla_data(tb[QCA_WLAN_VENDOR_ATTR_MAC_ADDR]),
-		     CDF_MAC_ADDR_SIZE);
+		     QDF_MAC_ADDR_SIZE);
 	hddLog(CDF_TRACE_LEVEL_INFO,
 	       FL("peerMac="MAC_ADDRESS_STR" for device_mode:%d"),
 	       MAC_ADDR_ARRAY(peer_mac), adapter->device_mode);
@@ -4360,7 +4360,7 @@ static int __wlan_hdd_cfg80211_get_link_properties(struct wiphy *wiphy,
 		if ((hdd_sta_ctx->conn_info.connState !=
 			eConnectionState_Associated) ||
 		    !cdf_mem_compare(hdd_sta_ctx->conn_info.bssId.bytes,
-			peer_mac, CDF_MAC_ADDR_SIZE)) {
+			peer_mac, QDF_MAC_ADDR_SIZE)) {
 			hddLog(CDF_TRACE_LEVEL_ERROR,
 			       FL("Not Associated to mac "MAC_ADDRESS_STR),
 			       MAC_ADDR_ARRAY(peer_mac));
@@ -4380,7 +4380,7 @@ static int __wlan_hdd_cfg80211_get_link_properties(struct wiphy *wiphy,
 				&adapter->aStaInfo[sta_id].macAddrSTA) &&
 			    cdf_mem_compare(
 				&adapter->aStaInfo[sta_id].macAddrSTA.bytes,
-				peer_mac, CDF_MAC_ADDR_SIZE))
+				peer_mac, QDF_MAC_ADDR_SIZE))
 				break;
 		}
 
@@ -4510,7 +4510,7 @@ static int __wlan_hdd_cfg80211_set_ota_test(struct wiphy *wiphy,
 	QDF_STATUS status;
 	uint32_t current_roam_state;
 
-	if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
 		return -EPERM;
 	}
@@ -5368,7 +5368,7 @@ int wlan_hdd_cfg80211_init(struct device *dev,
 #endif /*FEATURE_WLAN_SCAN_PNO */
 
 #if  defined QCA_WIFI_FTM
-	if (cds_get_conparam() != CDF_GLOBAL_FTM_MODE) {
+	if (cds_get_conparam() != QDF_GLOBAL_FTM_MODE) {
 #endif
 
 	/* even with WIPHY_FLAG_CUSTOM_REGULATORY,
@@ -5473,7 +5473,7 @@ int wlan_hdd_cfg80211_init(struct device *dev,
 	wiphy->signal_type = CFG80211_SIGNAL_TYPE_MBM;
 	wiphy->max_remain_on_channel_duration = MAX_REMAIN_ON_CHANNEL_DURATION;
 
-	if (cds_get_conparam() != CDF_GLOBAL_FTM_MODE) {
+	if (cds_get_conparam() != QDF_GLOBAL_FTM_MODE) {
 		wiphy->n_vendor_commands =
 				ARRAY_SIZE(hdd_wiphy_vendor_commands);
 		wiphy->vendor_commands = hdd_wiphy_vendor_commands;
@@ -5683,7 +5683,7 @@ void wlan_hdd_cfg80211_set_key_wapi(hdd_adapter_t *pAdapter, uint8_t key_index,
 	if (!mac_addr || is_broadcast_ether_addr(mac_addr)) {
 		cdf_set_macaddr_broadcast(&setKey.peerMac);
 	} else {
-		cdf_mem_copy(setKey.peerMac.bytes, mac_addr, CDF_MAC_ADDR_SIZE);
+		cdf_mem_copy(setKey.peerMac.bytes, mac_addr, QDF_MAC_ADDR_SIZE);
 	}
 	setKey.keyLength = key_Len;
 	pKeyPtr = setKey.Key;
@@ -5701,7 +5701,7 @@ void wlan_hdd_cfg80211_set_key_wapi(hdd_adapter_t *pAdapter, uint8_t key_index,
 					  pAdapter->sessionId, &setKey, &roamId);
 	}
 	if (status != 0) {
-		CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
 			  "[%4d] sme_roam_set_key returned ERROR status= %d",
 			  __LINE__, status);
 		pHddStaCtx->roam_info.roamingState = HDD_ROAM_STATE_NONE;
@@ -5861,12 +5861,12 @@ static int __wlan_hdd_cfg80211_change_bss(struct wiphy *wiphy,
 
 	ENTER();
 
-	if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hddLog(LOGE, FL("Command not allowed in FTM mode"));
 		return -EINVAL;
 	}
 
-	MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_CFG80211_CHANGE_BSS,
 			 pAdapter->sessionId, params->ap_isolate));
 	hddLog(LOG1, FL("Device_mode %s(%d), ap_isolate = %d"),
@@ -6016,7 +6016,7 @@ static int __wlan_hdd_cfg80211_change_iface(struct wiphy *wiphy,
 
 	ENTER();
 
-	if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hddLog(LOGE, FL("Command not allowed in FTM mode"));
 		return -EINVAL;
 	}
@@ -6026,7 +6026,7 @@ static int __wlan_hdd_cfg80211_change_iface(struct wiphy *wiphy,
 	if (0 != status)
 		return status;
 
-	MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_CFG80211_CHANGE_IFACE,
 			 pAdapter->sessionId, type));
 
@@ -6120,7 +6120,7 @@ static int __wlan_hdd_cfg80211_change_iface(struct wiphy *wiphy,
 				ndev->dev_addr[3] |= 0xF0;
 				memcpy(pAdapter->macAddressCurrent.
 				       bytes, ndev->dev_addr,
-				       CDF_MAC_ADDR_SIZE);
+				       QDF_MAC_ADDR_SIZE);
 				pr_info("wlan: Generated HotSpot BSSID "
 					MAC_ADDRESS_STR "\n",
 					MAC_ADDR_ARRAY(ndev->dev_addr));
@@ -6301,7 +6301,7 @@ static int __wlan_hdd_change_station(struct wiphy *wiphy,
 	hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
 	hdd_context_t *pHddCtx;
 	hdd_station_ctx_t *pHddStaCtx;
-	struct cdf_mac_addr STAMacAddress;
+	struct qdf_mac_addr STAMacAddress;
 #ifdef FEATURE_WLAN_TDLS
 	tCsrStaParams StaParams = { 0 };
 	uint8_t isBufSta = 0;
@@ -6311,12 +6311,12 @@ static int __wlan_hdd_change_station(struct wiphy *wiphy,
 
 	ENTER();
 
-	if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hddLog(LOGE, FL("Command not allowed in FTM mode"));
 		return -EINVAL;
 	}
 
-	MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_CHANGE_STATION,
 			 pAdapter->sessionId, params->listen_interval));
 
@@ -6327,7 +6327,7 @@ static int __wlan_hdd_change_station(struct wiphy *wiphy,
 
 	pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
 
-	cdf_mem_copy(STAMacAddress.bytes, mac, CDF_MAC_ADDR_SIZE);
+	cdf_mem_copy(STAMacAddress.bytes, mac, QDF_MAC_ADDR_SIZE);
 
 	if ((pAdapter->device_mode == WLAN_HDD_SOFTAP) ||
 	    (pAdapter->device_mode == WLAN_HDD_P2P_GO)) {
@@ -6358,7 +6358,7 @@ static int __wlan_hdd_change_station(struct wiphy *wiphy,
 			 * are an incremental of 1 else an incremental of 4 till the number
 			 * of channels.
 			 */
-			CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+			CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
 				  "%s: params->supported_channels_len: %d",
 				  __func__, params->supported_channels_len);
 			if (0 != params->supported_channels_len) {
@@ -6385,7 +6385,7 @@ static int __wlan_hdd_change_station(struct wiphy *wiphy,
 					no_of_channels =
 						params->supported_channels[i + 1];
 
-					CDF_TRACE(CDF_MODULE_ID_HDD,
+					CDF_TRACE(QDF_MODULE_ID_HDD,
 						  CDF_TRACE_LEVEL_INFO,
 						  "%s: i: %d, j: %d, k: %d, StaParams.supported_channels[%d]: %d, wifi_chan_index: %d, no_of_channels: %d",
 						  __func__, i, j, k, j,
@@ -6409,7 +6409,7 @@ static int __wlan_hdd_change_station(struct wiphy *wiphy,
 						} else {
 							continue;
 						}
-						CDF_TRACE(CDF_MODULE_ID_HDD,
+						CDF_TRACE(QDF_MODULE_ID_HDD,
 							  CDF_TRACE_LEVEL_INFO,
 							  "%s: i: %d, j: %d, k: %d, StaParams.supported_channels[%d]: %d",
 							  __func__, i, j, k,
@@ -6421,11 +6421,11 @@ static int __wlan_hdd_change_station(struct wiphy *wiphy,
 					}
 				}
 				num_unique_channels = j + 1;
-				CDF_TRACE(CDF_MODULE_ID_HDD,
+				CDF_TRACE(QDF_MODULE_ID_HDD,
 					  CDF_TRACE_LEVEL_INFO,
 					  "%s: Unique Channel List", __func__);
 				for (i = 0; i < num_unique_channels; i++) {
-					CDF_TRACE(CDF_MODULE_ID_HDD,
+					CDF_TRACE(QDF_MODULE_ID_HDD,
 						  CDF_TRACE_LEVEL_INFO,
 						  "%s: StaParams.supported_channels[%d]: %d,",
 						  __func__, i,
@@ -6436,7 +6436,7 @@ static int __wlan_hdd_change_station(struct wiphy *wiphy,
 					num_unique_channels = MAX_CHANNEL;
 				StaParams.supported_channels_len =
 					num_unique_channels;
-				CDF_TRACE(CDF_MODULE_ID_HDD,
+				CDF_TRACE(QDF_MODULE_ID_HDD,
 					  CDF_TRACE_LEVEL_INFO,
 					  "%s: After removing duplcates StaParams.supported_channels_len: %d",
 					  __func__,
@@ -6480,13 +6480,13 @@ static int __wlan_hdd_change_station(struct wiphy *wiphy,
 				cdf_mem_copy(StaParams.supported_rates,
 					     params->supported_rates,
 					     StaParams.supported_rates_len);
-				CDF_TRACE(CDF_MODULE_ID_HDD,
+				CDF_TRACE(QDF_MODULE_ID_HDD,
 					  CDF_TRACE_LEVEL_INFO,
 					  "Supported Rates with Length %d",
 					  StaParams.supported_rates_len);
 				for (i = 0; i < StaParams.supported_rates_len;
 				     i++)
-					CDF_TRACE(CDF_MODULE_ID_HDD,
+					CDF_TRACE(QDF_MODULE_ID_HDD,
 						  CDF_TRACE_LEVEL_INFO,
 						  "[%d]: %0x", i,
 						  StaParams.supported_rates[i]);
@@ -6594,12 +6594,12 @@ static int __wlan_hdd_cfg80211_add_key(struct wiphy *wiphy,
 
 	ENTER();
 
-	if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hddLog(LOGE, FL("Command not allowed in FTM mode"));
 		return -EINVAL;
 	}
 
-	MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_CFG80211_ADD_KEY,
 			 pAdapter->sessionId, params->key_len));
 	pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
@@ -6722,16 +6722,16 @@ static int __wlan_hdd_cfg80211_add_key(struct wiphy *wiphy,
 
 	if (!pairwise) {
 		/* set group key */
-		CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
 			  "%s- %d: setting Broadcast key", __func__, __LINE__);
 		setKey.keyDirection = eSIR_RX_ONLY;
 		cdf_set_macaddr_broadcast(&setKey.peerMac);
 	} else {
 		/* set pairwise key */
-		CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
 			  "%s- %d: setting pairwise key", __func__, __LINE__);
 		setKey.keyDirection = eSIR_TX_RX;
-		cdf_mem_copy(setKey.peerMac.bytes, mac_addr, CDF_MAC_ADDR_SIZE);
+		cdf_mem_copy(setKey.peerMac.bytes, mac_addr, QDF_MAC_ADDR_SIZE);
 	}
 	if ((WLAN_HDD_IBSS == pAdapter->device_mode) && !pairwise) {
 		/* if a key is already installed, block all subsequent ones */
@@ -6772,7 +6772,7 @@ static int __wlan_hdd_cfg80211_add_key(struct wiphy *wiphy,
 			status = wlansap_set_key_sta(p_cds_context, &setKey);
 #endif
 			if (status != QDF_STATUS_SUCCESS) {
-				CDF_TRACE(CDF_MODULE_ID_HDD,
+				CDF_TRACE(QDF_MODULE_ID_HDD,
 					  CDF_TRACE_LEVEL_ERROR,
 					  "[%4d] wlansap_set_key_sta returned ERROR status= %d",
 					  __LINE__, status);
@@ -6799,7 +6799,7 @@ static int __wlan_hdd_cfg80211_add_key(struct wiphy *wiphy,
 		if (!pairwise) {
 			/* set group key */
 			if (pHddStaCtx->roam_info.deferKeyComplete) {
-				CDF_TRACE(CDF_MODULE_ID_HDD,
+				CDF_TRACE(QDF_MODULE_ID_HDD,
 					  CDF_TRACE_LEVEL_INFO,
 					  "%s- %d: Perform Set key Complete",
 					  __func__, __LINE__);
@@ -6926,7 +6926,7 @@ static int __wlan_hdd_cfg80211_get_key(struct wiphy *wiphy,
 
 	ENTER();
 
-	if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hddLog(LOGE, FL("Command not allowed in FTM mode"));
 		return -EINVAL;
 	}
@@ -6971,7 +6971,7 @@ static int __wlan_hdd_cfg80211_get_key(struct wiphy *wiphy,
 		break;
 	}
 
-	MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_CFG80211_GET_KEY,
 			 pAdapter->sessionId, params.cipher));
 
@@ -7078,12 +7078,12 @@ static int __wlan_hdd_cfg80211_set_default_key(struct wiphy *wiphy,
 
 	ENTER();
 
-	if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hddLog(LOGE, FL("Command not allowed in FTM mode"));
 		return -EINVAL;
 	}
 
-	MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_CFG80211_SET_DEFAULT_KEY,
 			 pAdapter->sessionId, key_index));
 
@@ -7422,7 +7422,7 @@ wlan_hdd_cfg80211_inform_bss_frame(hdd_adapter_t *pAdapter,
 			bss_desc->rssi;
 
 	/* Supplicant takes the signal strength in terms of mBm(100*dBm) */
-	rssi = CDF_MIN(rssi, 0) * 100;
+	rssi = QDF_MIN(rssi, 0) * 100;
 
 	hddLog(LOG1, FL("BSSID: " MAC_ADDRESS_STR " Channel:%d RSSI:%d"),
 	       MAC_ADDR_ARRAY(mgmt->bssid), chan->center_freq,
@@ -7494,7 +7494,7 @@ int wlan_hdd_cfg80211_update_bss(struct wiphy *wiphy,
 
 	ENTER();
 
-	MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_CFG80211_UPDATE_BSS,
 			 NO_SESSION, pAdapter->sessionId));
 
@@ -7850,29 +7850,29 @@ int wlan_hdd_cfg80211_connect_start(hdd_adapter_t *pAdapter,
 		if (bssid) {
 			pRoamProfile->BSSIDs.numOfBSSIDs = 1;
 			cdf_mem_copy((void *)(pRoamProfile->BSSIDs.bssid),
-				     bssid, CDF_MAC_ADDR_SIZE);
+				     bssid, QDF_MAC_ADDR_SIZE);
 			/* Save BSSID in seperate variable as well, as RoamProfile
 			   BSSID is getting zeroed out in the association process. And in
 			   case of join failure we should send valid BSSID to supplicant
 			 */
 			cdf_mem_copy((void *)(pWextState->req_bssId.bytes),
-					bssid, CDF_MAC_ADDR_SIZE);
+					bssid, QDF_MAC_ADDR_SIZE);
 		} else if (bssid_hint) {
 			pRoamProfile->BSSIDs.numOfBSSIDs = 1;
 			cdf_mem_copy((void *)(pRoamProfile->BSSIDs.bssid),
-						bssid_hint, CDF_MAC_ADDR_SIZE);
+						bssid_hint, QDF_MAC_ADDR_SIZE);
 			/* Save BSSID in separate variable as well, as
 			   RoamProfile BSSID is getting zeroed out in the
 			   association process. And in case of join failure
 			   we should send valid BSSID to supplicant
 			 */
 			cdf_mem_copy((void *)(pWextState->req_bssId.bytes),
-					bssid_hint, CDF_MAC_ADDR_SIZE);
+					bssid_hint, QDF_MAC_ADDR_SIZE);
 			hddLog(LOGW, FL(" bssid_hint "MAC_ADDRESS_STR),
 					MAC_ADDR_ARRAY(bssid_hint));
 		} else {
 			cdf_mem_zero((void *)(pRoamProfile->BSSIDs.bssid),
-				     CDF_MAC_ADDR_SIZE);
+				     QDF_MAC_ADDR_SIZE);
 		}
 
 		hddLog(LOG1, FL("Connect to SSID: %.*s operating Channel: %u"),
@@ -8817,12 +8817,12 @@ static int __wlan_hdd_cfg80211_connect(struct wiphy *wiphy,
 
 	ENTER();
 
-	if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hddLog(LOGE, FL("Command not allowed in FTM mode"));
 		return -EINVAL;
 	}
 
-	MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_CFG80211_CONNECT,
 			 pAdapter->sessionId, pAdapter->device_mode));
 	hddLog(LOG1, FL("Device_mode %s(%d)"),
@@ -9080,12 +9080,12 @@ static int __wlan_hdd_cfg80211_disconnect(struct wiphy *wiphy,
 
 	ENTER();
 
-	if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hddLog(LOGE, FL("Command not allowed in FTM mode"));
 		return -EINVAL;
 	}
 
-	MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_CFG80211_DISCONNECT,
 			 pAdapter->sessionId, reason));
 	hddLog(LOG1, FL("Device_mode %s(%d) reason code(%d)"),
@@ -9309,17 +9309,17 @@ static int __wlan_hdd_cfg80211_join_ibss(struct wiphy *wiphy,
 	int status;
 	hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
 	hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
-	struct cdf_mac_addr bssid;
+	struct qdf_mac_addr bssid;
 	u8 channelNum = 0;
 
 	ENTER();
 
-	if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hddLog(LOGE, FL("Command not allowed in FTM mode"));
 		return -EINVAL;
 	}
 
-	MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_CFG80211_JOIN_IBSS,
 			 pAdapter->sessionId, pAdapter->device_mode));
 	hddLog(LOG1, FL("Device_mode %s(%d)"),
@@ -9425,7 +9425,7 @@ static int __wlan_hdd_cfg80211_join_ibss(struct wiphy *wiphy,
 				FL("ccmCfgStInt failed for WNI_CFG_IBSS_AUTO_BSSID"));
 			return -EIO;
 		}
-		cdf_mem_copy(bssid.bytes, params->bssid, CDF_MAC_ADDR_SIZE);
+		cdf_mem_copy(bssid.bytes, params->bssid, QDF_MAC_ADDR_SIZE);
 	} else if (pHddCtx->config->isCoalesingInIBSSAllowed == 0) {
 		if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_IBSS_AUTO_BSSID, 0)
 				== QDF_STATUS_E_FAILURE) {
@@ -9524,12 +9524,12 @@ static int __wlan_hdd_cfg80211_leave_ibss(struct wiphy *wiphy,
 
 	ENTER();
 
-	if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hddLog(LOGE, FL("Command not allowed in FTM mode"));
 		return -EINVAL;
 	}
 
-	MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_CFG80211_LEAVE_IBSS,
 			 pAdapter->sessionId,
 			 eCSR_DISCONNECT_REASON_IBSS_LEAVE));
@@ -9621,12 +9621,12 @@ static int __wlan_hdd_cfg80211_set_wiphy_params(struct wiphy *wiphy,
 
 	ENTER();
 
-	if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hddLog(LOGE, FL("Command not allowed in FTM mode"));
 		return -EINVAL;
 	}
 
-	MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_CFG80211_SET_WIPHY_PARAMS,
 			 NO_SESSION, wiphy->rts_threshold));
 	status = wlan_hdd_validate_context(pHddCtx);
@@ -9837,12 +9837,12 @@ int __wlan_hdd_cfg80211_del_station(struct wiphy *wiphy,
 
 	ENTER();
 
-	if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hddLog(LOGE, FL("Command not allowed in FTM mode"));
 		return -EINVAL;
 	}
 
-	MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_CFG80211_DEL_STA,
 			 pAdapter->sessionId, pAdapter->device_mode));
 
@@ -9863,7 +9863,7 @@ int __wlan_hdd_cfg80211_del_station(struct wiphy *wiphy,
 			return 0;
 		}
 
-		if (cdf_is_macaddr_broadcast((struct cdf_mac_addr *) mac)) {
+		if (cdf_is_macaddr_broadcast((struct qdf_mac_addr *) mac)) {
 			uint16_t i;
 			for (i = 0; i < WLAN_MAX_STA_COUNT; i++) {
 				if ((pAdapter->aStaInfo[i].isUsed) &&
@@ -9873,7 +9873,7 @@ int __wlan_hdd_cfg80211_del_station(struct wiphy *wiphy,
 						mac,
 						pAdapter->aStaInfo[i].
 							macAddrSTA.bytes,
-						CDF_MAC_ADDR_SIZE);
+						QDF_MAC_ADDR_SIZE);
 					if (hdd_ipa_uc_is_enabled(pHddCtx)) {
 						hdd_ipa_wlan_evt(pAdapter,
 							pAdapter->
@@ -9915,7 +9915,7 @@ int __wlan_hdd_cfg80211_del_station(struct wiphy *wiphy,
 		} else {
 			qdf_status =
 				hdd_softap_get_sta_id(pAdapter,
-					      (struct cdf_mac_addr *) mac,
+					      (struct qdf_mac_addr *) mac,
 					      &staId);
 			if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 				hddLog(LOG1,
@@ -10057,12 +10057,12 @@ static int __wlan_hdd_cfg80211_add_station(struct wiphy *wiphy,
 
 	ENTER();
 
-	if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hddLog(LOGE, FL("Command not allowed in FTM mode"));
 		return -EINVAL;
 	}
 
-	MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_CFG80211_ADD_STA,
 			 pAdapter->sessionId, params->listen_interval));
 
@@ -10136,7 +10136,7 @@ static int __wlan_hdd_cfg80211_set_pmksa(struct wiphy *wiphy,
 
 	ENTER();
 
-	if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hddLog(LOGE, FL("Command not allowed in FTM mode"));
 		return -EINVAL;
 	}
@@ -10162,14 +10162,14 @@ static int __wlan_hdd_cfg80211_set_pmksa(struct wiphy *wiphy,
 
 	halHandle = WLAN_HDD_GET_HAL_CTX(pAdapter);
 
-	cdf_mem_copy(pmk_id.BSSID.bytes, pmksa->bssid, CDF_MAC_ADDR_SIZE);
+	cdf_mem_copy(pmk_id.BSSID.bytes, pmksa->bssid, QDF_MAC_ADDR_SIZE);
 	cdf_mem_copy(pmk_id.PMKID, pmksa->pmkid, CSR_RSN_PMKID_SIZE);
 
 	/* Add to the PMKSA ID Cache in CSR */
 	result = sme_roam_set_pmkid_cache(halHandle, pAdapter->sessionId,
 					  &pmk_id, 1, false);
 
-	MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_CFG80211_SET_PMKSA,
 			 pAdapter->sessionId, result));
 
@@ -10217,7 +10217,7 @@ static int __wlan_hdd_cfg80211_del_pmksa(struct wiphy *wiphy,
 
 	ENTER();
 
-	if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hddLog(LOGE, FL("Command not allowed in FTM mode"));
 		return -EINVAL;
 	}
@@ -10242,7 +10242,7 @@ static int __wlan_hdd_cfg80211_del_pmksa(struct wiphy *wiphy,
 
 	halHandle = WLAN_HDD_GET_HAL_CTX(pAdapter);
 
-	MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_CFG80211_DEL_PMKSA,
 			 pAdapter->sessionId, 0));
 	/* Delete the PMKID CSR cache */
@@ -10297,7 +10297,7 @@ static int __wlan_hdd_cfg80211_flush_pmksa(struct wiphy *wiphy,
 
 	ENTER();
 
-	if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hddLog(LOGE, FL("Command not allowed in FTM mode"));
 		return -EINVAL;
 	}
@@ -10368,12 +10368,12 @@ __wlan_hdd_cfg80211_update_ft_ies(struct wiphy *wiphy,
 	if (status)
 		return status;
 
-	if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hddLog(LOGE, FL("Command not allowed in FTM mode"));
 		return -EINVAL;
 	}
 
-	MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_CFG80211_UPDATE_FT_IES,
 			 pAdapter->sessionId, pHddStaCtx->conn_info.connState));
 	/* Added for debug on reception of Re-assoc Req. */
@@ -10499,12 +10499,12 @@ int __wlan_hdd_cfg80211_set_rekey_data(struct wiphy *wiphy,
 
 	ENTER();
 
-	if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hddLog(LOGE, FL("Command not allowed in FTM mode"));
 		return -EINVAL;
 	}
 
-	MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_CFG80211_SET_REKEY_DATA,
 			 pAdapter->sessionId, pAdapter->device_mode));
 
@@ -10611,7 +10611,7 @@ static int __wlan_hdd_cfg80211_set_mac_acl(struct wiphy *wiphy,
 
 	ENTER();
 
-	if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hddLog(LOGE, FL("Command not allowed in FTM mode"));
 		return -EINVAL;
 	}
@@ -10638,7 +10638,7 @@ static int __wlan_hdd_cfg80211_set_mac_acl(struct wiphy *wiphy,
 	hddLog(LOGE, "acl policy: = %d no acl entries = %d", params->acl_policy,
 		params->n_acl_entries);
 
-	MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_CFG80211_SET_MAC_ACL,
 			 pAdapter->sessionId, pAdapter->device_mode));
 	if (WLAN_HDD_SOFTAP == pAdapter->device_mode) {
@@ -10824,7 +10824,7 @@ static int __wlan_hdd_cfg80211_testmode(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
-	MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_CFG80211_TESTMODE,
 			 NO_SESSION, nla_get_u32(tb[WLAN_HDD_TM_ATTR_CMD])));
 	switch (nla_get_u32(tb[WLAN_HDD_TM_ATTR_CMD])) {
@@ -10945,15 +10945,15 @@ void wlan_hdd_testmode_rx_event(void *buf, size_t buf_len)
 	hdd_context_t *hdd_ctx;
 
 	if (!buf || !buf_len) {
-		CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
 			  "%s: buf or buf_len invalid, buf = %p buf_len = %zu",
 			  __func__, buf, buf_len);
 		return;
 	}
 
-	hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD);
+	hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (!hdd_ctx) {
-		CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
 			  "%s: hdd context invalid", __func__);
 		return;
 	}
@@ -10961,7 +10961,7 @@ void wlan_hdd_testmode_rx_event(void *buf, size_t buf_len)
 	skb = cfg80211_testmode_alloc_event_skb(hdd_ctx->wiphy,
 						buf_len, GFP_KERNEL);
 	if (!skb) {
-		CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
 			  "%s: failed to allocate testmode rx skb!", __func__);
 		return;
 	}
@@ -10977,7 +10977,7 @@ void wlan_hdd_testmode_rx_event(void *buf, size_t buf_len)
 
 nla_put_failure:
 	kfree_skb(skb);
-	CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
 		  "%s: nla_put failed on testmode rx skb!", __func__);
 }
 #endif
@@ -11003,7 +11003,7 @@ __wlan_hdd_cfg80211_set_ap_channel_width(struct wiphy *wiphy,
 	tSmeConfigParams sme_config;
 	bool cbModeChange;
 
-	if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hddLog(LOGE, FL("Command not allowed in FTM mode"));
 		return -EINVAL;
 	}

core/hdd/src/wlan_hdd_conc_ut.c

@@ -35,7 +35,7 @@
 #include "wlan_hdd_trace.h"
 #include "cds_concurrency.h"
 #include "wlan_hdd_conc_ut.h"
-#include "cdf_types.h"
+#include "qdf_types.h"
 #include "cdf_trace.h"
 #include "cds_utils.h"
 #include "cds_reg_service.h"

core/hdd/src/wlan_hdd_debugfs.c

@@ -69,7 +69,7 @@ static ssize_t __wcnss_wowenable_write(struct file *file,
 
 	pAdapter = (hdd_adapter_t *)file->private_data;
 	if ((NULL == pAdapter) || (WLAN_HDD_ADAPTER_MAGIC != pAdapter->magic)) {
-		CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL,
+		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL,
 			  "%s: Invalid adapter or adapter has invalid magic.",
 			  __func__);
 
@@ -83,7 +83,7 @@ static ssize_t __wcnss_wowenable_write(struct file *file,
 
 
 	if (!sme_is_feature_supported_by_fw(WOW)) {
-		CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
 			  "%s: Wake-on-Wireless feature is not supported in firmware!",
 			  __func__);
 
@@ -91,7 +91,7 @@ static ssize_t __wcnss_wowenable_write(struct file *file,
 	}
 
 	if (count > MAX_USER_COMMAND_SIZE_WOWL_ENABLE) {
-		CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
 			  "%s: Command length is larger than %d bytes.",
 			  __func__, MAX_USER_COMMAND_SIZE_WOWL_ENABLE);
 
@@ -114,7 +114,7 @@ static ssize_t __wcnss_wowenable_write(struct file *file,
 	/* Disable wow */
 	if (!wow_enable) {
 		if (!hdd_exit_wowl(pAdapter)) {
-			CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+			CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
 				  "%s: hdd_exit_wowl failed!", __func__);
 
 			return -EFAULT;
@@ -142,7 +142,7 @@ static ssize_t __wcnss_wowenable_write(struct file *file,
 		wow_pbm = 1;
 
 	if (!hdd_enter_wowl(pAdapter, wow_mp, wow_pbm)) {
-		CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
 			  "%s: hdd_enter_wowl failed!", __func__);
 
 		return -EFAULT;
@@ -199,7 +199,7 @@ static ssize_t __wcnss_wowpattern_write(struct file *file,
 	ENTER();
 
 	if ((NULL == pAdapter) || (WLAN_HDD_ADAPTER_MAGIC != pAdapter->magic)) {
-		CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL,
+		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL,
 			  "%s: Invalid adapter or adapter has invalid magic.",
 			  __func__);
 
@@ -212,7 +212,7 @@ static ssize_t __wcnss_wowpattern_write(struct file *file,
 		return ret;
 
 	if (!sme_is_feature_supported_by_fw(WOW)) {
-		CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
 			  "%s: Wake-on-Wireless feature is not supported in firmware!",
 			  __func__);
 
@@ -220,7 +220,7 @@ static ssize_t __wcnss_wowpattern_write(struct file *file,
 	}
 
 	if (count > MAX_USER_COMMAND_SIZE_WOWL_PATTERN) {
-		CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
 			  "%s: Command length is larger than %d bytes.",
 			  __func__, MAX_USER_COMMAND_SIZE_WOWL_PATTERN);
 
@@ -328,7 +328,7 @@ static ssize_t __wcnss_patterngen_write(struct file *file,
 
 	pAdapter = (hdd_adapter_t *)file->private_data;
 	if ((NULL == pAdapter) || (WLAN_HDD_ADAPTER_MAGIC != pAdapter->magic)) {
-		CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL,
+		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL,
 			  "%s: Invalid adapter or adapter has invalid magic.",
 			  __func__);
 
@@ -341,7 +341,7 @@ static ssize_t __wcnss_patterngen_write(struct file *file,
 		return ret;
 
 	if (!sme_is_feature_supported_by_fw(WLAN_PERIODIC_TX_PTRN)) {
-		CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
 			  "%s: Periodic Tx Pattern Offload feature is not supported in firmware!",
 			  __func__);
 		return -EINVAL;
@@ -351,7 +351,7 @@ static ssize_t __wcnss_patterngen_write(struct file *file,
 	if (count <= MAX_USER_COMMAND_SIZE_FRAME)
 		cmd = cdf_mem_malloc(count + 1);
 	else {
-		CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
 			  "%s: Command length is larger than %d bytes.",
 			  __func__, MAX_USER_COMMAND_SIZE_FRAME);
 
@@ -359,7 +359,7 @@ static ssize_t __wcnss_patterngen_write(struct file *file,
 	}
 
 	if (!cmd) {
-		CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
 			  FL("Memory allocation for cmd failed!"));
 		return -ENOMEM;
 	}
@@ -379,7 +379,7 @@ static ssize_t __wcnss_patterngen_write(struct file *file,
 		goto failure;
 
 	if (pattern_idx > (MAXNUM_PERIODIC_TX_PTRNS - 1)) {
-		CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
 			  "%s: Pattern index %d is not in the range (0 ~ %d).",
 			  __func__, pattern_idx, MAXNUM_PERIODIC_TX_PTRNS - 1);
 
@@ -398,7 +398,7 @@ static ssize_t __wcnss_patterngen_write(struct file *file,
 		delPeriodicTxPtrnParams =
 			cdf_mem_malloc(sizeof(tSirDelPeriodicTxPtrn));
 		if (!delPeriodicTxPtrnParams) {
-			CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+			CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
 				  FL("Memory allocation failed!"));
 			cdf_mem_free(cmd);
 			return -ENOMEM;
@@ -412,7 +412,7 @@ static ssize_t __wcnss_patterngen_write(struct file *file,
 		status = sme_del_periodic_tx_ptrn(pHddCtx->hHal,
 						  delPeriodicTxPtrnParams);
 		if (QDF_STATUS_SUCCESS != status) {
-			CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+			CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
 				  "%s: sme_del_periodic_tx_ptrn() failed!",
 				  __func__);
 
@@ -432,7 +432,7 @@ static ssize_t __wcnss_patterngen_write(struct file *file,
 	hdd_info("device mode %d", pAdapter->device_mode);
 	if ((WLAN_HDD_INFRA_STATION == pAdapter->device_mode) &&
 	    (!hdd_conn_is_connected(WLAN_HDD_GET_STATION_CTX_PTR(pAdapter)))) {
-			CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+			CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
 				"%s: Not in Connected state!", __func__);
 			goto failure;
 	}
@@ -448,7 +448,7 @@ static ssize_t __wcnss_patterngen_write(struct file *file,
 
 	/* Since the pattern is a hex string, 2 characters represent 1 byte. */
 	if (pattern_len % 2) {
-		CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
 			  "%s: Malformed pattern!", __func__);
 
 		goto failure;
@@ -456,7 +456,7 @@ static ssize_t __wcnss_patterngen_write(struct file *file,
 		pattern_len >>= 1;
 
 	if (pattern_len < 14 || pattern_len > PERIODIC_TX_PTRN_MAX_SIZE) {
-		CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
 			  "%s: Not an 802.3 frame!", __func__);
 
 		goto failure;
@@ -464,7 +464,7 @@ static ssize_t __wcnss_patterngen_write(struct file *file,
 
 	addPeriodicTxPtrnParams = cdf_mem_malloc(sizeof(tSirAddPeriodicTxPtrn));
 	if (!addPeriodicTxPtrnParams) {
-		CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
 			  FL("Memory allocation failed!"));
 		cdf_mem_free(cmd);
 		return -ENOMEM;
@@ -490,7 +490,7 @@ static ssize_t __wcnss_patterngen_write(struct file *file,
 	status = sme_add_periodic_tx_ptrn(pHddCtx->hHal,
 					  addPeriodicTxPtrnParams);
 	if (QDF_STATUS_SUCCESS != status) {
-		CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
 			  "%s: sme_add_periodic_tx_ptrn() failed!", __func__);
 
 		cdf_mem_free(addPeriodicTxPtrnParams);
@@ -548,7 +548,7 @@ static int __wcnss_debugfs_open(struct inode *inode, struct file *file)
 
 	adapter = (hdd_adapter_t *)file->private_data;
 	if ((NULL == adapter) || (WLAN_HDD_ADAPTER_MAGIC != adapter->magic)) {
-		CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL,
+		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL,
 			  "%s: Invalid adapter or adapter has invalid magic.",
 			  __func__);
 		return -EINVAL;

core/hdd/src/wlan_hdd_driver_ops.c

@@ -183,7 +183,7 @@ static int hdd_init_cds_hif_context(void *hif)
 {
 	QDF_STATUS status;
 
-	status = cds_set_context(CDF_MODULE_ID_HIF, hif);
+	status = cds_set_context(QDF_MODULE_ID_HIF, hif);
 
 	if (status)
 		return -ENOENT;
@@ -200,7 +200,7 @@ static void hdd_deinit_cds_hif_context(void)
 {
 	QDF_STATUS status;
 
-	status = cds_set_context(CDF_MODULE_ID_HIF, NULL);
+	status = cds_set_context(QDF_MODULE_ID_HIF, NULL);
 
 	if (status)
 		hdd_err("Failed to reset CDS HIF Context");
@@ -368,7 +368,7 @@ static int wlan_hdd_probe(struct device *dev, void *bdev, const hif_bus_id *bid,
 	if (ret)
 		goto err_epping_close;
 
-	hif_ctx = cds_get_context(CDF_MODULE_ID_HIF);
+	hif_ctx = cds_get_context(QDF_MODULE_ID_HIF);
 	cdf_dev = cds_get_context(CDF_MODULE_ID_CDF_DEVICE);
 
 	status = ol_cds_init(cdf_dev, hif_ctx);
@@ -455,7 +455,7 @@ static void wlan_hdd_remove(void)
 
 	hdd_cnss_driver_unloading();
 
-	hif_ctx = cds_get_context(CDF_MODULE_ID_HIF);
+	hif_ctx = cds_get_context(QDF_MODULE_ID_HIF);
 
 	hif_disable_power_management(hif_ctx);
 
@@ -483,7 +483,7 @@ static void wlan_hdd_remove(void)
  */
 static void wlan_hdd_shutdown(void)
 {
-	void *hif_ctx = cds_get_context(CDF_MODULE_ID_HIF);
+	void *hif_ctx = cds_get_context(QDF_MODULE_ID_HIF);
 
 	if (cds_is_load_or_unload_in_progress()) {
 		hdd_err("Load/unload in progress, ignore SSR shutdown");
@@ -514,7 +514,7 @@ static void wlan_hdd_shutdown(void)
  */
 void wlan_hdd_crash_shutdown(void)
 {
-	hif_crash_shutdown(cds_get_context(CDF_MODULE_ID_HIF));
+	hif_crash_shutdown(cds_get_context(QDF_MODULE_ID_HIF));
 }
 
 /**
@@ -553,8 +553,8 @@ void wlan_hdd_notify_handler(int state)
  */
 static int __wlan_hdd_bus_suspend(pm_message_t state)
 {
-	void *hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD);
-	void *hif_ctx = cds_get_context(CDF_MODULE_ID_HIF);
+	void *hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
+	void *hif_ctx = cds_get_context(QDF_MODULE_ID_HIF);
 	int err = wlan_hdd_validate_context(hdd_ctx);
 	int status;
 
@@ -626,8 +626,8 @@ int wlan_hdd_bus_suspend(pm_message_t state)
  */
 static int __wlan_hdd_bus_resume(void)
 {
-	void *hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD);
-	void *hif_ctx = cds_get_context(CDF_MODULE_ID_HIF);
+	void *hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
+	void *hif_ctx = cds_get_context(QDF_MODULE_ID_HIF);
 	int status = wlan_hdd_validate_context(hdd_ctx);
 
 	if (0 != status) {
@@ -679,8 +679,8 @@ static int wlan_hdd_bus_resume(void)
  */
 static int __wlan_hdd_runtime_suspend(void)
 {
-	void *hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD);
-	void *hif_ctx = cds_get_context(CDF_MODULE_ID_HIF);
+	void *hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
+	void *hif_ctx = cds_get_context(QDF_MODULE_ID_HIF);
 	int status = wlan_hdd_validate_context(hdd_ctx);
 
 	if (0 != status)
@@ -750,7 +750,7 @@ static int wlan_hdd_runtime_suspend(void)
  */
 static int __wlan_hdd_runtime_resume(void)
 {
-	void *hif_ctx = cds_get_context(CDF_MODULE_ID_HIF);
+	void *hif_ctx = cds_get_context(QDF_MODULE_ID_HIF);
 
 	hif_pre_runtime_resume(hif_ctx);
 	CDF_BUG(!cnss_auto_resume());

core/hdd/src/wlan_hdd_ext_scan.c

@@ -721,7 +721,7 @@ wlan_hdd_cfg80211_extscan_signif_wifi_change_results_ind(
 
 			if (nla_put(skb,
 				QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_SIGNIFICANT_CHANGE_RESULT_BSSID,
-				CDF_MAC_ADDR_SIZE, ap_info->bssid.bytes) ||
+				QDF_MAC_ADDR_SIZE, ap_info->bssid.bytes) ||
 			    nla_put_u32(skb,
 				QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_SIGNIFICANT_CHANGE_RESULT_CHANNEL,
 				ap_info->channel) ||
@@ -1718,7 +1718,7 @@ static int __wlan_hdd_cfg80211_extscan_get_capabilities(struct wiphy *wiphy,
 
 	ENTER();
 
-	if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
 		return -EPERM;
 	}
@@ -1852,7 +1852,7 @@ static int __wlan_hdd_cfg80211_extscan_get_cached_results(struct wiphy *wiphy,
 
 	ENTER();
 
-	if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
 		return -EPERM;
 	}
@@ -2000,7 +2000,7 @@ __wlan_hdd_cfg80211_extscan_set_bssid_hotlist(struct wiphy *wiphy,
 
 	ENTER();
 
-	if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
 		return -EPERM;
 	}
@@ -2075,7 +2075,7 @@ __wlan_hdd_cfg80211_extscan_set_bssid_hotlist(struct wiphy *wiphy,
 		nla_memcpy(pReqMsg->ap[i].bssid.bytes,
 			tb2
 			[QCA_WLAN_VENDOR_ATTR_EXTSCAN_AP_THRESHOLD_PARAM_BSSID],
-			   CDF_MAC_ADDR_SIZE);
+			   QDF_MAC_ADDR_SIZE);
 		hddLog(LOG1, MAC_ADDRESS_STR,
 		       MAC_ADDR_ARRAY(pReqMsg->ap[i].bssid.bytes));
 
@@ -2197,7 +2197,7 @@ __wlan_hdd_cfg80211_extscan_set_significant_change(struct wiphy *wiphy,
 
 	ENTER();
 
-	if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
 		return -EPERM;
 	}
@@ -2294,7 +2294,7 @@ __wlan_hdd_cfg80211_extscan_set_significant_change(struct wiphy *wiphy,
 		nla_memcpy(pReqMsg->ap[i].bssid.bytes,
 			   tb2
 			   [QCA_WLAN_VENDOR_ATTR_EXTSCAN_AP_THRESHOLD_PARAM_BSSID],
-			   CDF_MAC_ADDR_SIZE);
+			   QDF_MAC_ADDR_SIZE);
 		hddLog(LOG1, MAC_ADDRESS_STR,
 		       MAC_ADDR_ARRAY(pReqMsg->ap[i].bssid.bytes));
 
@@ -2479,7 +2479,7 @@ __wlan_hdd_cfg80211_extscan_get_valid_channels(struct wiphy *wiphy,
 
 	ENTER();
 
-	if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
 		return -EPERM;
 	}
@@ -2534,7 +2534,7 @@ __wlan_hdd_cfg80211_extscan_get_valid_channels(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
-	num_channels = CDF_MIN(num_channels, maxChannels);
+	num_channels = QDF_MIN(num_channels, maxChannels);
 
 	hdd_remove_dsrc_channels(wiphy, chan_list, &num_channels);
 
@@ -2831,7 +2831,7 @@ static int hdd_extscan_start_fill_bucket_channel_spec(
 				num_channels);
 
 			req_msg->buckets[bkt_index].numChannels =
-				CDF_MIN(num_channels,
+				QDF_MIN(num_channels,
 					(WLAN_EXTSCAN_MAX_CHANNELS -
 						total_channels));
 			hdd_info("Adj Num channels/bucket: %d total_channels: %d",
@@ -2926,7 +2926,7 @@ static int hdd_extscan_start_fill_bucket_channel_spec(
 			req_msg->buckets[bkt_index].numChannels);
 
 		req_msg->buckets[bkt_index].numChannels =
-			CDF_MIN(req_msg->buckets[bkt_index].numChannels,
+			QDF_MIN(req_msg->buckets[bkt_index].numChannels,
 				(WLAN_EXTSCAN_MAX_CHANNELS - total_channels));
 		hdd_info("Num channels/bucket: %d total_channels: %d",
 			req_msg->buckets[bkt_index].numChannels,
@@ -3144,7 +3144,7 @@ __wlan_hdd_cfg80211_extscan_start(struct wiphy *wiphy,
 
 	ENTER();
 
-	if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
 		return -EPERM;
 	}
@@ -3354,7 +3354,7 @@ __wlan_hdd_cfg80211_extscan_stop(struct wiphy *wiphy,
 
 	ENTER();
 
-	if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
 		return -EPERM;
 	}
@@ -3481,7 +3481,7 @@ __wlan_hdd_cfg80211_extscan_reset_bssid_hotlist(struct wiphy *wiphy,
 
 	ENTER();
 
-	if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
 		return -EPERM;
 	}
@@ -3606,7 +3606,7 @@ __wlan_hdd_cfg80211_extscan_reset_significant_change(struct wiphy
 
 	ENTER();
 
-	if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
 		return -EPERM;
 	}
@@ -3822,7 +3822,7 @@ static int __wlan_hdd_cfg80211_set_epno_list(struct wiphy *wiphy,
 	if (ret_val)
 		return ret_val;
 
-	if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
 		return -EPERM;
 	}
@@ -4028,7 +4028,7 @@ static int __wlan_hdd_cfg80211_set_passpoint_list(struct wiphy *wiphy,
 	if (ret)
 		return ret;
 
-	if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
 		return -EPERM;
 	}
@@ -4144,7 +4144,7 @@ static int __wlan_hdd_cfg80211_reset_passpoint_list(struct wiphy *wiphy,
 	if (ret)
 		return ret;
 
-	if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
 		return -EPERM;
 	}
@@ -4270,7 +4270,7 @@ __wlan_hdd_cfg80211_extscan_set_ssid_hotlist(struct wiphy *wiphy,
 
 	ENTER();
 
-	if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
 		return -EPERM;
 	}
@@ -4490,7 +4490,7 @@ __wlan_hdd_cfg80211_extscan_reset_ssid_hotlist(struct wiphy *wiphy,
 
 	ENTER();
 
-	if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
 		return -EPERM;
 	}

core/hdd/src/wlan_hdd_ftm.c

@@ -35,7 +35,7 @@
 #include "cds_sched.h"
 #include <cds_api.h>
 #include "sir_types.h"
-#include "cdf_types.h"
+#include "qdf_types.h"
 #include "sir_api.h"
 #include "sir_mac_prot_def.h"
 #include "sme_api.h"
@@ -99,7 +99,7 @@ static uint32_t wlan_ftm_postmsg(uint8_t *cmd_ptr, uint16_t cmd_len)
 	ftmMsg.bodyptr = (uint8_t *) cmd_ptr;
 	ftmMsg.bodyval = 0;
 
-	if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA,
+	if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA,
 						      &ftmMsg)) {
 		hddLog(CDF_TRACE_LEVEL_ERROR, "%s: : Failed to post Msg to HAL",
 		       __func__);
@@ -176,7 +176,7 @@ static QDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context,
 	tMacOpenParameters mac_openParms;
 	p_cds_contextType gp_cds_context = (p_cds_contextType) p_cds_context;
 #if  defined(QCA_WIFI_FTM)
-	cdf_device_t cdf_ctx;
+	qdf_device_t cdf_ctx;
 	HTC_INIT_INFO htcInfo;
 	void *pHifContext = NULL;
 	void *pHtcContext = NULL;
@@ -184,11 +184,11 @@ static QDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context,
 #endif
 	hdd_context_t *hdd_ctx;
 
-	CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH,
+	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: Opening CDS", __func__);
 
 	if (NULL == gp_cds_context) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s: Trying to open CDS without a PreOpen", __func__);
 		CDF_ASSERT(0);
 		return QDF_STATUS_E_FAILURE;
@@ -196,7 +196,7 @@ static QDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context,
 
 	/* Initialize the probe event */
 	if (qdf_event_create(&gp_cds_context->ProbeEvent) != QDF_STATUS_SUCCESS) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s: Unable to init probeEvent", __func__);
 		CDF_ASSERT(0);
 		return QDF_STATUS_E_FAILURE;
@@ -204,7 +204,7 @@ static QDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context,
 
 	if (qdf_event_create(&(gp_cds_context->wmaCompleteEvent)) !=
 	    QDF_STATUS_SUCCESS) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s: Unable to init wmaCompleteEvent", __func__);
 		CDF_ASSERT(0);
 
@@ -216,7 +216,7 @@ static QDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context,
 	if (!QDF_IS_STATUS_SUCCESS(vStatus)) {
 
 		/* Critical Error ...  Cannot proceed further */
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s: Failed to initialize CDS free message queue %d",
 			  __func__, vStatus);
 		CDF_ASSERT(0);
@@ -237,7 +237,7 @@ static QDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context,
 
 	if (!QDF_IS_STATUS_SUCCESS(vStatus)) {
 		/* Critical Error ...  Cannot proceed further */
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s: Failed to open CDS Scheduler %d", __func__,
 			  vStatus);
 		CDF_ASSERT(0);
@@ -245,16 +245,16 @@ static QDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context,
 	}
 #if  defined(QCA_WIFI_FTM)
 	/* Initialize BMI and Download firmware */
-	pHifContext = cds_get_context(CDF_MODULE_ID_HIF);
+	pHifContext = cds_get_context(QDF_MODULE_ID_HIF);
 	if (!pHifContext) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL,
 			  "%s: failed to get HIF context", __func__);
 		goto err_sched_close;
 	}
 
 	ol_ctx = cds_get_context(CDF_MODULE_ID_BMI);
 	if (bmi_download_firmware(ol_ctx)) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL,
 			  "%s: BMI failed to download target", __func__);
 		goto err_bmi_close;
 	}
@@ -262,19 +262,19 @@ static QDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context,
 	htcInfo.pContext = ol_ctx;
 	htcInfo.TargetFailure = ol_target_failure;
 	htcInfo.TargetSendSuspendComplete = wma_target_suspend_acknowledge;
-	cdf_ctx = cds_get_context(CDF_MODULE_ID_CDF_DEVICE);
+	cdf_ctx = cds_get_context(QDF_MODULE_ID_QDF_DEVICE);
 
 	/* Create HTC */
 	gp_cds_context->htc_ctx =
 		htc_create(pHifContext, &htcInfo, cdf_ctx);
 	if (!gp_cds_context->htc_ctx) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL,
 			  "%s: Failed to Create HTC", __func__);
 		goto err_bmi_close;
 	}
 
 	if (bmi_done(ol_ctx)) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL,
 			  "%s: Failed to complete BMI phase", __func__);
 		goto err_htc_close;
 	}
@@ -287,7 +287,7 @@ static QDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context,
 	hdd_ctx = (hdd_context_t *) (gp_cds_context->pHDDContext);
 	if ((NULL == hdd_ctx) || (NULL == hdd_ctx->config)) {
 		/* Critical Error ...  Cannot proceed further */
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s: Hdd Context is Null", __func__);
 		CDF_ASSERT(0);
 		goto err_htc_close;
@@ -302,7 +302,7 @@ static QDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context,
 			   wlan_hdd_ftm_update_tgt_cfg, NULL, &mac_openParms);
 	if (!QDF_IS_STATUS_SUCCESS(vStatus)) {
 		/* Critical Error ...  Cannot proceed further */
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s: Failed to open WMA module %d", __func__,
 			  vStatus);
 		CDF_ASSERT(0);
@@ -311,14 +311,14 @@ static QDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context,
 #if  defined(QCA_WIFI_FTM)
 	hdd_update_config(hdd_ctx);
 
-	pHtcContext = cds_get_context(CDF_MODULE_ID_HTC);
+	pHtcContext = cds_get_context(QDF_MODULE_ID_HTC);
 	if (!pHtcContext) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL,
 			  "%s: failed to get HTC context", __func__);
 		goto err_wma_close;
 	}
 	if (htc_wait_target(pHtcContext)) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL,
 			  "%s: Failed to complete BMI phase", __func__);
 		goto err_wma_close;
 	}
@@ -338,7 +338,7 @@ static QDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context,
 
 	if (eSIR_SUCCESS != sirStatus) {
 		/* Critical Error ...  Cannot proceed further */
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s: Failed to open MAC %d", __func__, sirStatus);
 		CDF_ASSERT(0);
 		goto err_wma_close;
@@ -348,7 +348,7 @@ static QDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context,
 	vStatus = sme_open(gp_cds_context->pMACContext);
 	if (!QDF_IS_STATUS_SUCCESS(vStatus)) {
 		/* Critical Error ...  Cannot proceed further */
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s: Failed to open SME %d", __func__, vStatus);
 		goto err_mac_close;
 	}
@@ -356,10 +356,10 @@ static QDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context,
 	vStatus = sme_init_chan_list(gp_cds_context->pMACContext,
 				     hdd_ctx->reg.alpha2, hdd_ctx->reg.cc_src);
 	if (!QDF_IS_STATUS_SUCCESS(vStatus)) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s: Failed to init sme channel list", __func__);
 	} else {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH,
 			  "%s: CDS successfully Opened", __func__);
 		return QDF_STATUS_SUCCESS;
 	}
@@ -417,7 +417,7 @@ static QDF_STATUS wlan_ftm_cds_close(v_CONTEXT_t cds_context)
 #ifndef QCA_WIFI_FTM
 	qdf_status = sme_close(((p_cds_contextType) cds_context)->pMACContext);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s: Failed to close SME %d", __func__, qdf_status);
 		CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
 	}
@@ -425,7 +425,7 @@ static QDF_STATUS wlan_ftm_cds_close(v_CONTEXT_t cds_context)
 
 	qdf_status = mac_close(((p_cds_contextType) cds_context)->pMACContext);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s: Failed to close MAC %d", __func__, qdf_status);
 		CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
 	}
@@ -435,7 +435,7 @@ static QDF_STATUS wlan_ftm_cds_close(v_CONTEXT_t cds_context)
 
 	qdf_status = wma_close(cds_context);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s: Failed to close WMA %d", __func__, qdf_status);
 		CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
 	}
@@ -447,7 +447,7 @@ static QDF_STATUS wlan_ftm_cds_close(v_CONTEXT_t cds_context)
 	}
 	qdf_status = wma_wmi_service_close(cds_context);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s: Failed to close wma_wmi_service", __func__);
 		CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
 	}
@@ -459,7 +459,7 @@ static QDF_STATUS wlan_ftm_cds_close(v_CONTEXT_t cds_context)
 
 	qdf_status = qdf_event_destroy(&gp_cds_context->ProbeEvent);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s: Failed to destroy ProbeEvent %d", __func__,
 			  qdf_status);
 		CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
@@ -467,7 +467,7 @@ static QDF_STATUS wlan_ftm_cds_close(v_CONTEXT_t cds_context)
 
 	qdf_status = qdf_event_destroy(&gp_cds_context->wmaCompleteEvent);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s: Failed to destroy wmaCompleteEvent %d", __func__,
 			  qdf_status);
 		CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
@@ -521,11 +521,11 @@ static QDF_STATUS cds_ftm_pre_start(v_CONTEXT_t cds_context)
 					HDD_FTM_WMA_PRE_START_TIMEOUT);
 	if (qdf_status != QDF_STATUS_SUCCESS) {
 		if (qdf_status == QDF_STATUS_E_TIMEOUT) {
-			CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+			CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 				  "%s: Timeout occurred before WMA complete",
 				  __func__);
 		} else {
-			CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+			CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 				  "%s: wma_pre_start reporting  other error",
 				  __func__);
 		}
@@ -676,7 +676,7 @@ int wlan_hdd_ftm_close(hdd_context_t *hdd_ctx)
 
 	qdf_status = cds_sched_close(cds_context);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s: Failed to close CDS Scheduler", __func__);
 		CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
 	}
@@ -780,7 +780,7 @@ static int wlan_hdd_ftm_start(hdd_context_t *hdd_ctx)
 
 	vStatus = wma_start(p_cds_context);
 	if (vStatus != QDF_STATUS_SUCCESS) {
-		CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
 			  "%s: Failed to start WMA", __func__);
 		goto err_status_failure;
 	}

core/hdd/src/wlan_hdd_green_ap.c

@@ -162,7 +162,7 @@ static void hdd_wlan_green_ap_mc(struct hdd_context_s *hdd_ctx,
 		break;
 
 	case GREEN_AP_PS_STOP_EVENT:
-		if (!(cds_get_concurrency_mode() & CDF_SAP_MASK))
+		if (!(cds_get_concurrency_mode() & QDF_SAP_MASK))
 			green_ap->ps_enable = 0;
 		break;
 
@@ -326,7 +326,7 @@ static QDF_STATUS hdd_wlan_green_ap_attach(struct hdd_context_s *hdd_ctx)
 	green_ap->ps_delay_time = GREEN_AP_PS_DELAY_TIME;
 
 	cdf_mc_timer_init(&green_ap->ps_timer,
-			  CDF_TIMER_TYPE_SW,
+			  QDF_TIMER_TYPE_SW,
 			  hdd_wlan_green_ap_timer_fn, hdd_ctx);
 
 error:
@@ -430,13 +430,13 @@ void hdd_wlan_green_ap_start_bss(struct hdd_context_s *hdd_ctx)
 		 */
 	}
 
-	if (!(CDF_STA_MASK & hdd_ctx->concurrency_mode) &&
+	if (!(QDF_STA_MASK & hdd_ctx->concurrency_mode) &&
 	    cfg->enable2x2 && cfg->enableGreenAP) {
 		hdd_wlan_green_ap_mc(hdd_ctx, GREEN_AP_PS_START_EVENT);
 	} else {
 		hdd_wlan_green_ap_mc(hdd_ctx, GREEN_AP_PS_STOP_EVENT);
 		hdd_notice("Green-AP: is disabled, due to sta_concurrency: %d, enable2x2: %d, enableGreenAP: %d",
-			   CDF_STA_MASK & hdd_ctx->concurrency_mode,
+			   QDF_STA_MASK & hdd_ctx->concurrency_mode,
 			   cfg->enable2x2, cfg->enableGreenAP);
 	}
 exit:

core/hdd/src/wlan_hdd_hostapd.c

@@ -70,7 +70,7 @@
 #include "wma_api.h"
 #endif
 #include "wlan_hdd_trace.h"
-#include "cdf_types.h"
+#include "qdf_types.h"
 #include "cdf_trace.h"
 #include "wlan_hdd_cfg.h"
 #include "cds_concurrency.h"
@@ -219,7 +219,7 @@ static int __hdd_hostapd_open(struct net_device *dev)
 
 	ENTER();
 
-	MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_HOSTAPD_OPEN_REQUEST, NO_SESSION, 0));
 
 	if (cds_is_load_or_unload_in_progress()) {
@@ -589,7 +589,7 @@ static void hdd_issue_stored_joinreq(hdd_adapter_t *sta_adapter,
 	hal_handle = WLAN_HDD_GET_HAL_CTX(sta_adapter);
 
 	if (true ==  cds_is_sta_connection_pending()) {
-		MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+		MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
 				TRACE_CODE_HDD_ISSUE_JOIN_REQ,
 				sta_adapter->sessionId, roam_id));
 		if (QDF_STATUS_SUCCESS !=
@@ -980,7 +980,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
 			qdf_status =
 				cdf_mc_timer_init(&pHddApCtx->
 						  hdd_ap_inactivity_timer,
-						  CDF_TIMER_TYPE_SW,
+						  QDF_TIMER_TYPE_SW,
 						  hdd_hostapd_inactivity_timer_cb,
 						  dev);
 			if (!QDF_IS_STATUS_SUCCESS(qdf_status))
@@ -1229,7 +1229,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
 		msg.src_addr.sa_family = ARPHRD_ETHER;
 		memcpy(msg.src_addr.sa_data,
 		       &pSapEvent->sapevt.sapStationMICFailureEvent.
-		       staMac, CDF_MAC_ADDR_SIZE);
+		       staMac, QDF_MAC_ADDR_SIZE);
 		hddLog(LOG1, "MIC MAC " MAC_ADDRESS_STR,
 		       MAC_ADDR_ARRAY(msg.src_addr.sa_data));
 		if (pSapEvent->sapevt.sapStationMICFailureEvent.
@@ -1265,7 +1265,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
 		wrqu.addr.sa_family = ARPHRD_ETHER;
 		memcpy(wrqu.addr.sa_data,
 		       &pSapEvent->sapevt.sapStationAssocReassocCompleteEvent.
-		       staMac, CDF_MAC_ADDR_SIZE);
+		       staMac, QDF_MAC_ADDR_SIZE);
 		hddLog(LOG1, " associated " MAC_ADDRESS_STR,
 		       MAC_ADDR_ARRAY(wrqu.addr.sa_data));
 		we_event = IWEVREGISTERED;
@@ -1294,7 +1294,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
 						pSapEvent->sapevt.
 						sapStationAssocReassocCompleteEvent.
 						staId, 0, 0,
-						(struct cdf_mac_addr *)
+						(struct qdf_mac_addr *)
 						wrqu.addr.sa_data,
 						pSapEvent->sapevt.
 						sapStationAssocReassocCompleteEvent.
@@ -1312,7 +1312,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
 						pSapEvent->sapevt.
 						sapStationAssocReassocCompleteEvent.
 						staId, 0, 0,
-						(struct cdf_mac_addr *)
+						(struct qdf_mac_addr *)
 						wrqu.addr.sa_data,
 						pSapEvent->sapevt.
 						sapStationAssocReassocCompleteEvent.
@@ -1439,7 +1439,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
 	case eSAP_STA_DISASSOC_EVENT:
 		memcpy(wrqu.addr.sa_data,
 		       &pSapEvent->sapevt.sapStationDisassocCompleteEvent.
-		       staMac, CDF_MAC_ADDR_SIZE);
+		       staMac, QDF_MAC_ADDR_SIZE);
 		hddLog(LOG1, " disassociated " MAC_ADDRESS_STR,
 		       MAC_ADDR_ARRAY(wrqu.addr.sa_data));
 
@@ -1900,9 +1900,9 @@ int hdd_softap_unpack_ie(tHalHandle halHandle,
 		return -EINVAL;
 	}
 	/* Validity checks */
-	if ((gen_ie_len < CDF_MIN(DOT11F_IE_RSN_MIN_LEN, DOT11F_IE_WPA_MIN_LEN))
+	if ((gen_ie_len < QDF_MIN(DOT11F_IE_RSN_MIN_LEN, DOT11F_IE_WPA_MIN_LEN))
 	    || (gen_ie_len >
-		CDF_MAX(DOT11F_IE_RSN_MAX_LEN, DOT11F_IE_WPA_MAX_LEN)))
+		QDF_MAX(DOT11F_IE_RSN_MAX_LEN, DOT11F_IE_WPA_MAX_LEN)))
 		return -EINVAL;
 	/* Type check */
 	if (gen_ie[0] == DOT11F_EID_RSN) {
@@ -2244,7 +2244,7 @@ static int iw_softap_set_two_ints_getnone(struct net_device *dev,
 	return ret;
 }
 
-static void print_mac_list(struct cdf_mac_addr *macList, uint8_t size)
+static void print_mac_list(struct qdf_mac_addr *macList, uint8_t size)
 {
 	int i;
 	uint8_t *macArray;
@@ -2260,7 +2260,7 @@ static void print_mac_list(struct cdf_mac_addr *macList, uint8_t size)
 static QDF_STATUS hdd_print_acl(hdd_adapter_t *pHostapdAdapter)
 {
 	eSapMacAddrACL acl_mode;
-	struct cdf_mac_addr MacList[MAX_ACL_MAC_ADDRESS];
+	struct qdf_mac_addr MacList[MAX_ACL_MAC_ADDRESS];
 	uint8_t listnum;
 	void *p_cds_gctx = NULL;
 
@@ -3232,7 +3232,7 @@ int __iw_softap_modify_acl(struct net_device *dev,
 	v_CONTEXT_t cds_ctx;
 #endif
 	uint8_t *value = (uint8_t *) extra;
-	uint8_t pPeerStaMac[CDF_MAC_ADDR_SIZE];
+	uint8_t pPeerStaMac[QDF_MAC_ADDR_SIZE];
 	int listType, cmd, i;
 	int ret;
 	QDF_STATUS qdf_status = QDF_STATUS_SUCCESS;
@@ -3248,13 +3248,13 @@ int __iw_softap_modify_acl(struct net_device *dev,
 #ifndef WLAN_FEATURE_MBSSID
 	cds_ctx =  hdd_ctx->pcds_context;
 	if (NULL == cds_ctx) {
-		CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
 			  "%s: Vos Context is NULL", __func__);
 		return -EINVAL;
 	}
 #endif
 
-	for (i = 0; i < CDF_MAC_ADDR_SIZE; i++)
+	for (i = 0; i < QDF_MAC_ADDR_SIZE; i++)
 		pPeerStaMac[i] = *(value + i);
 
 	listType = (int)(*(value + i));
@@ -3346,8 +3346,8 @@ static __iw_softap_set_max_tx_power(struct net_device *dev,
 	int *value = (int *)extra;
 	int set_value;
 	int ret;
-	struct cdf_mac_addr bssid = CDF_MAC_ADDR_BROADCAST_INITIALIZER;
-	struct cdf_mac_addr selfMac = CDF_MAC_ADDR_BROADCAST_INITIALIZER;
+	struct qdf_mac_addr bssid = QDF_MAC_ADDR_BROADCAST_INITIALIZER;
+	struct qdf_mac_addr selfMac = QDF_MAC_ADDR_BROADCAST_INITIALIZER;
 
 	ENTER();
 
@@ -3397,7 +3397,7 @@ static __iw_softap_set_tx_power(struct net_device *dev,
 	hdd_context_t *hdd_ctx;
 	int *value = (int *)extra;
 	int set_value;
-	struct cdf_mac_addr bssid;
+	struct qdf_mac_addr bssid;
 	int ret;
 
 	ENTER();
@@ -3494,13 +3494,13 @@ static __iw_softap_getassoc_stamacaddr(struct net_device *dev,
 	left = wrqu->data.length - maclist_index;
 
 	spin_lock_bh(&pHostapdAdapter->staInfo_lock);
-	while ((cnt < WLAN_MAX_STA_COUNT) && (left >= CDF_MAC_ADDR_SIZE)) {
+	while ((cnt < WLAN_MAX_STA_COUNT) && (left >= QDF_MAC_ADDR_SIZE)) {
 		if ((pStaInfo[cnt].isUsed) &&
 		    (!IS_BROADCAST_MAC(pStaInfo[cnt].macAddrSTA.bytes))) {
 			memcpy(&buf[maclist_index], &(pStaInfo[cnt].macAddrSTA),
-			       CDF_MAC_ADDR_SIZE);
-			maclist_index += CDF_MAC_ADDR_SIZE;
-			left -= CDF_MAC_ADDR_SIZE;
+			       QDF_MAC_ADDR_SIZE);
+			maclist_index += QDF_MAC_ADDR_SIZE;
+			left -= QDF_MAC_ADDR_SIZE;
 		}
 		cnt++;
 	}
@@ -3557,7 +3557,7 @@ static __iw_softap_disassoc_sta(struct net_device *dev,
 	ENTER();
 
 	if (!capable(CAP_NET_ADMIN)) {
-		CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
 			FL("permission check failed"));
 		return -EPERM;
 	}
@@ -3780,7 +3780,7 @@ int __iw_get_genie(struct net_device *dev,
 #ifndef WLAN_FEATURE_MBSSID
 	cds_ctx = hdd_ctx->pcds_context;
 	if (NULL == cds_ctx) {
-		CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
 			  "%s: vos context is not valid ", __func__);
 		return -EINVAL;
 	}
@@ -3799,7 +3799,7 @@ int __iw_get_genie(struct net_device *dev,
 #endif
 		&length, genIeBytes);
 	if (status == QDF_STATUS_SUCCESS) {
-		length = CDF_MIN(length, DOT11F_IE_RSN_MAX_LEN);
+		length = QDF_MIN(length, DOT11F_IE_RSN_MAX_LEN);
 		if (wrqu->data.length < length ||
 		copy_to_user(wrqu->data.pointer, (void *)genIeBytes, length)) {
 			hddLog(LOG1, FL("failed to copy data to user buffer"));
@@ -4009,7 +4009,7 @@ static int __iw_set_ap_encodeext(struct net_device *dev,
 #ifndef WLAN_FEATURE_MBSSID
 	cds_ctx = hdd_ctx->pcds_context;
 	if (NULL == cds_ctx) {
-		CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
 			  "%s: pVosContext is NULL", __func__);
 		return -EINVAL;
 	}
@@ -4041,12 +4041,12 @@ static int __iw_set_ap_encodeext(struct net_device *dev,
 
 		setKey.keyDirection = eSIR_TX_RX;
 		cdf_mem_copy(setKey.peerMac.bytes, ext->addr.sa_data,
-			     CDF_MAC_ADDR_SIZE);
+			     QDF_MAC_ADDR_SIZE);
 	}
 	if (ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY) {
 		setKey.keyDirection = eSIR_TX_DEFAULT;
 		cdf_mem_copy(setKey.peerMac.bytes, ext->addr.sa_data,
-			     CDF_MAC_ADDR_SIZE);
+			     QDF_MAC_ADDR_SIZE);
 	}
 
 	/*For supplicant pae role is zero */
@@ -4455,7 +4455,7 @@ __iw_softap_setwpsie(struct net_device *dev,
 	ENTER();
 
 	if (!capable(CAP_NET_ADMIN)) {
-		CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
 			FL("permission check failed"));
 		return -EPERM;
 	}
@@ -4468,7 +4468,7 @@ __iw_softap_setwpsie(struct net_device *dev,
 #ifndef WLAN_FEATURE_MBSSID
 	cds_ctx = hdd_ctx->pcds_context;
 	if (NULL == cds_ctx) {
-		CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
 			  "%s: HDD context is not valid ", __func__);
 		return -EINVAL;
 	}
@@ -5139,7 +5139,7 @@ QDF_STATUS hdd_softap_get_sta_info(hdd_adapter_t *pAdapter, uint8_t *pBuf,
 	ENTER();
 
 	if (NULL == pAdapter) {
-		CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
 			  "%s: Adapter is NULL", __func__);
 		return -EINVAL;
 	}
@@ -5254,7 +5254,7 @@ static int __iw_set_ap_genie(struct net_device *dev,
 #ifndef WLAN_FEATURE_MBSSID
 	cds_ctx = hdd_ctx->pcds_context;
 	if (NULL == cds_ctx) {
-		CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
 			  "%s: CDF Context is NULL", __func__);
 		return -EINVAL;
 	}
@@ -5329,7 +5329,7 @@ int __iw_get_softap_linkspeed(struct net_device *dev,
 	char *pLinkSpeed = (char *)extra;
 	uint32_t link_speed = 0;
 	int len = sizeof(uint32_t) + 1;
-	struct cdf_mac_addr macAddress;
+	struct qdf_mac_addr macAddress;
 	char pmacAddress[MAC_ADDRESS_STR_LEN + 1];
 	QDF_STATUS status = QDF_STATUS_E_FAILURE;
 	int rc, valid, i;
@@ -5952,9 +5952,9 @@ static const iw_handler hostapd_private[] = {
 		iw_softap_set_two_ints_getnone,
 };
 const struct iw_handler_def hostapd_handler_def = {
-	.num_standard = CDF_ARRAY_SIZE(hostapd_handler),
-	.num_private = CDF_ARRAY_SIZE(hostapd_private),
-	.num_private_args = CDF_ARRAY_SIZE(hostapd_private_args),
+	.num_standard = QDF_ARRAY_SIZE(hostapd_handler),
+	.num_private = QDF_ARRAY_SIZE(hostapd_private),
+	.num_private_args = QDF_ARRAY_SIZE(hostapd_private_args),
 	.standard = (iw_handler *) hostapd_handler,
 	.private = (iw_handler *) hostapd_private,
 	.private_args = hostapd_private_args,
@@ -6046,7 +6046,7 @@ QDF_STATUS hdd_init_ap_mode(hdd_adapter_t *pAdapter)
 
 	qdf_status = qdf_event_create(&phostapdBuf->cdf_stop_bss_event);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-		CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
 			  ("ERROR: Hostapd HDD stop bss event init failed!!"));
 #ifdef WLAN_FEATURE_MBSSID
 		wlansap_close(sapContext);
@@ -6352,7 +6352,7 @@ static int wlan_hdd_set_channel(struct wiphy *wiphy,
 	}
 	pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
 
-	MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_CFG80211_SET_CHANNEL,
 			 pAdapter->sessionId, channel_type));
 
@@ -7485,7 +7485,7 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter,
 		 * */
 		status =
 			hdd_softap_unpack_ie(cds_get_context
-						     (CDF_MODULE_ID_SME),
+						     (QDF_MODULE_ID_SME),
 					     &RSNEncryptType, &mcRSNEncryptType,
 					     &RSNAuthType, &MFPCapable,
 					     &MFPRequired,
@@ -7533,7 +7533,7 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter,
 				       "RSNWPA IE MAX Length exceeded; length =%d",
 				       pConfig->RSNWPAReqIELength);
 			status = hdd_softap_unpack_ie
-					(cds_get_context(CDF_MODULE_ID_SME),
+					(cds_get_context(QDF_MODULE_ID_SME),
 					 &RSNEncryptType,
 					 &mcRSNEncryptType, &RSNAuthType,
 					 &MFPCapable, &MFPRequired,
@@ -7591,7 +7591,7 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter,
 
 	cdf_mem_copy(pConfig->self_macaddr.bytes,
 		     pHostapdAdapter->macAddressCurrent.bytes,
-		     CDF_MAC_ADDR_SIZE);
+		     QDF_MAC_ADDR_SIZE);
 
 	/* default value */
 	pConfig->SapMacaddr_acl = eSAP_ACCEPT_UNLESS_DENIED;
@@ -7872,12 +7872,12 @@ static int __wlan_hdd_cfg80211_stop_ap(struct wiphy *wiphy,
 
 	ENTER();
 
-	if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hddLog(LOGE, FL("Command not allowed in FTM mode"));
 		return -EINVAL;
 	}
 
-	MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_CFG80211_STOP_AP,
 			 pAdapter->sessionId, pAdapter->device_mode));
 
@@ -8100,12 +8100,12 @@ static int __wlan_hdd_cfg80211_start_ap(struct wiphy *wiphy,
 
 	ENTER();
 
-	if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hddLog(LOGE, FL("Command not allowed in FTM mode"));
 		return -EINVAL;
 	}
 
-	MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_CFG80211_START_AP, pAdapter->sessionId,
 			 params->beacon_interval));
 	if (WLAN_HDD_ADAPTER_MAGIC != pAdapter->magic) {
@@ -8258,12 +8258,12 @@ static int __wlan_hdd_cfg80211_change_beacon(struct wiphy *wiphy,
 
 	ENTER();
 
-	if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hddLog(LOGE, FL("Command not allowed in FTM mode"));
 		return -EINVAL;
 	}
 
-	MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_CFG80211_CHANGE_BEACON,
 			 pAdapter->sessionId, pAdapter->device_mode));
 	hddLog(LOG1, FL("Device_mode %s(%d)"),

core/hdd/src/wlan_hdd_hostapd.h

@@ -39,7 +39,7 @@
 #include <linux/netdevice.h>
 #include <linux/skbuff.h>
 #include <qdf_list.h>
-#include <cdf_types.h>
+#include <qdf_types.h>
 #include <wlan_hdd_main.h>
 
 /* Preprocessor definitions and constants */

core/hdd/src/wlan_hdd_ipa.c

@@ -322,7 +322,7 @@ struct ipa_uc_pending_event {
 	hdd_adapter_t *adapter;
 	enum ipa_wlan_event type;
 	uint8_t sta_id;
-	uint8_t mac_addr[CDF_MAC_ADDR_SIZE];
+	uint8_t mac_addr[QDF_MAC_ADDR_SIZE];
 };
 
 /**
@@ -359,7 +359,7 @@ static uint8_t vdev_to_iface[CSR_ROAM_SESSION_MAX];
  * @rx_destructor_call: IPA Rx packet destructor count
  */
 struct uc_rt_debug_info {
-	v_TIME_t time;
+	unsigned long time;
 	uint64_t ipa_excep_count;
 	uint64_t rx_drop_count;
 	uint64_t net_sent_count;
@@ -443,30 +443,30 @@ struct hdd_ipa_priv {
 	cdf_mutex_t ipa_lock;
 
 	/* CE resources */
-	cdf_dma_addr_t ce_sr_base_paddr;
+	qdf_dma_addr_t ce_sr_base_paddr;
 	uint32_t ce_sr_ring_size;
-	cdf_dma_addr_t ce_reg_paddr;
+	qdf_dma_addr_t ce_reg_paddr;
 
 	/* WLAN TX:IPA->WLAN */
-	cdf_dma_addr_t tx_comp_ring_base_paddr;
+	qdf_dma_addr_t tx_comp_ring_base_paddr;
 	uint32_t tx_comp_ring_size;
 	uint32_t tx_num_alloc_buffer;
 
 	/* WLAN RX:WLAN->IPA */
-	cdf_dma_addr_t rx_rdy_ring_base_paddr;
+	qdf_dma_addr_t rx_rdy_ring_base_paddr;
 	uint32_t rx_rdy_ring_size;
-	cdf_dma_addr_t rx_proc_done_idx_paddr;
+	qdf_dma_addr_t rx_proc_done_idx_paddr;
 	void *rx_proc_done_idx_vaddr;
 
 	/* WLAN RX2:WLAN->IPA */
-	cdf_dma_addr_t rx2_rdy_ring_base_paddr;
+	qdf_dma_addr_t rx2_rdy_ring_base_paddr;
 	uint32_t rx2_rdy_ring_size;
-	cdf_dma_addr_t rx2_proc_done_idx_paddr;
+	qdf_dma_addr_t rx2_proc_done_idx_paddr;
 	void *rx2_proc_done_idx_vaddr;
 
 	/* IPA UC doorbell registers paddr */
-	cdf_dma_addr_t tx_comp_doorbell_paddr;
-	cdf_dma_addr_t rx_ready_doorbell_paddr;
+	qdf_dma_addr_t tx_comp_doorbell_paddr;
+	qdf_dma_addr_t rx_ready_doorbell_paddr;
 };
 
 /**
@@ -507,13 +507,13 @@ uint32_t wlan_hdd_stub_addr_to_priv(void *ptr)
 	(((struct hdd_ipa_cld_hdr *) (_data))->iface_id)
 
 #define HDD_IPA_LOG(LVL, fmt, args ...) \
-	CDF_TRACE(CDF_MODULE_ID_HDD, LVL, \
+	CDF_TRACE(QDF_MODULE_ID_HDD, LVL, \
 		  "%s:%d: "fmt, __func__, __LINE__, ## args)
 
 #define HDD_IPA_DBG_DUMP(_lvl, _prefix, _buf, _len) \
 	do { \
-		CDF_TRACE(CDF_MODULE_ID_HDD, _lvl, "%s:", _prefix); \
-		CDF_TRACE_HEX_DUMP(CDF_MODULE_ID_HDD, _lvl, _buf, _len); \
+		CDF_TRACE(QDF_MODULE_ID_HDD, _lvl, "%s:", _prefix); \
+		CDF_TRACE_HEX_DUMP(QDF_MODULE_ID_HDD, _lvl, _buf, _len); \
 	} while (0)
 
 #define HDD_IPA_IS_CONFIG_ENABLED(_hdd_ctx, _mask) \
@@ -902,7 +902,7 @@ static void hdd_ipa_uc_rt_debug_init(hdd_context_t *hdd_ctx)
 	struct hdd_ipa_priv *hdd_ipa = (struct hdd_ipa_priv *)hdd_ctx->hdd_ipa;
 
 	cdf_mutex_init(&hdd_ipa->rt_debug_lock);
-	cdf_mc_timer_init(&hdd_ipa->rt_debug_fill_timer, CDF_TIMER_TYPE_SW,
+	cdf_mc_timer_init(&hdd_ipa->rt_debug_fill_timer, QDF_TIMER_TYPE_SW,
 		hdd_ipa_uc_rt_debug_host_fill, (void *)hdd_ctx);
 	hdd_ipa->rt_buf_fill_index = 0;
 	cdf_mem_zero(hdd_ipa->rt_bug_buffer,
@@ -923,7 +923,7 @@ static void hdd_ipa_uc_rt_debug_init(hdd_context_t *hdd_ctx)
 			"%s: IPA RT debug is not enabled", __func__);
 		return;
 	}
-	cdf_mc_timer_init(&hdd_ipa->rt_debug_timer, CDF_TIMER_TYPE_SW,
+	cdf_mc_timer_init(&hdd_ipa->rt_debug_timer, QDF_TIMER_TYPE_SW,
 		hdd_ipa_uc_rt_debug_handler, (void *)hdd_ctx);
 	cdf_mc_timer_start(&hdd_ipa->rt_debug_timer,
 		HDD_IPA_UC_RT_DEBUG_PERIOD);
@@ -1422,7 +1422,7 @@ static void hdd_ipa_uc_op_cb(struct op_msg_type *op_msg, void *usr_ctxt)
 		(HDD_IPA_UC_STAT_REASON_DEBUG == hdd_ipa->stat_req_reason)) {
 
 		/* STATs from host */
-		CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
 			  "==== IPA_UC WLAN_HOST CE ====\n"
 			  "CE RING BASE: 0x%llx\n"
 			  "CE RING SIZE: %d\n"
@@ -1430,7 +1430,7 @@ static void hdd_ipa_uc_op_cb(struct op_msg_type *op_msg, void *usr_ctxt)
 			  (unsigned long long)hdd_ipa->ce_sr_base_paddr,
 			  hdd_ipa->ce_sr_ring_size,
 			  (unsigned long long)hdd_ipa->ce_reg_paddr);
-		CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
 			  "==== IPA_UC WLAN_HOST TX ====\n"
 			  "COMP RING BASE: 0x%llx\n"
 			  "COMP RING SIZE: %d\n"
@@ -1440,7 +1440,7 @@ static void hdd_ipa_uc_op_cb(struct op_msg_type *op_msg, void *usr_ctxt)
 			  hdd_ipa->tx_comp_ring_size,
 			  hdd_ipa->tx_num_alloc_buffer,
 			  (unsigned long long)hdd_ipa->tx_comp_doorbell_paddr);
-		CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
 			  "==== IPA_UC WLAN_HOST RX ====\n"
 			  "IND RING BASE: 0x%llx\n"
 			  "IND RING SIZE: %d\n"
@@ -1456,7 +1456,7 @@ static void hdd_ipa_uc_op_cb(struct op_msg_type *op_msg, void *usr_ctxt)
 			  hdd_ipa->stats.num_rx_excep,
 			  hdd_ipa->stats.num_tx_bcmc,
 			  (unsigned long long)hdd_ipa->stats.num_tx_bcmc_err);
-		CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
 			  "==== IPA_UC WLAN_HOST CONTROL ====\n"
 			  "SAP NUM STAs: %d\n"
 			  "STA CONNECTED: %d\n"
@@ -1476,7 +1476,7 @@ static void hdd_ipa_uc_op_cb(struct op_msg_type *op_msg, void *usr_ctxt)
 		/* STATs from FW */
 		uc_fw_stat = (struct ipa_uc_fw_stats *)
 			     ((uint8_t *)op_msg + sizeof(struct op_msg_type));
-		CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
 			  "==== IPA_UC WLAN_FW TX ====\n"
 			  "COMP RING BASE: 0x%x\n"
 			  "COMP RING SIZE: %d\n"
@@ -1497,7 +1497,7 @@ static void hdd_ipa_uc_op_cb(struct op_msg_type *op_msg, void *usr_ctxt)
 			  uc_fw_stat->tx_pkts_enqueued,
 			  uc_fw_stat->tx_pkts_completed,
 			  uc_fw_stat->tx_is_suspend, uc_fw_stat->tx_reserved);
-		CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
 			  "==== IPA_UC WLAN_FW RX ====\n"
 			  "IND RING BASE: 0x%x\n"
 			  "IND RING SIZE: %d\n"
@@ -1528,7 +1528,7 @@ static void hdd_ipa_uc_op_cb(struct op_msg_type *op_msg, void *usr_ctxt)
 			  uc_fw_stat->rx_is_suspend, uc_fw_stat->rx_reserved);
 		/* STATs from IPA */
 		ipa_get_wdi_stats(&ipa_stat);
-		CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
 			  "==== IPA_UC IPA TX ====\n"
 			  "NUM PROCD : %d\n"
 			  "CE DBELL : 0x%x\n"
@@ -1564,7 +1564,7 @@ static void hdd_ipa_uc_op_cb(struct op_msg_type *op_msg, void *usr_ctxt)
 			  num_bam_int_in_non_runnning_state,
 			  ipa_stat.tx_ch_stats.num_qmb_int_handled);
 
-		CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
 			  "==== IPA_UC IPA RX ====\n"
 			  "MAX OST PKT : %d\n"
 			  "NUM PKT PRCSD : %d\n"
@@ -1813,7 +1813,7 @@ static QDF_STATUS hdd_ipa_uc_ol_init(hdd_context_t *hdd_ctx)
 
 	pipe_in.u.dl.comp_ring_base_pa = ipa_ctxt->tx_comp_ring_base_paddr;
 	pipe_in.u.dl.comp_ring_size =
-		ipa_ctxt->tx_comp_ring_size * sizeof(cdf_dma_addr_t);
+		ipa_ctxt->tx_comp_ring_size * sizeof(qdf_dma_addr_t);
 	pipe_in.u.dl.ce_ring_base_pa = ipa_ctxt->ce_sr_base_paddr;
 	pipe_in.u.dl.ce_door_bell_pa = ipa_ctxt->ce_reg_paddr;
 	pipe_in.u.dl.ce_ring_size = ipa_ctxt->ce_sr_ring_size;
@@ -3675,7 +3675,7 @@ int hdd_ipa_wlan_evt(hdd_adapter_t *adapter, uint8_t sta_id,
 		pending_event->type = type;
 		cdf_mem_copy(pending_event->mac_addr,
 			mac_addr,
-			CDF_MAC_ADDR_SIZE);
+			QDF_MAC_ADDR_SIZE);
 		qdf_list_insert_back(&hdd_ipa->pending_event,
 				&pending_event->node);
 
@@ -4023,7 +4023,7 @@ QDF_STATUS hdd_ipa_init(hdd_context_t *hdd_ctx)
 	ghdd_ipa = hdd_ipa;
 	hdd_ipa->hdd_ctx = hdd_ctx;
 	hdd_ipa->num_iface = 0;
-	ol_txrx_ipa_uc_get_resource(cds_get_context(CDF_MODULE_ID_TXRX),
+	ol_txrx_ipa_uc_get_resource(cds_get_context(QDF_MODULE_ID_TXRX),
 				&hdd_ipa->ce_sr_base_paddr,
 				&hdd_ipa->ce_sr_ring_size,
 				&hdd_ipa->ce_reg_paddr,