diff --git a/core/bmi/inc/ol_fw.h b/core/bmi/inc/ol_fw.h index 322c0e0928..d417bb3fe0 100644 --- a/core/bmi/inc/ol_fw.h +++ b/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" diff --git a/core/bmi/inc/ol_if_athvar.h b/core/bmi/inc/ol_if_athvar.h index c820cbe2f0..cb7774c2a3 100644 --- a/core/bmi/inc/ol_if_athvar.h +++ b/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 -#include "cdf_types.h" +#include "qdf_types.h" #include "cdf_lock.h" #include "wmi_unified_api.h" #include "htc_api.h" diff --git a/core/bmi/src/ol_fw.c b/core/bmi/src/ol_fw.c index 38b5674e1a..c4baf31454 100644 --- a/core/bmi/src/ol_fw.c +++ b/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__); diff --git a/core/cdf/inc/cdf_lock.h b/core/cdf/inc/cdf_lock.h index cdc3ada531..e1f1846d3d 100644 --- a/core/cdf/inc/cdf_lock.h +++ b/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); } diff --git a/core/cdf/inc/cdf_mc_timer.h b/core/cdf/inc/cdf_mc_timer.h index 67662966ef..e93b9b6dce 100644 --- a/core/cdf/inc/cdf_mc_timer.h +++ b/core/cdf/inc/cdf_mc_timer.h @@ -35,7 +35,7 @@ */ /* Include Files */ -#include +#include #include #include #include @@ -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 */ diff --git a/core/cdf/inc/cdf_memory.h b/core/cdf/inc/cdf_memory.h index e6c77cfebd..8170a0f87d 100644 --- a/core/cdf/inc/cdf_memory.h +++ b/core/cdf/inc/cdf_memory.h @@ -35,7 +35,7 @@ */ /* Include Files */ -#include +#include /** * 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 */ diff --git a/core/cdf/inc/cdf_nbuf.h b/core/cdf/inc/cdf_nbuf.h index ac968498e0..403a09edcd 100644 --- a/core/cdf/inc/cdf_nbuf.h +++ b/core/cdf/inc/cdf_nbuf.h @@ -33,7 +33,7 @@ #ifndef _CDF_NBUF_H #define _CDF_NBUF_H #include -#include +#include #include #include #include @@ -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); } diff --git a/core/cdf/inc/cdf_net_types.h b/core/cdf/inc/cdf_net_types.h index fc70c110e3..4a6cbfda4b 100644 --- a/core/cdf/inc/cdf_net_types.h +++ b/core/cdf/inc/cdf_net_types.h @@ -33,7 +33,7 @@ #ifndef _CDF_NET_TYPES_H #define _CDF_NET_TYPES_H -#include /* uint8_t, etc. */ +#include /* uint8_t, etc. */ #define ADF_NET_MAC_ADDR_MAX_LEN 6 #define ADF_NET_IF_NAME_SIZE 64 diff --git a/core/cdf/inc/cdf_trace.h b/core/cdf/inc/cdf_trace.h index c32bb2e7d5..4d198abaa7 100644 --- a/core/cdf/inc/cdf_trace.h +++ b/core/cdf/inc/cdf_trace.h @@ -38,12 +38,12 @@ */ /* Include Files */ -#include /* For CDF_MODULE_ID... */ +#include /* For QDF_MODULE_ID... */ #include /* For va_list... */ #include #include #include -#include +#include /* 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); diff --git a/core/cdf/inc/cdf_types.h b/core/cdf/inc/cdf_types.h deleted file mode 100644 index 635a59dd9e..0000000000 --- a/core/cdf/inc/cdf_types.h +++ /dev/null @@ -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 - -/* 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 */ diff --git a/core/cdf/inc/cdf_util.h b/core/cdf/inc/cdf_util.h index 4f44274b39..c1bffd7a79 100644 --- a/core/cdf/inc/cdf_util.h +++ b/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)) diff --git a/core/cdf/inc/osdep.h b/core/cdf/inc/osdep.h index e5bc0bf1ba..6a7bce0925 100644 --- a/core/cdf/inc/osdep.h +++ b/core/cdf/inc/osdep.h @@ -28,7 +28,7 @@ #ifndef _OSDEP_H #define _OSDEP_H -#include +#include #include #include #include diff --git a/core/cdf/src/cdf_lock.c b/core/cdf/src/cdf_lock.c index 086360fd2b..25fa695a63 100644 --- a/core/cdf/src/cdf_lock.c +++ b/core/cdf/src/cdf_lock.c @@ -39,7 +39,7 @@ #include "cdf_lock.h" #include "cdf_memory.h" #include "cdf_trace.h" -#include +#include #ifdef CONFIG_CNSS #include #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; } diff --git a/core/cdf/src/cdf_mc_timer.c b/core/cdf/src/cdf_mc_timer.c index 74997544a0..4fb4b5dfda 100644 --- a/core/cdf/src/cdf_mc_timer.c +++ b/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); diff --git a/core/cdf/src/cdf_memory.c b/core/cdf/src/cdf_memory.c index de708861a1..0de58b57e2 100644 --- a/core/cdf/src/cdf_memory.c +++ b/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); diff --git a/core/cdf/src/cdf_nbuf.c b/core/cdf/src/cdf_nbuf.c index 80fe56dbed..3f1bbb5f65 100644 --- a/core/cdf/src/cdf_nbuf.c +++ b/core/cdf/src/cdf_nbuf.c @@ -40,7 +40,7 @@ #include #include #endif /* FEATURE_TSO */ -#include +#include #include #include #include @@ -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; diff --git a/core/cdf/src/cdf_trace.c b/core/cdf/src/cdf_trace.c index f0ad0ec956..2009859f31 100644 --- a/core/cdf/src/cdf_trace.c +++ b/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); diff --git a/core/cdf/src/i_cdf_lock.h b/core/cdf/src/i_cdf_lock.h index 438b50aa5f..02c46f0957 100644 --- a/core/cdf/src/i_cdf_lock.h +++ b/core/cdf/src/i_cdf_lock.h @@ -36,7 +36,7 @@ */ /* Include Files */ -#include +#include #include #include #include @@ -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); } diff --git a/core/cdf/src/i_cdf_mc_timer.h b/core/cdf/src/i_cdf_mc_timer.h index 95634ff895..91e94ab423 100644 --- a/core/cdf/src/i_cdf_mc_timer.h +++ b/core/cdf/src/i_cdf_mc_timer.h @@ -36,7 +36,7 @@ /* Include Files */ #include -#include +#include #include #include #include diff --git a/core/cdf/src/i_cdf_nbuf.h b/core/cdf/src/i_cdf_nbuf.h index fc45827af1..d4c9fa90a3 100644 --- a/core/cdf/src/i_cdf_nbuf.h +++ b/core/cdf/src/i_cdf_nbuf.h @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include /* @@ -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); diff --git a/core/cdf/src/i_cdf_trace.h b/core/cdf/src/i_cdf_trace.h index a3b36ee8c5..99973f2d5a 100644 --- a/core/cdf/src/i_cdf_trace.h +++ b/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, ...) { } diff --git a/core/cdf/src/i_cdf_types.h b/core/cdf/src/i_cdf_types.h deleted file mode 100644 index febbaff235..0000000000 --- a/core/cdf/src/i_cdf_types.h +++ /dev/null @@ -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 -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#ifndef __KERNEL__ -#define __iomem -#endif -#include -#include -#include - -#ifdef __KERNEL__ -#include -#include -#include -#include -#include -#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 " -#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 */ diff --git a/core/cdf/src/i_cdf_util.h b/core/cdf/src/i_cdf_util.h index bd34f4a512..5c3bdc77cf 100644 --- a/core/cdf/src/i_cdf_util.h +++ b/core/cdf/src/i_cdf_util.h @@ -35,7 +35,7 @@ #include -#include +#include #include #include /* diff --git a/core/cds/inc/cds_api.h b/core/cds/inc/cds_api.h index 2292ac7f95..456261b193 100644 --- a/core/cds/inc/cds_api.h +++ b/core/cds/inc/cds_api.h @@ -34,7 +34,7 @@ * */ -#include +#include #include #include #include @@ -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); diff --git a/core/cds/inc/cds_concurrency.h b/core/cds/inc/cds_concurrency.h index 33ec1a8c78..aca9537316 100644 --- a/core/cds/inc/cds_concurrency.h +++ b/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); diff --git a/core/cds/inc/cds_crypto.h b/core/cds/inc/cds_crypto.h index d1fdb08eec..a94ae3c936 100644 --- a/core/cds/inc/cds_crypto.h +++ b/core/cds/inc/cds_crypto.h @@ -34,7 +34,7 @@ * */ -#include +#include #include #include #include diff --git a/core/cds/inc/cds_mq.h b/core/cds/inc/cds_mq.h index c8ab965bff..ab8c4d36dd 100644 --- a/core/cds/inc/cds_mq.h +++ b/core/cds/inc/cds_mq.h @@ -41,7 +41,7 @@ /*-------------------------------------------------------------------------- Include Files ------------------------------------------------------------------------*/ -#include +#include #include /*-------------------------------------------------------------------------- @@ -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; diff --git a/core/cds/inc/cds_packet.h b/core/cds/inc/cds_packet.h index 87dce8ddd3..44ce1efde3 100644 --- a/core/cds/inc/cds_packet.h +++ b/core/cds/inc/cds_packet.h @@ -41,7 +41,7 @@ /*-------------------------------------------------------------------------- Include Files ------------------------------------------------------------------------*/ -#include +#include #include /*-------------------------------------------------------------------------- diff --git a/core/cds/inc/cds_sched.h b/core/cds/inc/cds_sched.h index f08115adcc..f19c9ed12a 100644 --- a/core/cds/inc/cds_sched.h +++ b/core/cds/inc/cds_sched.h @@ -40,13 +40,13 @@ Include Files ------------------------------------------------------------------------*/ #include -#include "i_cdf_types.h" +#include #include #if defined(WLAN_OPEN_SOURCE) && defined(CONFIG_HAS_WAKELOCK) #include #endif #include -#include +#include #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; diff --git a/core/cds/inc/cds_utils.h b/core/cds/inc/cds_utils.h index 24d8b5af4e..f14feb9b62 100644 --- a/core/cds/inc/cds_utils.h +++ b/core/cds/inc/cds_utils.h @@ -41,7 +41,7 @@ /*-------------------------------------------------------------------------- Include Files ------------------------------------------------------------------------*/ -#include +#include #include #include #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...) \ diff --git a/core/cds/src/cds_api.c b/core/cds/src/cds_api.c index b1455353f0..bc04928043 100644 --- a/core/cds/src/cds_api.c +++ b/core/cds/src/cds_api.c @@ -69,7 +69,7 @@ /* Data definitions */ static cds_context_type g_cds_context; static p_cds_contextType gp_cds_context; -static struct __cdf_device g_cdf_ctx; +static struct __qdf_device g_cdf_ctx; /* Debug variable to detect MC thread stuck */ static atomic_t cds_wrapper_empty_count; @@ -94,7 +94,7 @@ v_CONTEXT_t cds_init(void) gp_cds_context = &g_cds_context; - gp_cds_context->cdf_ctx = &g_cdf_ctx; + gp_cds_context->qdf_ctx = &g_cdf_ctx; cdf_mem_zero(&g_cdf_ctx, sizeof(g_cdf_ctx)); cdf_trace_spin_lock_init(); @@ -119,7 +119,7 @@ void cds_deinit(void) if (gp_cds_context == NULL) return; - gp_cds_context->cdf_ctx = NULL; + gp_cds_context->qdf_ctx = NULL; gp_cds_context = NULL; cdf_mem_zero(&g_cds_context, sizeof(g_cds_context)); @@ -170,18 +170,18 @@ QDF_STATUS cds_open(void) int iter = 0; tSirRetStatus sirStatus = eSIR_SUCCESS; tMacOpenParameters mac_openParms; - cdf_device_t cdf_ctx; + qdf_device_t qdf_ctx; HTC_INIT_INFO htcInfo; struct ol_context *ol_ctx; struct hif_opaque_softc *scn; void *HTCHandle; hdd_context_t *pHddCtx; - 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_FATAL, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, "%s: Trying to open CDS without a PreOpen", __func__); CDF_ASSERT(0); return QDF_STATUS_E_FAILURE; @@ -195,14 +195,14 @@ QDF_STATUS cds_open(void) /* Initialize the probe event */ if (qdf_event_create(&gp_cds_context->ProbeEvent) != QDF_STATUS_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, "%s: Unable to init probeEvent", __func__); CDF_ASSERT(0); return QDF_STATUS_E_FAILURE; } if (qdf_event_create(&(gp_cds_context->wmaCompleteEvent)) != QDF_STATUS_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, "%s: Unable to init wmaCompleteEvent", __func__); CDF_ASSERT(0); goto err_probe_event; @@ -212,7 +212,7 @@ QDF_STATUS cds_open(void) qdf_status = cds_mq_init(&gp_cds_context->freeVosMq); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { /* Critical Error ... Cannot proceed further */ - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, "%s: Failed to initialize CDS free message queue", __func__); CDF_ASSERT(0); @@ -233,7 +233,7 @@ QDF_STATUS cds_open(void) if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { /* Critical Error ... Cannot proceed further */ - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, "%s: Failed to open CDS Scheduler", __func__); CDF_ASSERT(0); goto err_msg_queue; @@ -242,26 +242,26 @@ QDF_STATUS cds_open(void) pHddCtx = (hdd_context_t *) (gp_cds_context->pHDDContext); if ((NULL == pHddCtx) || (NULL == pHddCtx->config)) { /* Critical Error ... Cannot proceed further */ - 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__); CDF_ASSERT(0); goto err_sched_close; } - scn = cds_get_context(CDF_MODULE_ID_HIF); + scn = cds_get_context(QDF_MODULE_ID_HIF); if (!scn) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, "%s: scn is null!", __func__); goto err_sched_close; } hdd_update_config(pHddCtx); - ol_ctx = cds_get_context(CDF_MODULE_ID_BMI); + ol_ctx = cds_get_context(QDF_MODULE_ID_BMI); /* Initialize BMI and Download firmware */ qdf_status = bmi_download_firmware(ol_ctx); if (qdf_status != QDF_STATUS_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, "BMI FIALED status:%d", qdf_status); goto err_bmi_close; } @@ -269,19 +269,19 @@ QDF_STATUS cds_open(void) 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); + qdf_ctx = cds_get_context(QDF_MODULE_ID_QDF_DEVICE); /* Create HTC */ gp_cds_context->htc_ctx = - htc_create(scn, &htcInfo, cdf_ctx); + htc_create(scn, &htcInfo, qdf_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; } @@ -373,7 +373,7 @@ QDF_STATUS cds_open(void) if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { /* Critical Error ... Cannot proceed further */ - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, "%s: Failed to open WMA module", __func__); CDF_ASSERT(0); goto err_htc_close; @@ -385,14 +385,14 @@ QDF_STATUS cds_open(void) * config entry pHddCtx->config->maxNumberOfPeers has adjusted value */ pHddCtx->config->maxNumberOfPeers = mac_openParms.maxStation; - HTCHandle = cds_get_context(CDF_MODULE_ID_HTC); + HTCHandle = cds_get_context(QDF_MODULE_ID_HTC); if (!HTCHandle) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, "%s: HTCHandle is null!", __func__); goto err_wma_close; } if (htc_wait_target(HTCHandle)) { - 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; } @@ -410,7 +410,7 @@ QDF_STATUS cds_open(void) if (eSIR_SUCCESS != sirStatus) { /* Critical Error ... Cannot proceed further */ - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, "%s: Failed to open MAC", __func__); CDF_ASSERT(0); goto err_wma_close; @@ -420,7 +420,7 @@ QDF_STATUS cds_open(void) qdf_status = sme_open(gp_cds_context->pMACContext); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { /* Critical Error ... Cannot proceed further */ - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, "%s: Failed to open SME", __func__); CDF_ASSERT(0); goto err_mac_close; @@ -429,16 +429,16 @@ QDF_STATUS cds_open(void) gp_cds_context->pdev_txrx_ctx = ol_txrx_pdev_alloc(gp_cds_context->cfg_ctx, gp_cds_context->htc_ctx, - gp_cds_context->cdf_ctx); + gp_cds_context->qdf_ctx); if (!gp_cds_context->pdev_txrx_ctx) { /* Critical Error ... Cannot proceed further */ - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, "%s: Failed to open TXRX", __func__); CDF_ASSERT(0); goto err_sme_close; } - 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; @@ -490,32 +490,32 @@ QDF_STATUS cds_pre_enable(v_CONTEXT_t cds_context) QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; p_cds_contextType p_cds_context = (p_cds_contextType) cds_context; void *scn; - CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO, "cds prestart"); + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO, "cds prestart"); if (gp_cds_context != p_cds_context) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Context mismatch", __func__); CDF_ASSERT(0); return QDF_STATUS_E_INVAL; } if (p_cds_context->pMACContext == NULL) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: MAC NULL context", __func__); CDF_ASSERT(0); return QDF_STATUS_E_INVAL; } if (p_cds_context->pWMAContext == NULL) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: WMA NULL context", __func__); CDF_ASSERT(0); return QDF_STATUS_E_INVAL; } - scn = cds_get_context(CDF_MODULE_ID_HIF); + scn = cds_get_context(QDF_MODULE_ID_HIF); if (!scn) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, "%s: scn is null!", __func__); return QDF_STATUS_E_FAILURE; } @@ -526,7 +526,7 @@ QDF_STATUS cds_pre_enable(v_CONTEXT_t cds_context) /*call WMA pre start */ qdf_status = wma_pre_start(gp_cds_context); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_FATAL, "Failed to WMA prestart"); CDF_ASSERT(0); return QDF_STATUS_E_FAILURE; @@ -537,15 +537,15 @@ QDF_STATUS cds_pre_enable(v_CONTEXT_t cds_context) CDS_WMA_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__); } - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Test MC thread by posting a probe message to SYS", __func__); wlan_sys_probe(); @@ -556,14 +556,14 @@ QDF_STATUS cds_pre_enable(v_CONTEXT_t cds_context) qdf_status = htc_start(gp_cds_context->htc_ctx); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_FATAL, "Failed to Start HTC"); CDF_ASSERT(0); return QDF_STATUS_E_FAILURE; } qdf_status = wma_wait_for_ready_event(gp_cds_context->pWMAContext); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, "Failed to get ready event from target firmware"); htc_set_target_to_sleep(scn); htc_stop(gp_cds_context->htc_ctx); @@ -572,7 +572,7 @@ QDF_STATUS cds_pre_enable(v_CONTEXT_t cds_context) } if (ol_txrx_pdev_attach(gp_cds_context->pdev_txrx_ctx)) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, "Failed to attach pdev"); htc_set_target_to_sleep(scn); htc_stop(gp_cds_context->htc_ctx); @@ -599,12 +599,12 @@ QDF_STATUS cds_enable(v_CONTEXT_t cds_context) p_cds_contextType p_cds_context = (p_cds_contextType) cds_context; tHalMacStartParameters halStartParams; - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, "%s: Starting Libra SW", __func__); /* We support only one instance for now ... */ if (gp_cds_context != p_cds_context) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: mismatch in context", __func__); return QDF_STATUS_E_FAILURE; } @@ -612,10 +612,10 @@ QDF_STATUS cds_enable(v_CONTEXT_t cds_context) if ((p_cds_context->pWMAContext == NULL) || (p_cds_context->pMACContext == NULL)) { if (p_cds_context->pWMAContext == NULL) - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: WMA NULL context", __func__); else - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: MAC NULL context", __func__); return QDF_STATUS_E_FAILURE; @@ -624,11 +624,11 @@ QDF_STATUS cds_enable(v_CONTEXT_t cds_context) /* Start the wma */ qdf_status = wma_start(p_cds_context); if (qdf_status != 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__); return QDF_STATUS_E_FAILURE; } - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, "%s: wma correctly started", __func__); /* Start the MAC */ @@ -640,36 +640,36 @@ QDF_STATUS cds_enable(v_CONTEXT_t cds_context) mac_start(p_cds_context->pMACContext, &halStartParams); if (eSIR_SUCCESS != sirStatus) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, "%s: Failed to start MAC", __func__); goto err_wma_stop; } - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, "%s: MAC correctly started", __func__); /* START SME */ qdf_status = sme_start(p_cds_context->pMACContext); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, "%s: Failed to start SME", __func__); goto err_mac_stop; } - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, "%s: SME correctly started", __func__); if (ol_txrx_pdev_attach_target (p_cds_context->pdev_txrx_ctx) != A_OK) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, "%s: Failed attach target", __func__); goto err_sme_stop; } - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, "TL correctly started"); - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, "%s: CDS Start is successful!!", __func__); return QDF_STATUS_SUCCESS; @@ -684,7 +684,7 @@ err_wma_stop: qdf_event_reset(&(gp_cds_context->wmaCompleteEvent)); qdf_status = wma_stop(p_cds_context, HAL_STOP_TYPE_RF_KILL); 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 stop wma", __func__); CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); wma_setneedshutdown(cds_context); @@ -694,12 +694,12 @@ err_wma_stop: CDS_WMA_TIMEOUT); if (qdf_status != QDF_STATUS_SUCCESS) { if (qdf_status == QDF_STATUS_E_TIMEOUT) { - CDF_TRACE(CDF_MODULE_ID_CDF, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, "%s: Timeout occurred before WMA_stop complete", __func__); } else { - CDF_TRACE(CDF_MODULE_ID_CDF, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, "%s: WMA_stop reporting other error", __func__); @@ -731,7 +731,7 @@ QDF_STATUS cds_disable(v_CONTEXT_t cds_context) qdf_status = wma_stop(cds_context, HAL_STOP_TYPE_RF_KILL); 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 stop wma", __func__); CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); wma_setneedshutdown(cds_context); @@ -743,7 +743,7 @@ QDF_STATUS cds_disable(v_CONTEXT_t cds_context) /* SYS STOP will stop SME and MAC */ qdf_status = sys_stop(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 stop SYS", __func__); CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } @@ -764,7 +764,7 @@ QDF_STATUS cds_close(v_CONTEXT_t cds_context) qdf_status = wma_wmi_work_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_work", __func__); CDF_ASSERT(0); } @@ -776,19 +776,19 @@ QDF_STATUS cds_close(v_CONTEXT_t cds_context) } ol_txrx_pdev_detach(gp_cds_context->pdev_txrx_ctx, 1); - cds_free_context(cds_context, CDF_MODULE_ID_TXRX, + cds_free_context(cds_context, QDF_MODULE_ID_TXRX, gp_cds_context->pdev_txrx_ctx); 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", __func__); CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } 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", __func__); CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } @@ -796,12 +796,12 @@ QDF_STATUS cds_close(v_CONTEXT_t cds_context) ((p_cds_contextType) cds_context)->pMACContext = NULL; if (true == wma_needshutdown(cds_context)) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to shutdown wma", __func__); } else { 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", __func__); CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } @@ -809,7 +809,7 @@ QDF_STATUS 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)); } @@ -818,14 +818,14 @@ QDF_STATUS 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", __func__); CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } 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", __func__); CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } @@ -850,76 +850,76 @@ QDF_STATUS cds_close(v_CONTEXT_t cds_context) * specified, or NULL if the context data is not allocated for * the module ID specified */ -void *cds_get_context(CDF_MODULE_ID moduleId) +void *cds_get_context(QDF_MODULE_ID moduleId) { void *pModContext = NULL; if (gp_cds_context == NULL) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: cds context pointer is null", __func__); return NULL; } switch (moduleId) { - case CDF_MODULE_ID_HDD: + case QDF_MODULE_ID_HDD: { pModContext = gp_cds_context->pHDDContext; break; } - case CDF_MODULE_ID_SME: - case CDF_MODULE_ID_PE: + case QDF_MODULE_ID_SME: + case QDF_MODULE_ID_PE: { /* In all these cases, we just return the MAC Context */ pModContext = gp_cds_context->pMACContext; break; } - case CDF_MODULE_ID_WMA: + case QDF_MODULE_ID_WMA: { /* For wma module */ pModContext = gp_cds_context->pWMAContext; break; } - case CDF_MODULE_ID_CDF: + case QDF_MODULE_ID_QDF: { /* For SYS this is CDS itself */ pModContext = gp_cds_context; break; } - case CDF_MODULE_ID_HIF: + case QDF_MODULE_ID_HIF: { pModContext = gp_cds_context->pHIFContext; break; } - case CDF_MODULE_ID_HTC: + case QDF_MODULE_ID_HTC: { pModContext = gp_cds_context->htc_ctx; break; } - case CDF_MODULE_ID_CDF_DEVICE: + case QDF_MODULE_ID_QDF_DEVICE: { - pModContext = gp_cds_context->cdf_ctx; + pModContext = gp_cds_context->qdf_ctx; break; } - case CDF_MODULE_ID_BMI: + case QDF_MODULE_ID_BMI: { pModContext = gp_cds_context->g_ol_context; break; } - case CDF_MODULE_ID_TXRX: + case QDF_MODULE_ID_TXRX: { pModContext = gp_cds_context->pdev_txrx_ctx; break; } - case CDF_MODULE_ID_CFG: + case QDF_MODULE_ID_CFG: { pModContext = gp_cds_context->cfg_ctx; break; @@ -927,7 +927,7 @@ void *cds_get_context(CDF_MODULE_ID moduleId) default: { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Module ID %i does not have its context maintained by CDS", __func__, moduleId); CDF_ASSERT(0); @@ -936,7 +936,7 @@ void *cds_get_context(CDF_MODULE_ID moduleId) } if (pModContext == NULL) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Module ID %i context is Null", __func__, moduleId); } @@ -956,7 +956,7 @@ void *cds_get_context(CDF_MODULE_ID moduleId) v_CONTEXT_t cds_get_global_context(void) { if (gp_cds_context == NULL) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: global cds context is NULL", __func__); } @@ -973,7 +973,7 @@ v_CONTEXT_t cds_get_global_context(void) enum cds_driver_state cds_get_driver_state(void) { if (gp_cds_context == NULL) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: global cds context is NULL", __func__); return CDS_DRIVER_STATE_UNINITIALIZED; @@ -995,7 +995,7 @@ enum cds_driver_state cds_get_driver_state(void) void cds_set_driver_state(enum cds_driver_state state) { if (gp_cds_context == NULL) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: global cds context is NULL: %x", __func__, state); @@ -1017,7 +1017,7 @@ void cds_set_driver_state(enum cds_driver_state state) void cds_clear_driver_state(enum cds_driver_state state) { if (gp_cds_context == NULL) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: global cds context is NULL: %x", __func__, state); @@ -1041,51 +1041,51 @@ void cds_clear_driver_state(enum cds_driver_state state) * * Return: CDF status */ -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) { void **pGpModContext = NULL; if (p_cds_context == NULL) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: cds context is null", __func__); return QDF_STATUS_E_FAILURE; } if ((gp_cds_context != p_cds_context) || (ppModuleContext == NULL)) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: context mismatch or null param passed", __func__); return QDF_STATUS_E_FAILURE; } switch (moduleID) { - case CDF_MODULE_ID_WMA: + case QDF_MODULE_ID_WMA: { pGpModContext = &(gp_cds_context->pWMAContext); break; } - case CDF_MODULE_ID_HIF: + case QDF_MODULE_ID_HIF: { pGpModContext = &(gp_cds_context->pHIFContext); break; } - case CDF_MODULE_ID_BMI: + case QDF_MODULE_ID_BMI: { pGpModContext = &(gp_cds_context->g_ol_context); break; } - case CDF_MODULE_ID_EPPING: - case CDF_MODULE_ID_SME: - case CDF_MODULE_ID_PE: - case CDF_MODULE_ID_HDD: - case CDF_MODULE_ID_HDD_SOFTAP: + case QDF_MODULE_ID_EPPING: + case QDF_MODULE_ID_SME: + case QDF_MODULE_ID_PE: + case QDF_MODULE_ID_HDD: + case QDF_MODULE_ID_HDD_SOFTAP: default: { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Module ID %i " "does not have its context allocated by CDS", __func__, moduleID); @@ -1098,7 +1098,7 @@ QDF_STATUS cds_alloc_context(void *p_cds_context, CDF_MODULE_ID moduleID, /* Context has already been allocated! * Prevent double allocation */ - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Module ID %i context has already been allocated", __func__, moduleID); return QDF_STATUS_E_EXISTS; @@ -1109,14 +1109,14 @@ QDF_STATUS cds_alloc_context(void *p_cds_context, CDF_MODULE_ID moduleID, *ppModuleContext = cdf_mem_malloc(size); if (*ppModuleContext == NULL) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to " "allocate Context for module ID %i", __func__, moduleID); CDF_ASSERT(0); return QDF_STATUS_E_NOMEM; } - if (moduleID == CDF_MODULE_ID_TLSHIM) + if (moduleID == QDF_MODULE_ID_TLSHIM) cdf_mem_zero(*ppModuleContext, size); *pGpModContext = *ppModuleContext; @@ -1133,22 +1133,22 @@ QDF_STATUS cds_alloc_context(void *p_cds_context, CDF_MODULE_ID moduleID, * * Return: QDF_STATUS */ -QDF_STATUS cds_set_context(CDF_MODULE_ID module_id, void *context) +QDF_STATUS cds_set_context(QDF_MODULE_ID module_id, void *context) { p_cds_contextType p_cds_context = cds_get_global_context(); if (!p_cds_context) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "cds context is Invald"); return QDF_STATUS_NOT_INITIALIZED; } switch (module_id) { - case CDF_MODULE_ID_HIF: + case QDF_MODULE_ID_HIF: p_cds_context->pHIFContext = context; break; default: - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Module ID %i does not have its context " "allocated by CDS", __func__, module_id); CDF_ASSERT(0); @@ -1170,51 +1170,51 @@ QDF_STATUS cds_set_context(CDF_MODULE_ID module_id, void *context) * * Return: CDF status */ -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) { void **pGpModContext = NULL; if ((p_cds_context == NULL) || (gp_cds_context != p_cds_context) || (pModuleContext == NULL)) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Null params or context mismatch", __func__); return QDF_STATUS_E_FAILURE; } switch (moduleID) { - case CDF_MODULE_ID_WMA: + case QDF_MODULE_ID_WMA: { pGpModContext = &(gp_cds_context->pWMAContext); break; } - case CDF_MODULE_ID_HIF: + case QDF_MODULE_ID_HIF: { pGpModContext = &(gp_cds_context->pHIFContext); break; } - case CDF_MODULE_ID_TXRX: + case QDF_MODULE_ID_TXRX: { pGpModContext = &(gp_cds_context->pdev_txrx_ctx); break; } - case CDF_MODULE_ID_BMI: + case QDF_MODULE_ID_BMI: { pGpModContext = &(gp_cds_context->g_ol_context); break; } - case CDF_MODULE_ID_EPPING: - case CDF_MODULE_ID_HDD: - case CDF_MODULE_ID_SME: - case CDF_MODULE_ID_PE: - case CDF_MODULE_ID_HDD_SOFTAP: + case QDF_MODULE_ID_EPPING: + case QDF_MODULE_ID_HDD: + case QDF_MODULE_ID_SME: + case QDF_MODULE_ID_PE: + case QDF_MODULE_ID_HDD_SOFTAP: default: { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Module ID %i " "does not have its context allocated by CDS", __func__, moduleID); @@ -1225,7 +1225,7 @@ QDF_STATUS cds_free_context(void *p_cds_context, CDF_MODULE_ID moduleID, if (NULL == *pGpModContext) { /* Context has not been allocated or freed already! */ - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Module ID %i " "context has not been allocated or freed already", __func__, moduleID); @@ -1233,7 +1233,7 @@ QDF_STATUS cds_free_context(void *p_cds_context, CDF_MODULE_ID moduleID, } if (*pGpModContext != pModuleContext) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: pGpModContext != pModuleContext", __func__); return QDF_STATUS_E_FAILURE; } @@ -1265,7 +1265,7 @@ QDF_STATUS cds_mq_post_message(CDS_MQ_ID msgQueueId, cds_msg_t *pMsg) uint32_t debug_count = 0; if ((gp_cds_context == NULL) || (pMsg == NULL)) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Null params or global cds context is null", __func__); CDF_ASSERT(0); @@ -1302,7 +1302,7 @@ QDF_STATUS cds_mq_post_message(CDS_MQ_ID msgQueueId, cds_msg_t *pMsg) } default: - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, ("%s: Trying to queue msg into unknown MC Msg queue ID %d"), __func__, msgQueueId); @@ -1311,7 +1311,7 @@ QDF_STATUS cds_mq_post_message(CDS_MQ_ID msgQueueId, cds_msg_t *pMsg) CDF_ASSERT(NULL != pTargetMq); if (pTargetMq == NULL) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: pTargetMq == NULL", __func__); return QDF_STATUS_E_FAILURE; } @@ -1322,7 +1322,7 @@ QDF_STATUS cds_mq_post_message(CDS_MQ_ID msgQueueId, cds_msg_t *pMsg) if (NULL == pMsgWrapper) { debug_count = atomic_inc_return(&cds_wrapper_empty_count); if (1 == debug_count) - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: CDS Core run out of message wrapper %d", __func__, debug_count); @@ -1355,13 +1355,13 @@ QDF_STATUS cds_mq_post_message(CDS_MQ_ID msgQueueId, cds_msg_t *pMsg) void cds_sys_probe_thread_cback(void *pUserData) { if (gp_cds_context != pUserData) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: gp_cds_context != pUserData", __func__); return; } if (qdf_event_set(&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: qdf_event_set failed", __func__); return; } @@ -1376,14 +1376,14 @@ void cds_sys_probe_thread_cback(void *pUserData) void cds_wma_complete_cback(void *pUserData) { if (gp_cds_context != pUserData) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: gp_cds_context != pUserData", __func__); return; } if (qdf_event_set(&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: qdf_event_set failed", __func__); return; } @@ -1403,7 +1403,7 @@ void cds_core_return_msg(void *pVContext, p_cds_msg_wrapper pMsgWrapper) CDF_ASSERT(gp_cds_context == p_cds_context); if (gp_cds_context != p_cds_context) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: gp_cds_context != p_cds_context", __func__); return; } @@ -1411,7 +1411,7 @@ void cds_core_return_msg(void *pVContext, p_cds_msg_wrapper pMsgWrapper) CDF_ASSERT(NULL != pMsgWrapper); if (pMsgWrapper == NULL) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: pMsgWrapper == NULL in function", __func__); return; } @@ -1437,12 +1437,12 @@ QDF_STATUS cds_shutdown(v_CONTEXT_t cds_context) tpAniSirGlobal pmac = (((p_cds_contextType)cds_context)->pMACContext); ol_txrx_pdev_detach(gp_cds_context->pdev_txrx_ctx, 1); - cds_free_context(cds_context, CDF_MODULE_ID_TXRX, + cds_free_context(cds_context, QDF_MODULE_ID_TXRX, gp_cds_context->pdev_txrx_ctx); 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", __func__); CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } @@ -1460,7 +1460,7 @@ QDF_STATUS cds_shutdown(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", __func__); CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } @@ -1471,7 +1471,7 @@ QDF_STATUS cds_shutdown(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!", __func__); CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } @@ -1479,7 +1479,7 @@ QDF_STATUS cds_shutdown(v_CONTEXT_t cds_context) qdf_status = wma_wmi_work_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_work!", __func__); CDF_ASSERT(0); } @@ -1492,7 +1492,7 @@ QDF_STATUS cds_shutdown(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)); } @@ -1501,14 +1501,14 @@ QDF_STATUS cds_shutdown(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", __func__); CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } 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", __func__); CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } @@ -1524,7 +1524,7 @@ QDF_STATUS cds_shutdown(v_CONTEXT_t cds_context) * * Return: WMI vdev type */ -QDF_STATUS cds_get_vdev_types(enum tCDF_ADAPTER_MODE mode, uint32_t *type, +QDF_STATUS cds_get_vdev_types(enum tQDF_ADAPTER_MODE mode, uint32_t *type, uint32_t *sub_type) { QDF_STATUS status = QDF_STATUS_SUCCESS; @@ -1532,29 +1532,29 @@ QDF_STATUS cds_get_vdev_types(enum tCDF_ADAPTER_MODE mode, uint32_t *type, *sub_type = 0; switch (mode) { - case CDF_STA_MODE: + case QDF_STA_MODE: *type = WMI_VDEV_TYPE_STA; break; - case CDF_SAP_MODE: + case QDF_SAP_MODE: *type = WMI_VDEV_TYPE_AP; break; - case CDF_P2P_DEVICE_MODE: + case QDF_P2P_DEVICE_MODE: *type = WMI_VDEV_TYPE_AP; *sub_type = WMI_UNIFIED_VDEV_SUBTYPE_P2P_DEVICE; break; - case CDF_P2P_CLIENT_MODE: + case QDF_P2P_CLIENT_MODE: *type = WMI_VDEV_TYPE_STA; *sub_type = WMI_UNIFIED_VDEV_SUBTYPE_P2P_CLIENT; break; - case CDF_P2P_GO_MODE: + case QDF_P2P_GO_MODE: *type = WMI_VDEV_TYPE_AP; *sub_type = WMI_UNIFIED_VDEV_SUBTYPE_P2P_GO; break; - case CDF_OCB_MODE: + case QDF_OCB_MODE: *type = WMI_VDEV_TYPE_OCB; break; default: - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "Invalid device mode %d", mode); status = QDF_STATUS_E_INVAL; break; @@ -1603,7 +1603,7 @@ bool cds_is_packet_log_enabled(void) pHddCtx = (hdd_context_t *) (gp_cds_context->pHDDContext); if ((NULL == pHddCtx) || (NULL == pHddCtx->config)) { - 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 false; } @@ -1618,11 +1618,11 @@ bool cds_is_packet_log_enabled(void) */ void cds_trigger_recovery(void) { - tp_wma_handle wma_handle = cds_get_context(CDF_MODULE_ID_WMA); + tp_wma_handle wma_handle = cds_get_context(QDF_MODULE_ID_WMA); QDF_STATUS status = QDF_STATUS_SUCCESS; if (!wma_handle) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "WMA context is invald!"); return; } @@ -1633,11 +1633,11 @@ void cds_trigger_recovery(void) WMA_CRASH_INJECT_TIMEOUT); if (QDF_STATUS_SUCCESS != status) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "CRASH_INJECT command is timed out!"); #ifdef CONFIG_CNSS 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, "Recovery is in progress, ignore!"); return; } @@ -1683,7 +1683,7 @@ void cds_set_wakelock_logging(bool value) p_cds_context = cds_get_global_context(); if (!p_cds_context) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "cds context is Invald"); return; } @@ -1704,7 +1704,7 @@ bool cds_is_wakelock_enabled(void) p_cds_context = cds_get_global_context(); if (!p_cds_context) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "cds context is Invald"); return false; } @@ -1728,7 +1728,7 @@ void cds_set_ring_log_level(uint32_t ring_id, uint32_t log_level) p_cds_context = cds_get_global_context(); if (!p_cds_context) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: cds context is Invald", __func__); return; } @@ -1781,7 +1781,7 @@ enum wifi_driver_log_level cds_get_ring_log_level(uint32_t ring_id) p_cds_context = cds_get_global_context(); if (!p_cds_context) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: cds context is Invald", __func__); return WLAN_LOG_LEVEL_OFF; } @@ -1843,7 +1843,7 @@ void cds_init_log_completion(void) p_cds_context = cds_get_global_context(); if (!p_cds_context) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: cds context is Invalid", __func__); return; } @@ -1872,7 +1872,7 @@ void cds_deinit_log_completion(void) p_cds_context = cds_get_global_context(); if (!p_cds_context) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: cds context is Invalid", __func__); return; } @@ -1899,7 +1899,7 @@ QDF_STATUS cds_set_log_completion(uint32_t is_fatal, p_cds_context = cds_get_global_context(); if (!p_cds_context) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: cds context is Invalid", __func__); return QDF_STATUS_E_FAILURE; } @@ -1931,7 +1931,7 @@ void cds_get_log_completion(uint32_t *is_fatal, p_cds_context = cds_get_global_context(); if (!p_cds_context) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: cds context is Invalid", __func__); return; } @@ -1957,7 +1957,7 @@ bool cds_is_log_report_in_progress(void) p_cds_context = cds_get_global_context(); if (!p_cds_context) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: cds context is Invalid", __func__); return true; } @@ -1987,13 +1987,13 @@ QDF_STATUS cds_flush_logs(uint32_t is_fatal, p_cds_context = cds_get_global_context(); if (!p_cds_context) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: cds context is Invalid", __func__); return QDF_STATUS_E_FAILURE; } if (cds_is_log_report_in_progress() == true) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Bug report already in progress - dropping! type:%d, indicator=%d reason_code=%d", __func__, is_fatal, indicator, reason_code); return QDF_STATUS_E_FAILURE; @@ -2001,18 +2001,18 @@ QDF_STATUS cds_flush_logs(uint32_t is_fatal, status = cds_set_log_completion(is_fatal, indicator, reason_code); if (QDF_STATUS_SUCCESS != status) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to set log trigger params", __func__); return QDF_STATUS_E_FAILURE; } - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, "%s: Triggering bug report: type:%d, indicator=%d reason_code=%d", __func__, is_fatal, indicator, reason_code); ret = sme_send_flush_logs_cmd_to_fw(p_cds_context->pMACContext); if (0 != ret) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to send flush FW log", __func__); cds_init_log_completion(); return QDF_STATUS_E_FAILURE; diff --git a/core/cds/src/cds_concurrency.c b/core/cds/src/cds_concurrency.c index 2c33fd5452..603a1011b1 100644 --- a/core/cds/src/cds_concurrency.c +++ b/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 @@ -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; } diff --git a/core/cds/src/cds_mq.c b/core/cds/src/cds_mq.c index 70ba1629eb..e78fbec41d 100644 --- a/core/cds/src/cds_mq.c +++ b/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); diff --git a/core/cds/src/cds_packet.c b/core/cds/src/cds_packet.c index 4b527948b7..088ec9d69b 100644 --- a/core/cds/src/cds_packet.c +++ b/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); diff --git a/core/cds/src/cds_reg_service.c b/core/cds/src/cds_reg_service.c index 3bd1b4b368..71879692eb 100644 --- a/core/cds/src/cds_reg_service.c +++ b/core/cds/src/cds_reg_service.c @@ -32,7 +32,7 @@ ============================================================================*/ #include -#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; } diff --git a/core/cds/src/cds_regdomain.c b/core/cds/src/cds_regdomain.c index e3c897c81c..78dd456121 100644 --- a/core/cds/src/cds_regdomain.c +++ b/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 +#include #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; } diff --git a/core/cds/src/cds_sched.c b/core/cds/src/cds_sched.c index ff22f1a8a8..9b331b3e74 100644 --- a/core/cds/src/cds_sched.c +++ b/core/cds/src/cds_sched.c @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include #include @@ -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; diff --git a/core/cds/src/cds_utils.c b/core/cds/src/cds_utils.c index 048061fe13..2b232e37d6 100644 --- a/core/cds/src/cds_utils.c +++ b/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; } diff --git a/core/cds/src/i_cds_packet.h b/core/cds/src/i_cds_packet.h index 0a0e3a69f7..c21c70ac5b 100644 --- a/core/cds/src/i_cds_packet.h +++ b/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; diff --git a/core/dp/htt/htt.c b/core/dp/htt/htt.c index 8c570a048f..c4d4195e8d 100644 --- a/core/dp/htt/htt.c +++ b/core/dp/htt/htt.c @@ -35,7 +35,7 @@ */ #include /* cdf_mem_malloc */ -#include /* cdf_device_t, cdf_print */ +#include /* qdf_device_t, qdf_print */ #include /* htt_tx_msdu_desc_t */ #include @@ -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; diff --git a/core/dp/htt/htt_fw_stats.c b/core/dp/htt/htt_fw_stats.c index aee627d0e6..da6324a8da 100644 --- a/core/dp/htt/htt_fw_stats.c +++ b/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; } diff --git a/core/dp/htt/htt_h2t.c b/core/dp/htt/htt_h2t.c index e7879b84f0..568dc2e238 100644 --- a/core/dp/htt/htt_h2t.c +++ b/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; diff --git a/core/dp/htt/htt_internal.h b/core/dp/htt/htt_internal.h index e18985fed2..8601985dd5 100644 --- a/core/dp/htt/htt_internal.h +++ b/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); } } diff --git a/core/dp/htt/htt_rx.c b/core/dp/htt/htt_rx.c index c174987702..3cf9b0abc3 100644 --- a/core/dp/htt/htt_rx.c +++ b/core/dp/htt/htt_rx.c @@ -40,7 +40,7 @@ */ #include /* cdf_mem_malloc,free, etc. */ -#include /* cdf_print, bool */ +#include /* qdf_print, bool */ #include /* cdf_nbuf_t, etc. */ #include /* 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)); } diff --git a/core/dp/htt/htt_t2h.c b/core/dp/htt/htt_t2h.c index 05756de03b..dc01ab8a41 100644 --- a/core/dp/htt/htt_t2h.c +++ b/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 diff --git a/core/dp/htt/htt_tx.c b/core/dp/htt/htt_tx.c index d0255ca210..549b0ee062 100644 --- a/core/dp/htt/htt_tx.c +++ b/core/dp/htt/htt_tx.c @@ -37,7 +37,7 @@ * tx frame to HTC. */ #include /* uint32_t, offsetof, etc. */ -#include /* cdf_dma_addr_t */ +#include /* qdf_dma_addr_t */ #include /* cdf_os_mem_alloc_consistent et al */ #include /* cdf_nbuf_t, etc. */ #include /* 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; diff --git a/core/dp/htt/htt_types.h b/core/dp/htt/htt_types.h index 68a937c311..0aa8fc26a4 100644 --- a/core/dp/htt/htt_types.h +++ b/core/dp/htt/htt_types.h @@ -29,7 +29,7 @@ #define _HTT_TYPES__H_ #include /* uint16_t, dma_addr_t */ -#include /* cdf_device_t */ +#include /* qdf_device_t */ #include /* cdf_spinlock_t */ #include /* qdf_timer_t */ #include /* 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) */ diff --git a/core/dp/ol/inc/ol_cfg.h b/core/dp/ol/inc/ol_cfg.h index 4e59ea397d..88224ccd81 100644 --- a/core/dp/ol/inc/ol_cfg.h +++ b/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 /* uint32_t */ +#include /* uint32_t */ #include /* ol_pdev_handle */ #include /* ieee80211_qosframe_htc_addr4 */ #include /* LLC_SNAP_HDR_LEN */ diff --git a/core/dp/ol/inc/ol_htt_api.h b/core/dp/ol/inc/ol_htt_api.h index d8d2272f46..0cf49b5ac2 100644 --- a/core/dp/ol/inc/ol_htt_api.h +++ b/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_device_t */ +#include /* qdf_device_t */ #include /* cdf_nbuf_t */ #include /* A_STATUS */ #include /* 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; diff --git a/core/dp/ol/inc/ol_htt_rx_api.h b/core/dp/ol/inc/ol_htt_rx_api.h index d94c707da4..230d87b4a1 100644 --- a/core/dp/ol/inc/ol_htt_rx_api.h +++ b/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 / * uint16_t, etc. * / */ #include /* uint16_t, etc. */ #include /* cdf_nbuf_t */ -#include /* bool */ +#include /* bool */ #include /* HTT_RX_IND_MPDU_STATUS */ #include /* htt_pdev_handle */ diff --git a/core/dp/ol/inc/ol_htt_tx_api.h b/core/dp/ol/inc/ol_htt_tx_api.h index b46f2ab729..909267046d 100644 --- a/core/dp/ol/inc/ol_htt_tx_api.h +++ b/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 diff --git a/core/dp/ol/inc/ol_txrx_ctrl_api.h b/core/dp/ol/inc/ol_txrx_ctrl_api.h index 88333fa6b0..f681c2917d 100644 --- a/core/dp/ol/inc/ol_txrx_ctrl_api.h +++ b/core/dp/ol/inc/ol_txrx_ctrl_api.h @@ -34,7 +34,7 @@ #include /* A_STATUS */ #include /* cdf_nbuf_t */ -#include /* cdf_device_t */ +#include /* qdf_device_t */ #include /* HTC_HANDLE */ #include /* 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; } diff --git a/core/dp/ol/inc/ol_txrx_htt_api.h b/core/dp/ol/inc/ol_txrx_htt_api.h index 09041cadf3..562167a116 100644 --- a/core/dp/ol/inc/ol_txrx_htt_api.h +++ b/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); } /** diff --git a/core/dp/ol/inc/ol_txrx_stats.h b/core/dp/ol/inc/ol_txrx_stats.h index 44b384d5b2..4a98a83281 100644 --- a/core/dp/ol/inc/ol_txrx_stats.h +++ b/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; }; diff --git a/core/dp/txrx/ol_cfg.c b/core/dp/txrx/ol_cfg.c index c921e2ddda..29e4c1b345 100644 --- a/core/dp/txrx/ol_cfg.c +++ b/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; diff --git a/core/dp/txrx/ol_osif_txrx_api.h b/core/dp/txrx/ol_osif_txrx_api.h index b47a0b6cdb..2014d4f407 100644 --- a/core/dp/txrx/ol_osif_txrx_api.h +++ b/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_ */ diff --git a/core/dp/txrx/ol_rx.c b/core/dp/txrx/ol_rx.c index 310d13d842..ba1ed60b76 100644 --- a/core/dp/txrx/ol_rx.c +++ b/core/dp/txrx/ol_rx.c @@ -27,7 +27,7 @@ #include /* cdf_nbuf_t, etc. */ #include /* cdf_os_cpu_to_le64 */ -#include /* bool */ +#include /* bool */ #include /* 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 diff --git a/core/dp/txrx/ol_rx_defrag.h b/core/dp/txrx/ol_rx_defrag.h index 512fa5dacb..85193ff33c 100644 --- a/core/dp/txrx/ol_rx_defrag.h +++ b/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 #include #include -#include +#include #include #include #include @@ -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]; diff --git a/core/dp/txrx/ol_rx_fwd.c b/core/dp/txrx/ol_rx_fwd.c index e97f34f057..64c700b3ed 100644 --- a/core/dp/txrx/ol_rx_fwd.c +++ b/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); } } diff --git a/core/dp/txrx/ol_rx_pn.c b/core/dp/txrx/ol_rx_pn.c index a37125ae79..8740f79e58 100644 --- a/core/dp/txrx/ol_rx_pn.c +++ b/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, diff --git a/core/dp/txrx/ol_rx_reorder.c b/core/dp/txrx/ol_rx_reorder.c index e6f3c16349..debe0c4938 100644 --- a/core/dp/txrx/ol_rx_reorder.c +++ b/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); diff --git a/core/dp/txrx/ol_rx_reorder_timeout.c b/core/dp/txrx/ol_rx_reorder_timeout.c index f908bd65b9..877516ae7a 100644 --- a/core/dp/txrx/ol_rx_reorder_timeout.c +++ b/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 = diff --git a/core/dp/txrx/ol_tx.c b/core/dp/txrx/ol_tx.c index 3ac0976aac..71a1252155 100644 --- a/core/dp/txrx/ol_tx.c +++ b/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); diff --git a/core/dp/txrx/ol_tx_desc.c b/core/dp/txrx/ol_tx_desc.c index a6aba47641..5f405f1dd8 100644 --- a/core/dp/txrx/ol_tx_desc.c +++ b/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 */ diff --git a/core/dp/txrx/ol_tx_queue.c b/core/dp/txrx/ol_tx_queue.c index b60789c16f..ffc8de1277 100644 --- a/core/dp/txrx/ol_tx_queue.c +++ b/core/dp/txrx/ol_tx_queue.c @@ -39,7 +39,7 @@ #include /* ol_tx_vdev_ll_pause_queue_send */ #include #include /* ENABLE_TX_QUEUE_LOG */ -#include /* bool */ +#include /* 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; diff --git a/core/dp/txrx/ol_tx_queue.h b/core/dp/txrx/ol_tx_queue.h index be809134a1..5da4b9f3fc 100644 --- a/core/dp/txrx/ol_tx_queue.h +++ b/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_t */ #include /* ol_txrx_vdev_t, etc. */ -#include /* bool */ +#include /* bool */ /*--- function prototypes for optional queue log feature --------------------*/ #if defined(ENABLE_TX_QUEUE_LOG) diff --git a/core/dp/txrx/ol_tx_send.c b/core/dp/txrx/ol_tx_send.c index 6ab22acf34..4e618f7161 100644 --- a/core/dp/txrx/ol_tx_send.c +++ b/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); diff --git a/core/dp/txrx/ol_txrx.c b/core/dp/txrx/ol_txrx.c index 6dbf31c04b..219a41d8a0 100644 --- a/core/dp/txrx/ol_txrx.c +++ b/core/dp/txrx/ol_txrx.c @@ -29,7 +29,7 @@ /* header files for OS primitives */ #include /* uint32_t, etc. */ #include /* cdf_mem_malloc,free */ -#include /* cdf_device_t, cdf_print */ +#include /* qdf_device_t, qdf_print */ #include /* cdf_spinlock */ #include /* 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); diff --git a/core/dp/txrx/ol_txrx.h b/core/dp/txrx/ol_txrx.h index 4e77867ce3..38d2ebe883 100644 --- a/core/dp/txrx/ol_txrx.h +++ b/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)) { diff --git a/core/dp/txrx/ol_txrx_event.c b/core/dp/txrx/ol_txrx_event.c index 3410a14083..87c91ab253 100644 --- a/core/dp/txrx/ol_txrx_event.c +++ b/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; } diff --git a/core/dp/txrx/ol_txrx_flow_control.c b/core/dp/txrx/ol_txrx_flow_control.c index cd352e12b3..71163d8f46 100644 --- a/core/dp/txrx/ol_txrx_flow_control.c +++ b/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; diff --git a/core/dp/txrx/ol_txrx_internal.h b/core/dp/txrx/ol_txrx_internal.h index 85da268306..6d6308fb96 100644 --- a/core/dp/txrx/ol_txrx_internal.h +++ b/core/dp/txrx/ol_txrx_internal.h @@ -103,14 +103,14 @@ extern unsigned g_txrx_print_level; #ifdef TXRX_PRINT_ENABLE #include /* va_list */ -#include /* cdf_vprint */ +#include /* 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); diff --git a/core/dp/txrx/ol_txrx_peer_find.c b/core/dp/txrx/ol_txrx_peer_find.c index 495afa0e30..2a6619e8ea 100644 --- a/core/dp/txrx/ol_txrx_peer_find.c +++ b/core/dp/txrx/ol_txrx_peer_find.c @@ -29,7 +29,7 @@ /* header files for OS primitives */ #include /* uint32_t, etc. */ #include /* cdf_mem_malloc, etc. */ -#include /* cdf_device_t, cdf_print */ +#include /* qdf_device_t, qdf_print */ /* header files for utilities */ #include /* 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, diff --git a/core/dp/txrx/ol_txrx_types.h b/core/dp/txrx/ol_txrx_types.h index 9f5e7fbf5e..86466f0a5e 100644 --- a/core/dp/txrx/ol_txrx_types.h +++ b/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; diff --git a/core/hdd/inc/qc_sap_ioctl.h b/core/hdd/inc/qc_sap_ioctl.h index d5b8259a73..5a1bfbef9f 100644 --- a/core/hdd/inc/qc_sap_ioctl.h +++ b/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; diff --git a/core/hdd/inc/wlan_hdd_assoc.h b/core/hdd/inc/wlan_hdd_assoc.h index 45f1a08e06..768ee713ab 100644 --- a/core/hdd/inc/wlan_hdd_assoc.h +++ b/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; diff --git a/core/hdd/inc/wlan_hdd_cfg.h b/core/hdd/inc/wlan_hdd_cfg.h index 31929225b2..3a7c271098 100644 --- a/core/hdd/inc/wlan_hdd_cfg.h +++ b/core/hdd/inc/wlan_hdd_cfg.h @@ -40,7 +40,7 @@ /* Include files */ #include #include -#include +#include #include #include #include @@ -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; diff --git a/core/hdd/inc/wlan_hdd_ftm.h b/core/hdd/inc/wlan_hdd_ftm.h index 90280d3775..9ecccfe268 100644 --- a/core/hdd/inc/wlan_hdd_ftm.h +++ b/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 enum wlan_hdd_ftm_state { diff --git a/core/hdd/inc/wlan_hdd_host_offload.h b/core/hdd/inc/wlan_hdd_host_offload.h index e0b4b4e99c..79d52ab3db 100644 --- a/core/hdd/inc/wlan_hdd_host_offload.h +++ b/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__ */ diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h index 40c3492e7c..f0c5268f3b 100644 --- a/core/hdd/inc/wlan_hdd_main.h +++ b/core/hdd/inc/wlan_hdd_main.h @@ -43,7 +43,7 @@ #include #include #include -#include +#include #include "sir_mac_prot_def.h" #include "csr_api.h" #include @@ -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); diff --git a/core/hdd/inc/wlan_hdd_mib.h b/core/hdd/inc/wlan_hdd_mib.h index 8fe44a8e96..6d9482d770 100644 --- a/core/hdd/inc/wlan_hdd_mib.h +++ b/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 +#include 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; diff --git a/core/hdd/inc/wlan_hdd_oemdata.h b/core/hdd/inc/wlan_hdd_oemdata.h index 2acf25590a..c17ddedad5 100644 --- a/core/hdd/inc/wlan_hdd_oemdata.h +++ b/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, diff --git a/core/hdd/inc/wlan_hdd_softap_tx_rx.h b/core/hdd/inc/wlan_hdd_softap_tx_rx.h index 8d122c71a0..eff0fb1a70 100644 --- a/core/hdd/inc/wlan_hdd_softap_tx_rx.h +++ b/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 diff --git a/core/hdd/inc/wlan_hdd_tdls.h b/core/hdd/inc/wlan_hdd_tdls.h index db275de7c9..5e149a879e 100644 --- a/core/hdd/inc/wlan_hdd_tdls.h +++ b/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; /** diff --git a/core/hdd/inc/wlan_hdd_tx_rx.h b/core/hdd/inc/wlan_hdd_tx_rx.h index 7044844012..b12c198b96 100644 --- a/core/hdd/inc/wlan_hdd_tx_rx.h +++ b/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 diff --git a/core/hdd/inc/wlan_hdd_wext.h b/core/hdd/inc/wlan_hdd_wext.h index 809d4b4dd9..c91add39a7 100644 --- a/core/hdd/inc/wlan_hdd_wext.h +++ b/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, diff --git a/core/hdd/inc/wlan_hdd_wowl.h b/core/hdd/inc/wlan_hdd_wowl.h index 3230f6a787..2ca9755e83 100644 --- a/core/hdd/inc/wlan_hdd_wowl.h +++ b/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 +#include #define WOWL_PTRN_MAX_SIZE 146 #define WOWL_PTRN_MASK_MAX_SIZE 19 diff --git a/core/hdd/src/wlan_hdd_assoc.c b/core/hdd/src/wlan_hdd_assoc.c index 211d092d10..07d4cb7ff7 100644 --- a/core/hdd/src/wlan_hdd_assoc.c +++ b/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)); } diff --git a/core/hdd/src/wlan_hdd_cfg.c b/core/hdd/src/wlan_hdd_cfg.c index 194af13edd..dd95af0386 100644 --- a/core/hdd/src/wlan_hdd_cfg.c +++ b/core/hdd/src/wlan_hdd_cfg.c @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include #include #include @@ -3782,7 +3782,7 @@ static QDF_STATUS hdd_cfg_get_config(REG_TABLE_ENTRY *reg_table, char configStr[CFG_ENTRY_MAX_LEN]; char *fmt; void *pField; - struct cdf_mac_addr *pMacAddr; + struct qdf_mac_addr *pMacAddr; char *pCur = pBuf; int curlen; @@ -3810,7 +3810,7 @@ static QDF_STATUS hdd_cfg_get_config(REG_TABLE_ENTRY *reg_table, snprintf(valueStr, CFG_VALUE_MAX_LEN, "%s", (char *)pField); } else if (WLAN_PARAM_MacAddr == pRegEntry->RegType) { - pMacAddr = (struct cdf_mac_addr *) pField; + pMacAddr = (struct qdf_mac_addr *) pField; snprintf(valueStr, CFG_VALUE_MAX_LEN, "%02x:%02x:%02x:%02x:%02x:%02x", pMacAddr->bytes[0], @@ -3887,7 +3887,7 @@ static QDF_STATUS find_cfg_item(tCfgIniEntry *iniTable, unsigned long entries, for (i = 0; i < entries; i++) { if (strcmp(iniTable[i].name, name) == 0) { *value = iniTable[i].value; - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Found %s entry for Name=[%s] Value=[%s] ", WLAN_INI_FILE, name, *value); return QDF_STATUS_SUCCESS; @@ -3930,13 +3930,13 @@ static void update_mac_from_string(hdd_context_t *pHddCtx, { int i = 0, j = 0, res = 0; char *candidate = NULL; - struct cdf_mac_addr macaddr[CDF_MAX_CONCURRENCY_PERSONA]; + struct qdf_mac_addr macaddr[QDF_MAX_CONCURRENCY_PERSONA]; memset(macaddr, 0, sizeof(macaddr)); for (i = 0; i < num; i++) { candidate = macTable[i].value; - for (j = 0; j < CDF_MAC_ADDR_SIZE; j++) { + for (j = 0; j < QDF_MAC_ADDR_SIZE; j++) { res = hex2bin(&macaddr[i].bytes[j], &candidate[(j << 1)], 1); @@ -3947,7 +3947,7 @@ static void update_mac_from_string(hdd_context_t *pHddCtx, cdf_mem_copy((uint8_t *) &pHddCtx->config-> intfMacAddr[i].bytes[0], (uint8_t *) &macaddr[i].bytes[0], - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); } } } @@ -3977,7 +3977,7 @@ static QDF_STATUS hdd_apply_cfg_ini(hdd_context_t *pHddCtx, int32_t svalue; void *pStructBase = pHddCtx->config; REG_TABLE_ENTRY *pRegEntry = g_registry_table; - unsigned long cRegTableEntries = CDF_ARRAY_SIZE(g_registry_table); + unsigned long cRegTableEntries = QDF_ARRAY_SIZE(g_registry_table); uint32_t cbOutString; int i; int rv; @@ -4142,7 +4142,7 @@ static QDF_STATUS hdd_apply_cfg_ini(hdd_context_t *pHddCtx, /* Handle string parameters */ else if (WLAN_PARAM_String == pRegEntry->RegType) { #ifdef WLAN_CFG_DEBUG - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "RegName = %s, VarOffset %u VarSize %u VarDefault %s", pRegEntry->RegName, pRegEntry->VarOffset, pRegEntry->VarSize, @@ -4184,7 +4184,7 @@ static QDF_STATUS hdd_apply_cfg_ini(hdd_context_t *pHddCtx, ((uint8_t *) pField)[cbOutString] = '\0'; } } else if (WLAN_PARAM_MacAddr == pRegEntry->RegType) { - if (pRegEntry->VarSize != CDF_MAC_ADDR_SIZE) { + if (pRegEntry->VarSize != QDF_MAC_ADDR_SIZE) { hddLog(LOGE, "%s: Invalid VarSize %u for Name=[%s]", __func__, pRegEntry->VarSize, @@ -4194,7 +4194,7 @@ static QDF_STATUS hdd_apply_cfg_ini(hdd_context_t *pHddCtx, candidate = (char *)pRegEntry->VarDefault; if (match_status == QDF_STATUS_SUCCESS) { len_value_str = strlen(value_str); - if (len_value_str != (CDF_MAC_ADDR_SIZE * 2)) { + if (len_value_str != (QDF_MAC_ADDR_SIZE * 2)) { hddLog(LOGE, "%s: Invalid MAC addr [%s] specified for Name=[%s] in %s", __func__, value_str, @@ -4204,7 +4204,7 @@ static QDF_STATUS hdd_apply_cfg_ini(hdd_context_t *pHddCtx, candidate = value_str; } /* parse the string and store it in the byte array */ - for (i = 0; i < CDF_MAC_ADDR_SIZE; i++) { + for (i = 0; i < QDF_MAC_ADDR_SIZE; i++) { ((char *)pField)[i] = (char)(parse_hex_digit(candidate[i * 2]) * 16 + @@ -4416,17 +4416,17 @@ static QDF_STATUS hdd_execute_config_command(REG_TABLE_ENTRY *reg_table, case WLAN_PARAM_MacAddr: len_value_str = strlen(value_str); - if (len_value_str != (CDF_MAC_ADDR_SIZE * 2)) { + if (len_value_str != (QDF_MAC_ADDR_SIZE * 2)) { /* out of range */ hddLog(LOGE, "%s: invalid command, MAC address [%s] length " "%zu is not expected length %u", __func__, value_str, - len_value_str, (CDF_MAC_ADDR_SIZE * 2)); + len_value_str, (QDF_MAC_ADDR_SIZE * 2)); goto done; } /* parse the string and store it in the byte array */ - for (i = 0; i < CDF_MAC_ADDR_SIZE; i++) { + for (i = 0; i < QDF_MAC_ADDR_SIZE; i++) { ((char *)pField)[i] = (char) ((parse_hex_digit(value_str[(i * 2)]) * 16) + parse_hex_digit(value_str[(i * 2) + 1])); @@ -4499,515 +4499,515 @@ void hdd_cfg_print(hdd_context_t *pHddCtx) { int i; - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "*********Config values in HDD Adapter*******"); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [RTSThreshold] Value = %u", pHddCtx->config->RTSThreshold); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [OperatingChannel] Value = [%u]", pHddCtx->config->OperatingChannel); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [PowerUsageControl] Value = [%s]", pHddCtx->config->PowerUsageControl); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [fIsImpsEnabled] Value = [%u]", pHddCtx->config->fIsImpsEnabled); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [nVccRssiTrigger] Value = [%u]", pHddCtx->config->nVccRssiTrigger); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gIbssBssid] Value =[" MAC_ADDRESS_STR "]", MAC_ADDR_ARRAY(pHddCtx->config->IbssBssid.bytes)); - for (i = 0; i < CDF_MAX_CONCURRENCY_PERSONA; i++) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + for (i = 0; i < QDF_MAX_CONCURRENCY_PERSONA; i++) { + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [Intf%dMacAddress] Value =[" MAC_ADDRESS_STR "]", i, MAC_ADDR_ARRAY(pHddCtx->config->intfMacAddr[i].bytes)); } - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gApEnableUapsd] value = [%u]", pHddCtx->config->apUapsdEnabled); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gEnableApProt] value = [%u]", pHddCtx->config->apProtEnabled); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gAPAutoShutOff] Value = [%u]", pHddCtx->config->nAPAutoShutOff); #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gWlanMccToSccSwitchMode] Value = [%u]", pHddCtx->config->WlanMccToSccSwitchMode); #endif #ifdef FEATURE_WLAN_AUTO_SHUTDOWN - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gWlanAutoShutdown] Value = [%u]", pHddCtx->config->WlanAutoShutdown); #endif - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gEnableListenMode] Value = [%u]", pHddCtx->config->nEnableListenMode); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gApProtection] value = [%u]", pHddCtx->config->apProtection); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gEnableApOBSSProt] value = [%u]", pHddCtx->config->apOBSSProtEnabled); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [%s] value = [%u]", CFG_FORCE_SAP_ACS, pHddCtx->config->force_sap_acs); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [%s] value = [%u]", CFG_FORCE_SAP_ACS_START_CH, pHddCtx->config->force_sap_acs_st_ch); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [%s] value = [%u]", CFG_FORCE_SAP_ACS_END_CH, pHddCtx->config->force_sap_acs_end_ch); #ifdef FEATURE_AP_MCC_CH_AVOIDANCE - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [sap_channel_avoidance] value = [%u]", pHddCtx->config->sap_channel_avoidance); #endif /* FEATURE_AP_MCC_CH_AVOIDANCE */ - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [%s] value = [%u]", CFG_SAP_P2P_11AC_OVERRIDE_NAME, pHddCtx->config->sap_p2p_11ac_override); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [ChannelBondingMode] Value = [%u]", pHddCtx->config->nChannelBondingMode24GHz); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [ChannelBondingMode] Value = [%u]", pHddCtx->config->nChannelBondingMode5GHz); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [dot11Mode] Value = [%u]", pHddCtx->config->dot11Mode); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [WmmMode] Value = [%u] ", pHddCtx->config->WmmMode); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [UapsdMask] Value = [0x%x] ", pHddCtx->config->UapsdMask); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [ImplicitQosIsEnabled] Value = [%u]", (int)pHddCtx->config->bImplicitQosEnabled); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraUapsdVoSrvIntv] Value = [%u] ", pHddCtx->config->InfraUapsdVoSrvIntv); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraUapsdVoSuspIntv] Value = [%u] ", pHddCtx->config->InfraUapsdVoSuspIntv); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraUapsdViSrvIntv] Value = [%u] ", pHddCtx->config->InfraUapsdViSrvIntv); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraUapsdViSuspIntv] Value = [%u] ", pHddCtx->config->InfraUapsdViSuspIntv); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraUapsdBeSrvIntv] Value = [%u] ", pHddCtx->config->InfraUapsdBeSrvIntv); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraUapsdBeSuspIntv] Value = [%u] ", pHddCtx->config->InfraUapsdBeSuspIntv); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraUapsdBkSrvIntv] Value = [%u] ", pHddCtx->config->InfraUapsdBkSrvIntv); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraUapsdBkSuspIntv] Value = [%u] ", pHddCtx->config->InfraUapsdBkSuspIntv); #ifdef FEATURE_WLAN_ESE - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraInactivityInterval] Value = [%u] ", pHddCtx->config->InfraInactivityInterval); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [EseEnabled] Value = [%u] ", pHddCtx->config->isEseIniFeatureEnabled); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [FastTransitionEnabled] Value = [%u] ", pHddCtx->config->isFastTransitionEnabled); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gTxPowerCap] Value = [%u] dBm ", pHddCtx->config->nTxPowerCap); #endif - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [FastRoamEnabled] Value = [%u] ", pHddCtx->config->isFastRoamIniFeatureEnabled); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [MAWCEnabled] Value = [%u] ", pHddCtx->config->MAWCEnabled); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [RoamRssiDiff] Value = [%u] ", pHddCtx->config->RoamRssiDiff); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [isWESModeEnabled] Value = [%u] ", pHddCtx->config->isWESModeEnabled); #ifdef FEATURE_WLAN_OKC - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [OkcEnabled] Value = [%u] ", pHddCtx->config->isOkcIniFeatureEnabled); #endif #ifdef FEATURE_WLAN_SCAN_PNO - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [configPNOScanSupport] Value = [%u] ", pHddCtx->config->configPNOScanSupport); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [configPNOScanTimerRepeatValue] Value = [%u] ", pHddCtx->config->configPNOScanTimerRepeatValue); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gPNOSlowScanMultiplier] Value = [%u] ", pHddCtx->config->pno_slow_scan_multiplier); #endif #ifdef FEATURE_WLAN_TDLS - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [fEnableTDLSSupport] Value = [%u] ", pHddCtx->config->fEnableTDLSSupport); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [fEnableTDLSImplicitTrigger] Value = [%u] ", pHddCtx->config->fEnableTDLSImplicitTrigger); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [fTDLSExternalControl] Value = [%u] ", pHddCtx->config->fTDLSExternalControl); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [fTDLSUapsdMask] Value = [%u] ", pHddCtx->config->fTDLSUapsdMask); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [fEnableTDLSBufferSta] Value = [%u] ", pHddCtx->config->fEnableTDLSBufferSta); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [fEnableTDLSWmmMode] Value = [%u] ", pHddCtx->config->fEnableTDLSWmmMode); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [enable_tdls_scan] Value = [%u]", pHddCtx->config->enable_tdls_scan); #endif - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraDirAcVo] Value = [%u] ", pHddCtx->config->InfraDirAcVo); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraNomMsduSizeAcVo] Value = [0x%x] ", pHddCtx->config->InfraNomMsduSizeAcVo); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraMeanDataRateAcVo] Value = [0x%x] ", pHddCtx->config->InfraMeanDataRateAcVo); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraMinPhyRateAcVo] Value = [0x%x] ", pHddCtx->config->InfraMinPhyRateAcVo); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraSbaAcVo] Value = [0x%x] ", pHddCtx->config->InfraSbaAcVo); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraDirAcVi] Value = [%u] ", pHddCtx->config->InfraDirAcVi); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraNomMsduSizeAcVi] Value = [0x%x] ", pHddCtx->config->InfraNomMsduSizeAcVi); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraMeanDataRateAcVi] Value = [0x%x] ", pHddCtx->config->InfraMeanDataRateAcVi); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraMinPhyRateAcVi] Value = [0x%x] ", pHddCtx->config->InfraMinPhyRateAcVi); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraSbaAcVi] Value = [0x%x] ", pHddCtx->config->InfraSbaAcVi); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraDirAcBe] Value = [%u] ", pHddCtx->config->InfraDirAcBe); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraNomMsduSizeAcBe] Value = [0x%x] ", pHddCtx->config->InfraNomMsduSizeAcBe); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraMeanDataRateAcBe] Value = [0x%x] ", pHddCtx->config->InfraMeanDataRateAcBe); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraMinPhyRateAcBe] Value = [0x%x] ", pHddCtx->config->InfraMinPhyRateAcBe); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraSbaAcBe] Value = [0x%x] ", pHddCtx->config->InfraSbaAcBe); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraDirAcBk] Value = [%u] ", pHddCtx->config->InfraDirAcBk); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraNomMsduSizeAcBk] Value = [0x%x] ", pHddCtx->config->InfraNomMsduSizeAcBk); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraMeanDataRateAcBk] Value = [0x%x] ", pHddCtx->config->InfraMeanDataRateAcBk); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraMinPhyRateAcBk] Value = [0x%x] ", pHddCtx->config->InfraMinPhyRateAcBk); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraSbaAcBk] Value = [0x%x] ", pHddCtx->config->InfraSbaAcBk); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [DelayedTriggerFrmInt] Value = [%u] ", pHddCtx->config->DelayedTriggerFrmInt); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [mcastBcastFilterSetting] Value = [%u] ", pHddCtx->config->mcastBcastFilterSetting); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [fhostArpOffload] Value = [%u] ", pHddCtx->config->fhostArpOffload); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [ssdp] Value = [%u] ", pHddCtx->config->ssdp); #ifdef FEATURE_WLAN_RA_FILTERING - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [RArateLimitInterval] Value = [%u] ", pHddCtx->config->RArateLimitInterval); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [IsRArateLimitEnabled] Value = [%u] ", pHddCtx->config->IsRArateLimitEnabled); #endif - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [fFTResourceReqSupported] Value = [%u] ", pHddCtx->config->fFTResourceReqSupported); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [nNeighborLookupRssiThreshold] Value = [%u] ", pHddCtx->config->nNeighborLookupRssiThreshold); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [delay_before_vdev_stop] Value = [%u] ", pHddCtx->config->delay_before_vdev_stop); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [nOpportunisticThresholdDiff] Value = [%u] ", pHddCtx->config->nOpportunisticThresholdDiff); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [nRoamRescanRssiDiff] Value = [%u] ", pHddCtx->config->nRoamRescanRssiDiff); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [nNeighborScanMinChanTime] Value = [%u] ", pHddCtx->config->nNeighborScanMinChanTime); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [nNeighborScanMaxChanTime] Value = [%u] ", pHddCtx->config->nNeighborScanMaxChanTime); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [nMaxNeighborRetries] Value = [%u] ", pHddCtx->config->nMaxNeighborReqTries); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [nNeighborScanPeriod] Value = [%u] ", pHddCtx->config->nNeighborScanPeriod); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [nNeighborScanResultsRefreshPeriod] Value = [%u] ", pHddCtx->config->nNeighborResultsRefreshPeriod); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [nEmptyScanRefreshPeriod] Value = [%u] ", pHddCtx->config->nEmptyScanRefreshPeriod); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [nRoamBmissFirstBcnt] Value = [%u] ", pHddCtx->config->nRoamBmissFirstBcnt); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [nRoamBmissFinalBcnt] Value = [%u] ", pHddCtx->config->nRoamBmissFinalBcnt); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [nRoamBeaconRssiWeight] Value = [%u] ", pHddCtx->config->nRoamBeaconRssiWeight); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [allowDFSChannelRoam] Value = [%u] ", pHddCtx->config->allowDFSChannelRoam); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [nhi_rssi_scan_max_count] Value = [%u] ", pHddCtx->config->nhi_rssi_scan_max_count); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [nhi_rssi_scan_rssi_delta] Value = [%u] ", pHddCtx->config->nhi_rssi_scan_rssi_delta); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [nhi_rssi_scan_delay] Value = [%u] ", pHddCtx->config->nhi_rssi_scan_delay); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [nhi_rssi_scan_rssi_ub] Value = [%u] ", pHddCtx->config->nhi_rssi_scan_rssi_ub); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [burstSizeDefinition] Value = [0x%x] ", pHddCtx->config->burstSizeDefinition); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [tsInfoAckPolicy] Value = [0x%x] ", pHddCtx->config->tsInfoAckPolicy); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [rfSettlingTimeUs] Value = [%u] ", pHddCtx->config->rfSettlingTimeUs); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [bSingleTidRc] Value = [%u] ", pHddCtx->config->bSingleTidRc); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gDynamicPSPollvalue] Value = [%u] ", pHddCtx->config->dynamicPsPollValue); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gAddTSWhenACMIsOff] Value = [%u] ", pHddCtx->config->AddTSWhenACMIsOff); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gValidateScanList] Value = [%u] ", pHddCtx->config->fValidateScanList); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gStaKeepAlivePeriod] Value = [%u] ", pHddCtx->config->infraStaKeepAlivePeriod); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gApDataAvailPollInterVal] Value = [%u] ", pHddCtx->config->apDataAvailPollPeriodInMs); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [BandCapability] Value = [%u] ", pHddCtx->config->nBandCapability); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [fEnableBeaconEarlyTermination] Value = [%u] ", pHddCtx->config->fEnableBeaconEarlyTermination); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [teleBcnWakeupEnable] Value = [%u] ", pHddCtx->config->teleBcnWakeupEn); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [transListenInterval] Value = [%u] ", pHddCtx->config->nTeleBcnTransListenInterval); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [transLiNumIdleBeacons] Value = [%u] ", pHddCtx->config->nTeleBcnTransLiNumIdleBeacons); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [maxListenInterval] Value = [%u] ", pHddCtx->config->nTeleBcnMaxListenInterval); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [maxLiNumIdleBeacons] Value = [%u] ", pHddCtx->config->nTeleBcnMaxLiNumIdleBeacons); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [bcnEarlyTermWakeInterval] Value = [%u] ", pHddCtx->config->bcnEarlyTermWakeInterval); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gApDataAvailPollInterVal] Value = [%u] ", pHddCtx->config->apDataAvailPollPeriodInMs); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gEnableBypass11d] Value = [%u] ", pHddCtx->config->enableBypass11d); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gEnableDFSChnlScan] Value = [%u] ", pHddCtx->config->enableDFSChnlScan); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gEnableDFSPnoChnlScan] Value = [%u] ", pHddCtx->config->enable_dfs_pno_chnl_scan); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gReportMaxLinkSpeed] Value = [%u] ", pHddCtx->config->reportMaxLinkSpeed); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [thermalMitigationEnable] Value = [%u] ", pHddCtx->config->thermalMitigationEnable); #ifdef WLAN_FEATURE_11AC - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gVhtChannelWidth] value = [%u]", pHddCtx->config->vhtChannelWidth); #endif - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [enableFirstScan2GOnly] Value = [%u] ", pHddCtx->config->enableFirstScan2GOnly); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [skipDfsChnlInP2pSearch] Value = [%u] ", pHddCtx->config->skipDfsChnlInP2pSearch); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [ignoreDynamicDtimInP2pMode] Value = [%u] ", pHddCtx->config->ignoreDynamicDtimInP2pMode); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [enableRxSTBC] Value = [%u] ", pHddCtx->config->enableRxSTBC); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gEnableLpwrImgTransition] Value = [%u] ", pHddCtx->config->enableLpwrImgTransition); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gEnableSSR] Value = [%u] ", pHddCtx->config->enableSSR); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gEnableVhtFor24GHzBand] Value = [%u] ", pHddCtx->config->enableVhtFor24GHzBand); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gFlexConnectPowerFactor] Value = [%u] ", pHddCtx->config->flexConnectPowerFactor); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gEnableIbssHeartBeatOffload] Value = [%u] ", pHddCtx->config->enableIbssHeartBeatOffload); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gAntennaDiversity] Value = [%u] ", pHddCtx->config->antennaDiversity); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gGoLinkMonitorPeriod] Value = [%u]", pHddCtx->config->goLinkMonitorPeriod); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gApLinkMonitorPeriod] Value = [%u]", pHddCtx->config->apLinkMonitorPeriod); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gGoKeepAlivePeriod] Value = [%u]", pHddCtx->config->goKeepAlivePeriod); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gApKeepAlivePeriod]Value = [%u]", pHddCtx->config->apKeepAlivePeriod); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gAmsduSupportInAMPDU] Value = [%u] ", pHddCtx->config->isAmsduSupportInAMPDU); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [nSelect5GHzMargin] Value = [%u] ", pHddCtx->config->nSelect5GHzMargin); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gCoalesingInIBSS] Value = [%u] ", pHddCtx->config->isCoalesingInIBSSAllowed); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gIbssATIMWinSize] Value = [%u] ", pHddCtx->config->ibssATIMWinSize); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gIbssIsPowerSaveAllowed] Value = [%u] ", pHddCtx->config->isIbssPowerSaveAllowed); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gIbssIsPowerCollapseAllowed] Value = [%u] ", pHddCtx->config->isIbssPowerCollapseAllowed); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gIbssAwakeOnTxRx] Value = [%u] ", pHddCtx->config->isIbssAwakeOnTxRx); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gIbssInactivityTime] Value = [%u] ", pHddCtx->config->ibssInactivityCount); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gIbssTxSpEndInactivityTime] Value = [%u] ", pHddCtx->config->ibssTxSpEndInactivityTime); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gIbssPsWarmupTime] Value = [%u] ", pHddCtx->config->ibssPsWarmupTime); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gIbssPs1RxChainInAtim] Value = [%u] ", pHddCtx->config->ibssPs1RxChainInAtimEnable); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [fDfsPhyerrFilterOffload] Value = [%u] ", pHddCtx->config->fDfsPhyerrFilterOffload); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gIgnorePeerErpInfo] Value = [%u] ", pHddCtx->config->ignore_peer_erp_info); #ifdef IPA_OFFLOAD - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gIPAConfig] Value = [0x%x] ", pHddCtx->config->IpaConfig); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gIPADescSize] Value = [%u] ", pHddCtx->config->IpaDescSize); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [IpaHighBandwidthMbpsg] Value = [%u] ", pHddCtx->config->IpaHighBandwidthMbps); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [IpaMediumBandwidthMbps] Value = [%u] ", pHddCtx->config->IpaMediumBandwidthMbps); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [IpaLowBandwidthMbps] Value = [%u] ", pHddCtx->config->IpaLowBandwidthMbps); #endif - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gEnableOverLapCh] Value = [%u] ", pHddCtx->config->gEnableOverLapCh); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gMaxOffloadPeers] Value = [%u] ", pHddCtx->config->apMaxOffloadPeers); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gMaxOffloadReorderBuffs] value = [%u] ", pHddCtx->config->apMaxOffloadReorderBuffs); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gAllowDFSChannelRoam] Value = [%u] ", pHddCtx->config->allowDFSChannelRoam); hddLog(CDF_TRACE_LEVEL_INFO_HIGH, @@ -5015,184 +5015,184 @@ void hdd_cfg_print(hdd_context_t *pHddCtx) pHddCtx->config->gMaxConcurrentActiveSessions); #ifdef MSM_PLATFORM - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gBusBandwidthHighThreshold] Value = [%u] ", pHddCtx->config->busBandwidthHighThreshold); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gBusBandwidthMediumThreshold] Value = [%u] ", pHddCtx->config->busBandwidthMediumThreshold); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gBusBandwidthLowThreshold] Value = [%u] ", pHddCtx->config->busBandwidthLowThreshold); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gbusBandwidthComputeInterval] Value = [%u] ", pHddCtx->config->busBandwidthComputeInterval); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gTcpDelAckThresholdHigh] Value = [%u] ", pHddCtx->config->tcpDelackThresholdHigh); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gTcpDelAckThresholdLow] Value = [%u] ", pHddCtx->config->tcpDelackThresholdLow); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [%s] Value = [%u] ", CFG_TCP_TX_HIGH_TPUT_THRESHOLD_NAME, pHddCtx->config->tcp_tx_high_tput_thres); #endif - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gIgnoreCAC] Value = [%u] ", pHddCtx->config->ignoreCAC); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gSapPreferredChanLocation] Value = [%u] ", pHddCtx->config->gSapPreferredChanLocation); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gDisableDfsJapanW53] Value = [%u] ", pHddCtx->config->gDisableDfsJapanW53); #ifdef FEATURE_GREEN_AP - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gEnableGreenAp] Value = [%u] ", pHddCtx->config->enableGreenAP); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gEenableEGAP] Value = [%u] ", pHddCtx->config->enable_egap); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gEGAPInactTime] Value = [%u] ", pHddCtx->config->egap_inact_time); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gEGAPWaitTime] Value = [%u] ", pHddCtx->config->egap_wait_time); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gEGAPFeatures] Value = [%u] ", pHddCtx->config->egap_feature_flag); #endif #ifdef WLAN_FEATURE_ROAM_OFFLOAD - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [isRoamOffloadEnabled] Value = [%u]", pHddCtx->config->isRoamOffloadEnabled); #endif - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gEnableSifsBurst] Value = [%u]", pHddCtx->config->enableSifsBurst); #ifdef WLAN_FEATURE_LPSS - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gEnableLpassSupport] Value = [%u] ", pHddCtx->config->enable_lpass_support); #endif - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gEnableSelfRecovery] Value = [%u]", pHddCtx->config->enableSelfRecovery); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gEnableSapSuspend] Value = [%u]", pHddCtx->config->enableSapSuspend); #ifdef WLAN_FEATURE_EXTWOW_SUPPORT - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gExtWoWgotoSuspend] Value = [%u]", pHddCtx->config->extWowGotoSuspend); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gExtWowApp1WakeupPinNumber] Value = [%u]", pHddCtx->config->extWowApp1WakeupPinNumber); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gExtWowApp2WakeupPinNumber] Value = [%u]", pHddCtx->config->extWowApp2WakeupPinNumber); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gExtWoWApp2KAInitPingInterval] Value = [%u]", pHddCtx->config->extWowApp2KAInitPingInterval); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gExtWoWApp2KAMinPingInterval] Value = [%u]", pHddCtx->config->extWowApp2KAMinPingInterval); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gExtWoWApp2KAMaxPingInterval] Value = [%u]", pHddCtx->config->extWowApp2KAMaxPingInterval); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gExtWoWApp2KAIncPingInterval] Value = [%u]", pHddCtx->config->extWowApp2KAIncPingInterval); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gExtWoWApp2TcpSrcPort] Value = [%u]", pHddCtx->config->extWowApp2TcpSrcPort); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gExtWoWApp2TcpDstPort] Value = [%u]", pHddCtx->config->extWowApp2TcpDstPort); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gExtWoWApp2TcpTxTimeout] Value = [%u]", pHddCtx->config->extWowApp2TcpTxTimeout); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gExtWoWApp2TcpRxTimeout] Value = [%u]", pHddCtx->config->extWowApp2TcpRxTimeout); #endif #ifdef DHCP_SERVER_OFFLOAD - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gDHCPServerOffloadEnable] Value = [%u]", pHddCtx->config->enableDHCPServerOffload); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gDHCPMaxNumClients] Value = [%u]", pHddCtx->config->dhcpMaxNumClients); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gDHCPServerIP] Value = [%s]", pHddCtx->config->dhcpServerIP); #endif - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gEnableDumpCollect] Value = [%u]", pHddCtx->config->is_ramdump_enabled); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gP2PListenDeferInterval] Value = [%u]", pHddCtx->config->p2p_listen_defer_interval); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "Name = [is_ps_enabled] value = [%d]", pHddCtx->config->is_ps_enabled); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "Name = [policy_manager_enabled] value = [%d]", pHddCtx->config->policy_manager_enabled); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "Name = [tso_enable] value = [%d]", pHddCtx->config->tso_enable); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "Name = [LROEnable] value = [%d]", pHddCtx->config->lro_enable); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "Name = [active_mode_offload] value = [%d]", pHddCtx->config->active_mode_offload); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "Name = [gfine_time_meas_cap] value = [%u]", pHddCtx->config->fine_time_meas_cap); #ifdef WLAN_FEATURE_FASTPATH - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [fastpath_enable] Value = [%u]", pHddCtx->config->fastpath_enable); #endif - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "Name = [max_scan_count] value = [%d]", pHddCtx->config->max_scan_count); #ifdef FEATURE_NAPI_DEBUG - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "Name = [%s] value = [%d]", CFG_ENABLE_RX_THREAD, pHddCtx->config->enableRxThread); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "Name = [%s] value = [%d]", CFG_NAPI_NAME, pHddCtx->config->napi_enable); #endif - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [%s] Value = [%u]", CFG_CE_CLASSIFY_ENABLE_NAME, pHddCtx->config->ce_classify_enabled); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "Name = [%s] value = [%u]", CFG_DUAL_MAC_FEATURE_DISABLE, pHddCtx->config->dual_mac_feature_disable); @@ -5250,7 +5250,7 @@ QDF_STATUS hdd_update_mac_config(hdd_context_t *pHddCtx) const struct firmware *fw = NULL; char *line, *buffer = NULL; char *name, *value; - tCfgIniEntry macTable[CDF_MAX_CONCURRENCY_PERSONA]; + tCfgIniEntry macTable[QDF_MAX_CONCURRENCY_PERSONA]; tSirMacAddr customMacAddr; QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; @@ -5299,14 +5299,14 @@ QDF_STATUS hdd_update_mac_config(hdd_context_t *pHddCtx) value = buffer; macTable[i].name = name; macTable[i++].value = value; - if (i >= CDF_MAX_CONCURRENCY_PERSONA) + if (i >= QDF_MAX_CONCURRENCY_PERSONA) break; } } } buffer = line; } - if (i <= CDF_MAX_CONCURRENCY_PERSONA) { + if (i <= QDF_MAX_CONCURRENCY_PERSONA) { hddLog(CDF_TRACE_LEVEL_INFO, "%s: %d Mac addresses provided", __func__, i); } else { @@ -6045,7 +6045,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) temp = (temp & 0xFFFC) | pConfig->vhtTxMCS; if (pConfig->enable2x2) temp = (temp & 0xFFF3) | (pConfig->vhtTxMCS2x2 << 2); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "vhtRxMCS2x2 - %x temp - %u enable2x2 %d", pConfig->vhtRxMCS2x2, temp, pConfig->enable2x2); @@ -6381,13 +6381,13 @@ QDF_STATUS hdd_set_sme_config(hdd_context_t *pHddCtx) smeConfig = cdf_mem_malloc(sizeof(*smeConfig)); if (NULL == smeConfig) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: unable to allocate smeConfig", __func__); return QDF_STATUS_E_NOMEM; } cdf_mem_zero(smeConfig, sizeof(*smeConfig)); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "%s bWmmIsEnabled=%d 802_11e_enabled=%d dot11Mode=%d", __func__, pConfig->WmmMode, pConfig->b80211eIsEnabled, pConfig->dot11Mode); diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index ce41c1e208..70033c2aa4 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/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], ð_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; } diff --git a/core/hdd/src/wlan_hdd_conc_ut.c b/core/hdd/src/wlan_hdd_conc_ut.c index c3cda33116..69d1b13ee5 100644 --- a/core/hdd/src/wlan_hdd_conc_ut.c +++ b/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" diff --git a/core/hdd/src/wlan_hdd_debugfs.c b/core/hdd/src/wlan_hdd_debugfs.c index 9af633692f..771d9bacdc 100644 --- a/core/hdd/src/wlan_hdd_debugfs.c +++ b/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; diff --git a/core/hdd/src/wlan_hdd_driver_ops.c b/core/hdd/src/wlan_hdd_driver_ops.c index f09f1bad5d..27537332d6 100644 --- a/core/hdd/src/wlan_hdd_driver_ops.c +++ b/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()); diff --git a/core/hdd/src/wlan_hdd_ext_scan.c b/core/hdd/src/wlan_hdd_ext_scan.c index d2179910ca..f95bebbff0 100644 --- a/core/hdd/src/wlan_hdd_ext_scan.c +++ b/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; } diff --git a/core/hdd/src/wlan_hdd_ftm.c b/core/hdd/src/wlan_hdd_ftm.c index 645e7a0cc0..e9ff971d7a 100644 --- a/core/hdd/src/wlan_hdd_ftm.c +++ b/core/hdd/src/wlan_hdd_ftm.c @@ -35,7 +35,7 @@ #include "cds_sched.h" #include #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; } diff --git a/core/hdd/src/wlan_hdd_green_ap.c b/core/hdd/src/wlan_hdd_green_ap.c index c41e8f4757..57dc2c9958 100644 --- a/core/hdd/src/wlan_hdd_green_ap.c +++ b/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: diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c index 85a6c92dd9..05e9328d36 100644 --- a/core/hdd/src/wlan_hdd_hostapd.c +++ b/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)"), diff --git a/core/hdd/src/wlan_hdd_hostapd.h b/core/hdd/src/wlan_hdd_hostapd.h index cf53354792..0706e56e61 100644 --- a/core/hdd/src/wlan_hdd_hostapd.h +++ b/core/hdd/src/wlan_hdd_hostapd.h @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include /* Preprocessor definitions and constants */ diff --git a/core/hdd/src/wlan_hdd_ioctl.c b/core/hdd/src/wlan_hdd_ioctl.c index 79e10689f3..eb8f5b260b 100644 --- a/core/hdd/src/wlan_hdd_ioctl.c +++ b/core/hdd/src/wlan_hdd_ioctl.c @@ -558,7 +558,7 @@ hdd_reassoc(hdd_adapter_t *adapter, const uint8_t *bssid, * then no need to proceed with reassoc */ if (!memcmp(bssid, pHddStaCtx->conn_info.bssId.bytes, - CDF_MAC_ADDR_SIZE)) { + QDF_MAC_ADDR_SIZE)) { hddLog(LOG1, FL("Reassoc BSSID is same as currently associated AP bssid")); ret = -EINVAL; @@ -581,7 +581,7 @@ hdd_reassoc(hdd_adapter_t *adapter, const uint8_t *bssid, handoffInfo.channel = channel; handoffInfo.src = REASSOC; - cdf_mem_copy(handoffInfo.bssid.bytes, bssid, CDF_MAC_ADDR_SIZE); + cdf_mem_copy(handoffInfo.bssid.bytes, bssid, QDF_MAC_ADDR_SIZE); sme_handoff_request(hdd_ctx->hHal, adapter->sessionId, &handoffInfo); } @@ -746,7 +746,7 @@ hdd_sendactionframe(hdd_adapter_t *adapter, const uint8_t *bssid, * then no need to send action frame */ if (memcmp(bssid, pHddStaCtx->conn_info.bssId.bytes, - CDF_MAC_ADDR_SIZE)) { + QDF_MAC_ADDR_SIZE)) { hddLog(LOG1, FL("STA is not associated to this AP")); ret = -EINVAL; goto exit; @@ -813,10 +813,10 @@ hdd_sendactionframe(hdd_adapter_t *adapter, const uint8_t *bssid, hdr = (struct ieee80211_hdr_3addr *)frame; hdr->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT | IEEE80211_STYPE_ACTION); - cdf_mem_copy(hdr->addr1, bssid, CDF_MAC_ADDR_SIZE); + cdf_mem_copy(hdr->addr1, bssid, QDF_MAC_ADDR_SIZE); cdf_mem_copy(hdr->addr2, adapter->macAddressCurrent.bytes, - CDF_MAC_ADDR_SIZE); - cdf_mem_copy(hdr->addr3, bssid, CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); + cdf_mem_copy(hdr->addr3, bssid, QDF_MAC_ADDR_SIZE); cdf_mem_copy(hdr + 1, payload, payload_len); #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0)) @@ -1028,7 +1028,7 @@ hdd_parse_channellist(const uint8_t *pValue, uint8_t *pChannelList, *pNumChannels = tempInt; - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Number of channels are: %d", *pNumChannels); for (j = 0; j < (*pNumChannels); j++) { @@ -1076,7 +1076,7 @@ hdd_parse_channellist(const uint8_t *pValue, uint8_t *pChannelList, } pChannelList[j] = tempInt; - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Channel %d added to preferred channel list", pChannelList[j]); } @@ -1113,18 +1113,18 @@ hdd_parse_set_roam_scan_channels_v1(hdd_adapter_t *adapter, ret = hdd_parse_channellist(command, channel_list, &num_chan); if (ret) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Failed to parse channel list information", __func__); goto exit; } - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_SETROAMSCANCHANNELS_IOCTL, adapter->sessionId, num_chan)); if (num_chan > WNI_CFG_VALID_CHANNEL_LIST_LEN) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: number of channels (%d) supported exceeded max (%d)", __func__, num_chan, WNI_CFG_VALID_CHANNEL_LIST_LEN); ret = -EINVAL; @@ -1136,7 +1136,7 @@ hdd_parse_set_roam_scan_channels_v1(hdd_adapter_t *adapter, adapter->sessionId, channel_list, num_chan); 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: Failed to update channel list information", __func__); ret = -EINVAL; @@ -1182,21 +1182,21 @@ hdd_parse_set_roam_scan_channels_v2(hdd_adapter_t *adapter, num_chan = *value++; if (num_chan > WNI_CFG_VALID_CHANNEL_LIST_LEN) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: number of channels (%d) supported exceeded max (%d)", __func__, num_chan, WNI_CFG_VALID_CHANNEL_LIST_LEN); ret = -EINVAL; goto exit; } - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_SETROAMSCANCHANNELS_IOCTL, adapter->sessionId, num_chan)); for (i = 0; i < num_chan; i++) { channel = *value++; if (channel > WNI_CFG_CURRENT_CHANNEL_STAMAX) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: index %d invalid channel %d", __func__, i, channel); ret = -EINVAL; @@ -1209,7 +1209,7 @@ hdd_parse_set_roam_scan_channels_v2(hdd_adapter_t *adapter, adapter->sessionId, channel_list, num_chan); 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: Failed to update channel list information", __func__); ret = -EINVAL; @@ -1475,7 +1475,7 @@ QDF_STATUS hdd_parse_plm_cmd(uint8_t *pValue, tSirPlmReq *pPlmRequest) hddLog(CDF_TRACE_LEVEL_DEBUG, "desiredTxPwr %d", pPlmRequest->desiredTxPwr); - for (count = 0; count < CDF_MAC_ADDR_SIZE; count++) { + for (count = 0; count < QDF_MAC_ADDR_SIZE; count++) { cmdPtr = strpbrk(cmdPtr, " "); if (NULL == cmdPtr) @@ -1599,7 +1599,7 @@ static int hdd_enable_ext_wow(hdd_adapter_t *adapter, rc = wait_for_completion_timeout(&hdd_ctx->ready_to_extwow, msecs_to_jiffies(WLAN_WAIT_TIME_READY_TO_EXTWOW)); if (!rc) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Failed to get ready to extwow", __func__); return -EPERM; } @@ -1609,20 +1609,20 @@ static int hdd_enable_ext_wow(hdd_adapter_t *adapter, pm_message_t state; state.event = PM_EVENT_SUSPEND; - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Received ready to ExtWoW. Going to suspend", __func__); rc = wlan_hdd_cfg80211_suspend_wlan(hdd_ctx->wiphy, NULL); if (rc < 0) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: wlan_hdd_cfg80211_suspend_wlan failed, error = %d", __func__, rc); return rc; } cdf_ret_status = wlan_hdd_bus_suspend(state); if (cdf_ret_status != QDF_STATUS_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: wlan_hdd_suspend failed, status = %d", __func__, cdf_ret_status); wlan_hdd_cfg80211_resume_wlan(hdd_ctx->wiphy); @@ -1630,7 +1630,7 @@ static int hdd_enable_ext_wow(hdd_adapter_t *adapter, } } } else { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Received ready to ExtWoW failure", __func__); return -EPERM; } @@ -1716,7 +1716,7 @@ static int hdd_set_app_type1_parser(hdd_adapter_t *adapter, } if (2 != sscanf(arg, "%8s %16s", id, password)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL("Invalid Number of arguments")); return -EINVAL; } @@ -1730,7 +1730,7 @@ static int hdd_set_app_type1_parser(hdd_adapter_t *adapter, params.pass_length = strlen(password); cdf_mem_copy(params.password, password, params.pass_length); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: %d %pM %.8s %u %.16s %u", __func__, params.vdev_id, params.wakee_mac_addr.bytes, params.identification_id, params.id_length, @@ -1764,7 +1764,7 @@ static int hdd_set_app_type2_parser(hdd_adapter_t *adapter, hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(adapter); tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(adapter); char mac_addr[20], rc4_key[20]; - unsigned int gateway_mac[CDF_MAC_ADDR_SIZE]; + unsigned int gateway_mac[QDF_MAC_ADDR_SIZE]; tSirAppType2Params params; int ret; @@ -1792,7 +1792,7 @@ static int hdd_set_app_type2_parser(hdd_adapter_t *adapter, (unsigned int *)¶ms.tcp_rx_timeout_val); if (ret != 15 && ret != 7) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "Invalid Number of arguments"); return -EINVAL; } @@ -1801,20 +1801,20 @@ static int hdd_set_app_type2_parser(hdd_adapter_t *adapter, sscanf(mac_addr, "%02x:%02x:%02x:%02x:%02x:%02x", &gateway_mac[0], &gateway_mac[1], &gateway_mac[2], &gateway_mac[3], &gateway_mac[4], &gateway_mac[5])) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "Invalid MacAddress Input %s", mac_addr); return -EINVAL; } if (params.tcp_src_port > WLAN_HDD_MAX_TCP_PORT || params.tcp_dst_port > WLAN_HDD_MAX_TCP_PORT) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "Invalid TCP Port Number"); return -EINVAL; } cdf_mem_copy(¶ms.gateway_mac.bytes, (uint8_t *) &gateway_mac, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); params.rc4_key_len = strlen(rc4_key); cdf_mem_copy(params.rc4_key, rc4_key, params.rc4_key_len); @@ -1848,7 +1848,7 @@ static int hdd_set_app_type2_parser(hdd_adapter_t *adapter, params.tcp_rx_timeout_val : hdd_ctx->config->extWowApp2TcpRxTimeout; - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: %pM %.16s %u %u %u %u %u %u %u %u %u %u %u %u %u", __func__, gateway_mac, rc4_key, params.ip_id, params.ip_device_ip, params.ip_server_ip, params.tcp_seq, @@ -1911,7 +1911,7 @@ static int hdd_parse_setmaxtxpower_command(uint8_t *pValue, int *pTxPower) *pTxPower = tempInt; - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "SETMAXTXPOWER: %d", *pTxPower); return 0; @@ -1923,7 +1923,7 @@ static int hdd_get_dwell_time(struct hdd_config *pCfg, uint8_t *command, int ret = 0; if (!pCfg || !command || !extra || !len) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: argument passed for GETDWELLTIME is incorrect", __func__); ret = -EINVAL; @@ -2215,7 +2215,7 @@ static int hdd_parse_ese_beacon_req(uint8_t *pValue, pEseBcnReq->numBcnReqIe = tempInt; - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Number of Bcn Req Ie fields(%d)", pEseBcnReq->numBcnReqIe); for (j = 0; j < (pEseBcnReq->numBcnReqIe); j++) { @@ -2252,7 +2252,7 @@ static int hdd_parse_ese_beacon_req(uint8_t *pValue, switch (i) { case 0: /* Measurement token */ if (tempInt <= 0) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "Invalid Measurement Token(%d)", tempInt); @@ -2266,7 +2266,7 @@ static int hdd_parse_ese_beacon_req(uint8_t *pValue, if ((tempInt <= 0) || (tempInt > WNI_CFG_CURRENT_CHANNEL_STAMAX)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "Invalid Channel Number(%d)", tempInt); @@ -2278,7 +2278,7 @@ static int hdd_parse_ese_beacon_req(uint8_t *pValue, case 2: /* Scan mode */ if ((tempInt < eSIR_PASSIVE_SCAN) || (tempInt > eSIR_BEACON_TABLE)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "Invalid Scan Mode(%d) Expected{0|1|2}", tempInt); @@ -2294,7 +2294,7 @@ static int hdd_parse_ese_beacon_req(uint8_t *pValue, ((tempInt < 0) && (pEseBcnReq->bcnReq[j].scanMode == eSIR_BEACON_TABLE))) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "Invalid Measurement Duration(%d)", tempInt); @@ -2308,7 +2308,7 @@ static int hdd_parse_ese_beacon_req(uint8_t *pValue, } for (j = 0; j < pEseBcnReq->numBcnReqIe; j++) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "Index(%d) Measurement Token(%u) Channel(%u) Scan Mode(%u) Measurement Duration(%u)", j, pEseBcnReq->bcnReq[j].measurementToken, @@ -2404,7 +2404,7 @@ int wlan_hdd_set_mc_rate(hdd_adapter_t *pAdapter, int targetRate) struct hdd_config *pConfig = NULL; if (pHddCtx == NULL) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: HDD context is null", __func__); return -EINVAL; } @@ -2449,7 +2449,7 @@ static int drv_cmd_p2p_dev_addr(hdd_adapter_t *adapter, { int ret = 0; - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_P2P_DEV_ADDR_IOCTL, adapter->sessionId, (unsigned)(*(hdd_ctx->p2pDeviceAddress.bytes + 2) @@ -2612,7 +2612,7 @@ static int drv_cmd_set_roam_trigger(hdd_adapter_t *adapter, * If the input value is greater than max value of datatype, * then also kstrtou8 fails */ - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: kstrtou8 failed Input value may be out of range[%d - %d]", __func__, @@ -2626,7 +2626,7 @@ static int drv_cmd_set_roam_trigger(hdd_adapter_t *adapter, if ((lookUpThreshold < CFG_NEIGHBOR_LOOKUP_RSSI_THRESHOLD_MIN) || (lookUpThreshold > CFG_NEIGHBOR_LOOKUP_RSSI_THRESHOLD_MAX)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "Neighbor lookup threshold value %d is out of range (Min: %d Max: %d)", lookUpThreshold, @@ -2636,10 +2636,10 @@ static int drv_cmd_set_roam_trigger(hdd_adapter_t *adapter, goto exit; } - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_SETROAMTRIGGER_IOCTL, adapter->sessionId, lookUpThreshold)); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Received Command to Set Roam trigger (Neighbor lookup threshold) = %d", __func__, lookUpThreshold); @@ -2649,7 +2649,7 @@ static int drv_cmd_set_roam_trigger(hdd_adapter_t *adapter, adapter->sessionId, lookUpThreshold); if (QDF_STATUS_SUCCESS != status) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Failed to set roam trigger, try again", __func__); @@ -2674,14 +2674,14 @@ static int drv_cmd_get_roam_trigger(hdd_adapter_t *adapter, char extra[32]; uint8_t len = 0; - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_GETROAMTRIGGER_IOCTL, adapter->sessionId, lookUpThreshold)); len = scnprintf(extra, sizeof(extra), "%s %d", command, rssi); - len = CDF_MIN(priv_data->total_len, len + 1); + len = QDF_MIN(priv_data->total_len, len + 1); if (copy_to_user(priv_data->buf, &extra, len)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); @@ -2715,7 +2715,7 @@ static int drv_cmd_set_roam_scan_period(hdd_adapter_t *adapter, * If the input value is greater than max value of datatype, * then also kstrtou8 fails */ - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: kstrtou8 failed Input value may be out of range[%d - %d]", __func__, @@ -2727,7 +2727,7 @@ static int drv_cmd_set_roam_scan_period(hdd_adapter_t *adapter, if ((roamScanPeriod < (CFG_EMPTY_SCAN_REFRESH_PERIOD_MIN / 1000)) || (roamScanPeriod > (CFG_EMPTY_SCAN_REFRESH_PERIOD_MAX / 1000))) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "Roam scan period value %d is out of range (Min: %d Max: %d)", roamScanPeriod, @@ -2736,12 +2736,12 @@ static int drv_cmd_set_roam_scan_period(hdd_adapter_t *adapter, ret = -EINVAL; goto exit; } - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_SETROAMSCANPERIOD_IOCTL, adapter->sessionId, roamScanPeriod)); neighborEmptyScanRefreshPeriod = roamScanPeriod * 1000; - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Received Command to Set roam scan period (Empty Scan refresh period) = %d", __func__, roamScanPeriod); @@ -2768,7 +2768,7 @@ static int drv_cmd_get_roam_scan_period(hdd_adapter_t *adapter, char extra[32]; uint8_t len = 0; - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_GETROAMSCANPERIOD_IOCTL, adapter->sessionId, nEmptyScanRefreshPeriod)); @@ -2776,7 +2776,7 @@ static int drv_cmd_get_roam_scan_period(hdd_adapter_t *adapter, "GETROAMSCANPERIOD", (nEmptyScanRefreshPeriod / 1000)); /* Returned value is in units of seconds */ - len = CDF_MIN(priv_data->total_len, len + 1); + len = QDF_MIN(priv_data->total_len, len + 1); if (copy_to_user(priv_data->buf, &extra, len)) { hddLog(LOGE, FL("failed to copy data to user buffer")); @@ -2809,7 +2809,7 @@ static int drv_cmd_set_roam_scan_refresh_period(hdd_adapter_t *adapter, * If the input value is greater than max value of datatype, * then also kstrtou8 fails */ - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: kstrtou8 failed Input value may be out of range[%d - %d]", __func__, @@ -2823,7 +2823,7 @@ static int drv_cmd_set_roam_scan_refresh_period(hdd_adapter_t *adapter, (CFG_NEIGHBOR_SCAN_RESULTS_REFRESH_PERIOD_MIN / 1000)) || (roamScanRefreshPeriod > (CFG_NEIGHBOR_SCAN_RESULTS_REFRESH_PERIOD_MAX / 1000))) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "Neighbor scan results refresh period value %d is out of range (Min: %d Max: %d)", roamScanRefreshPeriod, @@ -2836,7 +2836,7 @@ static int drv_cmd_set_roam_scan_refresh_period(hdd_adapter_t *adapter, } neighborScanRefreshPeriod = roamScanRefreshPeriod * 1000; - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Received Command to Set roam scan refresh period (Scan refresh period) = %d", __func__, roamScanRefreshPeriod); @@ -2867,9 +2867,9 @@ static int drv_cmd_get_roam_scan_refresh_period(hdd_adapter_t *adapter, "GETROAMSCANREFRESHPERIOD", (value / 1000)); /* Returned value is in units of seconds */ - len = CDF_MIN(priv_data->total_len, len + 1); + len = QDF_MIN(priv_data->total_len, len + 1); if (copy_to_user(priv_data->buf, &extra, len)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); @@ -2899,7 +2899,7 @@ static int drv_cmd_set_roam_mode(hdd_adapter_t *adapter, * If the input value is greater than max value of datatype, * then also kstrtou8 fails */ - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: kstrtou8 failed range [%d - %d]", __func__, CFG_LFR_FEATURE_ENABLED_MIN, @@ -2909,7 +2909,7 @@ static int drv_cmd_set_roam_mode(hdd_adapter_t *adapter, } if ((roamMode < CFG_LFR_FEATURE_ENABLED_MIN) || (roamMode > CFG_LFR_FEATURE_ENABLED_MAX)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "Roam Mode value %d is out of range (Min: %d Max: %d)", roamMode, @@ -2919,7 +2919,7 @@ static int drv_cmd_set_roam_mode(hdd_adapter_t *adapter, goto exit; } - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_DEBUG, "%s: Received Command to Set Roam Mode = %d", __func__, roamMode); /* @@ -2981,9 +2981,9 @@ static int drv_cmd_get_roam_mode(hdd_adapter_t *adapter, roamMode = CFG_LFR_FEATURE_ENABLED_MIN; len = scnprintf(extra, sizeof(extra), "%s %d", command, roamMode); - len = CDF_MIN(priv_data->total_len, len + 1); + len = QDF_MIN(priv_data->total_len, len + 1); if (copy_to_user(priv_data->buf, &extra, len)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); @@ -3013,7 +3013,7 @@ static int drv_cmd_set_roam_delta(hdd_adapter_t *adapter, * If the input value is greater than max value of datatype, * then also kstrtou8 fails */ - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: kstrtou8 failed range [%d - %d]", __func__, CFG_ROAM_RSSI_DIFF_MIN, @@ -3024,7 +3024,7 @@ static int drv_cmd_set_roam_delta(hdd_adapter_t *adapter, if ((roamRssiDiff < CFG_ROAM_RSSI_DIFF_MIN) || (roamRssiDiff > CFG_ROAM_RSSI_DIFF_MAX)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "Roam rssi diff value %d is out of range (Min: %d Max: %d)", roamRssiDiff, @@ -3034,7 +3034,7 @@ static int drv_cmd_set_roam_delta(hdd_adapter_t *adapter, goto exit; } - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Received Command to Set roam rssi diff = %d", __func__, roamRssiDiff); @@ -3059,16 +3059,16 @@ static int drv_cmd_get_roam_delta(hdd_adapter_t *adapter, char extra[32]; uint8_t len = 0; - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_GETROAMDELTA_IOCTL, adapter->sessionId, roamRssiDiff)); len = scnprintf(extra, sizeof(extra), "%s %d", command, roamRssiDiff); - len = CDF_MIN(priv_data->total_len, len + 1); + len = QDF_MIN(priv_data->total_len, len + 1); if (copy_to_user(priv_data->buf, &extra, len)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); @@ -3091,15 +3091,15 @@ static int drv_cmd_get_band(hdd_adapter_t *adapter, hdd_get_band_helper(hdd_ctx, &band); - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_GETBAND_IOCTL, adapter->sessionId, band)); len = scnprintf(extra, sizeof(extra), "%s %d", command, band); - len = CDF_MIN(priv_data->total_len, len + 1); + len = QDF_MIN(priv_data->total_len, len + 1); if (copy_to_user(priv_data->buf, &extra, len)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); @@ -3136,7 +3136,7 @@ static int drv_cmd_get_roam_scan_channels(hdd_adapter_t *adapter, ChannelList, &numChannels, adapter->sessionId)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL, "%s: failed to get roam scan channel list", __func__); @@ -3144,7 +3144,7 @@ static int drv_cmd_get_roam_scan_channels(hdd_adapter_t *adapter, goto exit; } - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_GETROAMSCANCHANNELS_IOCTL, adapter->sessionId, numChannels)); /* @@ -3158,9 +3158,9 @@ static int drv_cmd_get_roam_scan_channels(hdd_adapter_t *adapter, len += scnprintf(extra + len, sizeof(extra) - len, " %d", ChannelList[j]); - len = CDF_MIN(priv_data->total_len, len + 1); + len = QDF_MIN(priv_data->total_len, len + 1); if (copy_to_user(priv_data->buf, &extra, len)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); @@ -3190,7 +3190,7 @@ static int drv_cmd_get_ccx_mode(hdd_adapter_t *adapter, if (eseMode && hdd_is_okc_mode_enabled(hdd_ctx) && sme_get_is_ft_feature_enabled(hdd_ctx->hHal)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, "%s: OKC/ESE/11R are supported simultaneously hence this operation is not permitted!", __func__); @@ -3200,9 +3200,9 @@ static int drv_cmd_get_ccx_mode(hdd_adapter_t *adapter, len = scnprintf(extra, sizeof(extra), "%s %d", "GETCCXMODE", eseMode); - len = CDF_MIN(priv_data->total_len, len + 1); + len = QDF_MIN(priv_data->total_len, len + 1); if (copy_to_user(priv_data->buf, &extra, len)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); @@ -3232,7 +3232,7 @@ static int drv_cmd_get_okc_mode(hdd_adapter_t *adapter, if (okcMode && sme_get_is_ese_feature_enabled(hdd_ctx->hHal) && sme_get_is_ft_feature_enabled(hdd_ctx->hHal)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, "%s: OKC/ESE/11R are supported simultaneously hence this operation is not permitted!", __func__); @@ -3242,10 +3242,10 @@ static int drv_cmd_get_okc_mode(hdd_adapter_t *adapter, len = scnprintf(extra, sizeof(extra), "%s %d", "GETOKCMODE", okcMode); - len = CDF_MIN(priv_data->total_len, len + 1); + len = QDF_MIN(priv_data->total_len, len + 1); if (copy_to_user(priv_data->buf, &extra, len)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); @@ -3270,10 +3270,10 @@ static int drv_cmd_get_fast_roam(hdd_adapter_t *adapter, len = scnprintf(extra, sizeof(extra), "%s %d", "GETFASTROAM", lfrMode); - len = CDF_MIN(priv_data->total_len, len + 1); + len = QDF_MIN(priv_data->total_len, len + 1); if (copy_to_user(priv_data->buf, &extra, len)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); @@ -3296,10 +3296,10 @@ static int drv_cmd_get_fast_transition(hdd_adapter_t *adapter, len = scnprintf(extra, sizeof(extra), "%s %d", "GETFASTTRANSITION", ft); - len = CDF_MIN(priv_data->total_len, len + 1); + len = QDF_MIN(priv_data->total_len, len + 1); if (copy_to_user(priv_data->buf, &extra, len)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); @@ -3329,7 +3329,7 @@ static int drv_cmd_set_roam_scan_channel_min_time(hdd_adapter_t *adapter, * If the input value is greater than max value of datatype, * then also kstrtou8 fails */ - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: kstrtou8 failed range [%d - %d]", __func__, @@ -3341,7 +3341,7 @@ static int drv_cmd_set_roam_scan_channel_min_time(hdd_adapter_t *adapter, if ((minTime < CFG_NEIGHBOR_SCAN_MIN_CHAN_TIME_MIN) || (minTime > CFG_NEIGHBOR_SCAN_MIN_CHAN_TIME_MAX)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "scan min channel time value %d is out of range (Min: %d Max: %d)", minTime, @@ -3351,10 +3351,10 @@ static int drv_cmd_set_roam_scan_channel_min_time(hdd_adapter_t *adapter, goto exit; } - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_SETROAMSCANCHANNELMINTIME_IOCTL, adapter->sessionId, minTime)); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Received Command to change channel min time = %d", __func__, minTime); @@ -3391,14 +3391,14 @@ static int drv_cmd_get_roam_scan_channel_min_time(hdd_adapter_t *adapter, /* value is interms of msec */ len = scnprintf(extra, sizeof(extra), "%s %d", "GETROAMSCANCHANNELMINTIME", val); - len = CDF_MIN(priv_data->total_len, len + 1); + len = QDF_MIN(priv_data->total_len, len + 1); - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_GETROAMSCANCHANNELMINTIME_IOCTL, adapter->sessionId, val)); if (copy_to_user(priv_data->buf, &extra, len)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); @@ -3428,7 +3428,7 @@ static int drv_cmd_set_scan_channel_time(hdd_adapter_t *adapter, * If the input value is greater than max value of datatype, * then also kstrtou8 fails */ - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: kstrtou16 failed range [%d - %d]", __func__, @@ -3440,7 +3440,7 @@ static int drv_cmd_set_scan_channel_time(hdd_adapter_t *adapter, if ((maxTime < CFG_NEIGHBOR_SCAN_MAX_CHAN_TIME_MIN) || (maxTime > CFG_NEIGHBOR_SCAN_MAX_CHAN_TIME_MAX)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "lfr mode value %d is out of range (Min: %d Max: %d)", maxTime, @@ -3450,7 +3450,7 @@ static int drv_cmd_set_scan_channel_time(hdd_adapter_t *adapter, goto exit; } - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Received Command to change channel max time = %d", __func__, maxTime); @@ -3478,10 +3478,10 @@ static int drv_cmd_get_scan_channel_time(hdd_adapter_t *adapter, /* value is interms of msec */ len = scnprintf(extra, sizeof(extra), "%s %d", "GETSCANCHANNELTIME", val); - len = CDF_MIN(priv_data->total_len, len + 1); + len = QDF_MIN(priv_data->total_len, len + 1); if (copy_to_user(priv_data->buf, &extra, len)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); @@ -3511,7 +3511,7 @@ static int drv_cmd_set_scan_home_time(hdd_adapter_t *adapter, * If the input value is greater than max value of datatype, * then also kstrtou8 fails */ - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: kstrtou16 failed range [%d - %d]", __func__, @@ -3523,7 +3523,7 @@ static int drv_cmd_set_scan_home_time(hdd_adapter_t *adapter, if ((val < CFG_NEIGHBOR_SCAN_TIMER_PERIOD_MIN) || (val > CFG_NEIGHBOR_SCAN_TIMER_PERIOD_MAX)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "scan home time value %d is out of range (Min: %d Max: %d)", val, @@ -3533,7 +3533,7 @@ static int drv_cmd_set_scan_home_time(hdd_adapter_t *adapter, goto exit; } - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Received Command to change scan home time = %d", __func__, val); @@ -3561,10 +3561,10 @@ static int drv_cmd_get_scan_home_time(hdd_adapter_t *adapter, /* value is interms of msec */ len = scnprintf(extra, sizeof(extra), "%s %d", "GETSCANHOMETIME", val); - len = CDF_MIN(priv_data->total_len, len + 1); + len = QDF_MIN(priv_data->total_len, len + 1); if (copy_to_user(priv_data->buf, &extra, len)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); @@ -3594,7 +3594,7 @@ static int drv_cmd_set_roam_intra_band(hdd_adapter_t *adapter, * If the input value is greater than max value of datatype, * then also kstrtou8 fails */ - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: kstrtou8 failed range [%d - %d]", __func__, CFG_ROAM_INTRA_BAND_MIN, @@ -3605,7 +3605,7 @@ static int drv_cmd_set_roam_intra_band(hdd_adapter_t *adapter, if ((val < CFG_ROAM_INTRA_BAND_MIN) || (val > CFG_ROAM_INTRA_BAND_MAX)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "intra band mode value %d is out of range (Min: %d Max: %d)", val, @@ -3614,7 +3614,7 @@ static int drv_cmd_set_roam_intra_band(hdd_adapter_t *adapter, ret = -EINVAL; goto exit; } - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Received Command to change intra band = %d", __func__, val); @@ -3639,9 +3639,9 @@ static int drv_cmd_get_roam_intra_band(hdd_adapter_t *adapter, /* value is interms of msec */ len = scnprintf(extra, sizeof(extra), "%s %d", "GETROAMINTRABAND", val); - len = CDF_MIN(priv_data->total_len, len + 1); + len = QDF_MIN(priv_data->total_len, len + 1); if (copy_to_user(priv_data->buf, &extra, len)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); @@ -3671,7 +3671,7 @@ static int drv_cmd_set_scan_n_probes(hdd_adapter_t *adapter, * If the input value is greater than max value of datatype, * then also kstrtou8 fails */ - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: kstrtou8 failed range [%d - %d]", __func__, CFG_ROAM_SCAN_N_PROBES_MIN, @@ -3682,7 +3682,7 @@ static int drv_cmd_set_scan_n_probes(hdd_adapter_t *adapter, if ((nProbes < CFG_ROAM_SCAN_N_PROBES_MIN) || (nProbes > CFG_ROAM_SCAN_N_PROBES_MAX)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "NProbes value %d is out of range (Min: %d Max: %d)", nProbes, @@ -3692,7 +3692,7 @@ static int drv_cmd_set_scan_n_probes(hdd_adapter_t *adapter, goto exit; } - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Received Command to Set nProbes = %d", __func__, nProbes); @@ -3716,9 +3716,9 @@ static int drv_cmd_get_scan_n_probes(hdd_adapter_t *adapter, uint8_t len = 0; len = scnprintf(extra, sizeof(extra), "%s %d", command, val); - len = CDF_MIN(priv_data->total_len, len + 1); + len = QDF_MIN(priv_data->total_len, len + 1); if (copy_to_user(priv_data->buf, &extra, len)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); @@ -3750,7 +3750,7 @@ static int drv_cmd_set_scan_home_away_time(hdd_adapter_t *adapter, * If the input value is greater than max value of datatype, * then also kstrtou8 fails */ - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: kstrtou8 failed range [%d - %d]", __func__, @@ -3762,7 +3762,7 @@ static int drv_cmd_set_scan_home_away_time(hdd_adapter_t *adapter, if ((homeAwayTime < CFG_ROAM_SCAN_HOME_AWAY_TIME_MIN) || (homeAwayTime > CFG_ROAM_SCAN_HOME_AWAY_TIME_MAX)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "homeAwayTime value %d is out of range (Min: %d Max: %d)", homeAwayTime, @@ -3772,7 +3772,7 @@ static int drv_cmd_set_scan_home_away_time(hdd_adapter_t *adapter, goto exit; } - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Received Command to Set scan away time = %d", __func__, homeAwayTime); @@ -3801,10 +3801,10 @@ static int drv_cmd_get_scan_home_away_time(hdd_adapter_t *adapter, uint8_t len = 0; len = scnprintf(extra, sizeof(extra), "%s %d", command, val); - len = CDF_MIN(priv_data->total_len, len + 1); + len = QDF_MIN(priv_data->total_len, len + 1); if (copy_to_user(priv_data->buf, &extra, len)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); @@ -3843,7 +3843,7 @@ static int drv_cmd_set_wes_mode(hdd_adapter_t *adapter, * If the input value is greater than max value of datatype, * then also kstrtou8 fails */ - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: kstrtou8 failed range [%d - %d]", __func__, @@ -3855,7 +3855,7 @@ static int drv_cmd_set_wes_mode(hdd_adapter_t *adapter, if ((wesMode < CFG_ENABLE_WES_MODE_NAME_MIN) || (wesMode > CFG_ENABLE_WES_MODE_NAME_MAX)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "WES Mode value %d is out of range (Min: %d Max: %d)", wesMode, @@ -3865,7 +3865,7 @@ static int drv_cmd_set_wes_mode(hdd_adapter_t *adapter, goto exit; } - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Received Command to Set WES Mode rssi diff = %d", __func__, wesMode); @@ -3888,9 +3888,9 @@ static int drv_cmd_get_wes_mode(hdd_adapter_t *adapter, uint8_t len = 0; len = scnprintf(extra, sizeof(extra), "%s %d", command, wesMode); - len = CDF_MIN(priv_data->total_len, len + 1); + len = QDF_MIN(priv_data->total_len, len + 1); if (copy_to_user(priv_data->buf, &extra, len)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); @@ -3921,14 +3921,14 @@ static int drv_cmd_set_opportunistic_rssi_diff(hdd_adapter_t *adapter, * If the input value is greater than max value of datatype, * then also kstrtou8 fails */ - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: kstrtou8 failed.", __func__); ret = -EINVAL; goto exit; } - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Received Command to Set Opportunistic Threshold diff = %d", __func__, nOpportunisticThresholdDiff); @@ -3953,9 +3953,9 @@ static int drv_cmd_get_opportunistic_rssi_diff(hdd_adapter_t *adapter, uint8_t len = 0; len = scnprintf(extra, sizeof(extra), "%s %d", command, val); - len = CDF_MIN(priv_data->total_len, len + 1); + len = QDF_MIN(priv_data->total_len, len + 1); if (copy_to_user(priv_data->buf, &extra, len)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); @@ -3985,14 +3985,14 @@ static int drv_cmd_set_roam_rescan_rssi_diff(hdd_adapter_t *adapter, * If the input value is greater than max value of datatype, * then also kstrtou8 fails */ - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: kstrtou8 failed.", __func__); ret = -EINVAL; goto exit; } - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Received Command to Set Roam Rescan RSSI Diff = %d", __func__, nRoamRescanRssiDiff); @@ -4016,9 +4016,9 @@ static int drv_cmd_get_roam_rescan_rssi_diff(hdd_adapter_t *adapter, uint8_t len = 0; len = scnprintf(extra, sizeof(extra), "%s %d", command, val); - len = CDF_MIN(priv_data->total_len, len + 1); + len = QDF_MIN(priv_data->total_len, len + 1); if (copy_to_user(priv_data->buf, &extra, len)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); @@ -4048,7 +4048,7 @@ static int drv_cmd_set_fast_roam(hdd_adapter_t *adapter, * If the input value is greater than max value of datatype, * then also kstrtou8 fails */ - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: kstrtou8 failed range [%d - %d]", __func__, CFG_LFR_FEATURE_ENABLED_MIN, @@ -4059,7 +4059,7 @@ static int drv_cmd_set_fast_roam(hdd_adapter_t *adapter, if ((lfrMode < CFG_LFR_FEATURE_ENABLED_MIN) || (lfrMode > CFG_LFR_FEATURE_ENABLED_MAX)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "lfr mode value %d is out of range (Min: %d Max: %d)", lfrMode, @@ -4069,7 +4069,7 @@ static int drv_cmd_set_fast_roam(hdd_adapter_t *adapter, goto exit; } - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Received Command to change lfr mode = %d", __func__, lfrMode); @@ -4103,7 +4103,7 @@ static int drv_cmd_set_fast_transition(hdd_adapter_t *adapter, * If the input value is greater than max value of datatype, * then also kstrtou8 fails */ - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: kstrtou8 failed range [%d - %d]", __func__, @@ -4115,7 +4115,7 @@ static int drv_cmd_set_fast_transition(hdd_adapter_t *adapter, if ((ft < CFG_FAST_TRANSITION_ENABLED_NAME_MIN) || (ft > CFG_FAST_TRANSITION_ENABLED_NAME_MAX)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "ft mode value %d is out of range (Min: %d Max: %d)", ft, @@ -4125,7 +4125,7 @@ static int drv_cmd_set_fast_transition(hdd_adapter_t *adapter, goto exit; } - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Received Command to change ft mode = %d", __func__, ft); @@ -4160,10 +4160,10 @@ static void hdd_wma_send_fastreassoc_cmd(int sessionId, tSirMacAddr bssid, msg.type = SIR_HAL_ROAM_INVOKE; msg.reserved = 0; msg.bodyptr = fastreassoc; - if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, + if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) { cdf_mem_free(fastreassoc); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL("Not able to post ROAM_INVOKE_CMD message to WMA")); } } @@ -4196,7 +4196,7 @@ static int drv_cmd_fast_reassoc(hdd_adapter_t *adapter, /* if not associated, no need to proceed with reassoc */ if (eConnectionState_Associated != pHddStaCtx->conn_info.connState) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s:Not associated!", __func__); ret = -EINVAL; @@ -4206,7 +4206,7 @@ static int drv_cmd_fast_reassoc(hdd_adapter_t *adapter, ret = hdd_parse_reassoc_command_v1_data(value, targetApBssid, &channel); if (ret) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Failed to parse reassoc command data", __func__); @@ -4219,7 +4219,7 @@ static int drv_cmd_fast_reassoc(hdd_adapter_t *adapter, */ if (true == cdf_mem_compare(targetApBssid, pHddStaCtx->conn_info.bssId.bytes, - CDF_MAC_ADDR_SIZE)) { + QDF_MAC_ADDR_SIZE)) { /* Reassoc to same AP, only supported for Open Security*/ if ((pHddStaCtx->conn_info.ucEncryptionType || pHddStaCtx->conn_info.mcEncryptionType)) { @@ -4321,7 +4321,7 @@ static int drv_cmd_set_ccx_mode(hdd_adapter_t *adapter, if (sme_get_is_ese_feature_enabled(hdd_ctx->hHal) && hdd_is_okc_mode_enabled(hdd_ctx) && sme_get_is_ft_feature_enabled(hdd_ctx->hHal)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, "%s: OKC/ESE/11R are supported simultaneously hence this operation is not permitted!", __func__); @@ -4339,7 +4339,7 @@ static int drv_cmd_set_ccx_mode(hdd_adapter_t *adapter, * If the input value is greater than max value of datatype, * then also kstrtou8 fails */ - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: kstrtou8 failed range [%d - %d]", __func__, CFG_ESE_FEATURE_ENABLED_MIN, @@ -4350,7 +4350,7 @@ static int drv_cmd_set_ccx_mode(hdd_adapter_t *adapter, if ((eseMode < CFG_ESE_FEATURE_ENABLED_MIN) || (eseMode > CFG_ESE_FEATURE_ENABLED_MAX)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "Ese mode value %d is out of range (Min: %d Max: %d)", eseMode, @@ -4359,7 +4359,7 @@ static int drv_cmd_set_ccx_mode(hdd_adapter_t *adapter, ret = -EINVAL; goto exit; } - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Received Command to change ese mode = %d", __func__, eseMode); @@ -4393,14 +4393,14 @@ static int drv_cmd_set_roam_scan_control(hdd_adapter_t *adapter, * If the input value is greater than max value of datatype, * then also kstrtou8 fails */ - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: kstrtou8 failed ", __func__); ret = -EINVAL; goto exit; } - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Received Command to Set roam scan control = %d", __func__, roamScanControl); @@ -4434,7 +4434,7 @@ static int drv_cmd_set_okc_mode(hdd_adapter_t *adapter, if (sme_get_is_ese_feature_enabled(hdd_ctx->hHal) && hdd_is_okc_mode_enabled(hdd_ctx) && sme_get_is_ft_feature_enabled(hdd_ctx->hHal)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, "%s: OKC/ESE/11R are supported simultaneously hence this operation is not permitted!", __func__); @@ -4452,7 +4452,7 @@ static int drv_cmd_set_okc_mode(hdd_adapter_t *adapter, * If the input value is greater than max value of datatype, * then also kstrtou8 fails */ - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: kstrtou8 failed range [%d - %d]", __func__, CFG_OKC_FEATURE_ENABLED_MIN, @@ -4463,7 +4463,7 @@ static int drv_cmd_set_okc_mode(hdd_adapter_t *adapter, if ((okcMode < CFG_OKC_FEATURE_ENABLED_MIN) || (okcMode > CFG_OKC_FEATURE_ENABLED_MAX)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "Okc mode value %d is out of range (Min: %d Max: %d)", okcMode, @@ -4472,7 +4472,7 @@ static int drv_cmd_set_okc_mode(hdd_adapter_t *adapter, ret = -EINVAL; goto exit; } - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Received Command to change okc mode = %d", __func__, okcMode); @@ -4495,9 +4495,9 @@ static int drv_cmd_get_roam_scan_control(hdd_adapter_t *adapter, len = scnprintf(extra, sizeof(extra), "%s %d", command, roamScanControl); - len = CDF_MIN(priv_data->total_len, len + 1); + len = QDF_MIN(priv_data->total_len, len + 1); if (copy_to_user(priv_data->buf, &extra, len)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); @@ -4518,7 +4518,7 @@ static int drv_cmd_bt_coex_mode(hdd_adapter_t *adapter, bcMode = command + 11; if ('1' == *bcMode) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_DEBUG, FL("BTCOEXMODE %d"), *bcMode); hdd_ctx->btCoexModeSet = true; @@ -4528,7 +4528,7 @@ static int drv_cmd_bt_coex_mode(hdd_adapter_t *adapter, FL("Failed to abort existing scan status:%d"), ret); } } else if ('2' == *bcMode) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_DEBUG, FL("BTCOEXMODE %d"), *bcMode); hdd_ctx->btCoexModeSet = false; @@ -4571,9 +4571,9 @@ static int drv_cmd_get_dwell_time(hdd_adapter_t *adapter, memset(extra, 0, sizeof(extra)); ret = hdd_get_dwell_time(pCfg, command, extra, sizeof(extra), &len); - len = CDF_MIN(priv_data->total_len, len + 1); + len = QDF_MIN(priv_data->total_len, len + 1); if (ret != 0 || copy_to_user(priv_data->buf, &extra, len)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); @@ -4609,7 +4609,7 @@ static int drv_cmd_miracast(hdd_adapter_t *adapter, pHddCtx = WLAN_HDD_GET_CTX(adapter); if (0 != wlan_hdd_validate_context(pHddCtx)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s pHddCtx is not valid, Unable to set miracast mode", __func__); return -EINVAL; @@ -4625,7 +4625,7 @@ static int drv_cmd_miracast(hdd_adapter_t *adapter, * If the input value is greater than max value of datatype, * then also kstrtou8 fails */ - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: kstrtou8 failed range ", __func__); @@ -4635,7 +4635,7 @@ static int drv_cmd_miracast(hdd_adapter_t *adapter, if ((filterType < WLAN_HDD_DRIVER_MIRACAST_CFG_MIN_VAL) || (filterType > WLAN_HDD_DRIVER_MIRACAST_CFG_MAX_VAL)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Accepted Values are 0 to 2. 0-Disabled, 1-Source, 2-Sink ", __func__); @@ -4673,14 +4673,14 @@ static int drv_cmd_set_ccx_roam_scan_channels(hdd_adapter_t *adapter, ret = hdd_parse_channellist(value, ChannelList, &numChannels); if (ret) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Failed to parse channel list information", __func__); goto exit; } if (numChannels > WNI_CFG_VALID_CHANNEL_LIST_LEN) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: number of channels (%d) supported exceeded max (%d)", __func__, @@ -4694,7 +4694,7 @@ static int drv_cmd_set_ccx_roam_scan_channels(hdd_adapter_t *adapter, ChannelList, numChannels); if (QDF_STATUS_SUCCESS != status) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Failed to update channel list information", __func__); @@ -4732,7 +4732,7 @@ static int drv_cmd_get_tsm_stats(hdd_adapter_t *adapter, /* if not associated, return error */ if (eConnectionState_Associated != pHddStaCtx->conn_info.connState) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s:Not associated!", __func__); ret = -EINVAL; @@ -4749,7 +4749,7 @@ static int drv_cmd_get_tsm_stats(hdd_adapter_t *adapter, * If the input value is greater than max value of datatype, * then also kstrtou8 fails */ - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: kstrtou8 failed range [%d - %d]", __func__, TID_MIN_VALUE, @@ -4758,27 +4758,27 @@ static int drv_cmd_get_tsm_stats(hdd_adapter_t *adapter, goto exit; } if ((tid < TID_MIN_VALUE) || (tid > TID_MAX_VALUE)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "tid value %d is out of range (Min: %d Max: %d)", tid, TID_MIN_VALUE, TID_MAX_VALUE); ret = -EINVAL; goto exit; } - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Received Command to get tsm stats tid = %d", __func__, tid); if (QDF_STATUS_SUCCESS != hdd_get_tsm_stats(adapter, tid, &tsm_metrics)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: failed to get tsm stats", __func__); ret = -EFAULT; goto exit; } - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "UplinkPktQueueDly(%d) UplinkPktQueueDlyHist[0](%d) UplinkPktQueueDlyHist[1](%d) UplinkPktQueueDlyHist[2](%d) UplinkPktQueueDlyHist[3](%d) UplinkPktTxDly(%u) UplinkPktLoss(%d) UplinkPktCount(%d) RoamingCount(%d) RoamingDly(%d)", tsm_metrics.UplinkPktQueueDly, @@ -4811,9 +4811,9 @@ static int drv_cmd_get_tsm_stats(hdd_adapter_t *adapter, tsm_metrics.UplinkPktCount, tsm_metrics.RoamingCount, tsm_metrics.RoamingDly); - len = CDF_MIN(priv_data->total_len, len + 1); + len = QDF_MIN(priv_data->total_len, len + 1); if (copy_to_user(priv_data->buf, &extra, len)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); @@ -4838,7 +4838,7 @@ static int drv_cmd_set_cckm_ie(hdd_adapter_t *adapter, ret = hdd_parse_get_cckm_ie(value, &cckmIe, &cckmIeLen); if (ret) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Failed to parse cckm ie data", __func__); @@ -4846,7 +4846,7 @@ static int drv_cmd_set_cckm_ie(hdd_adapter_t *adapter, } if (cckmIeLen > DOT11F_IE_RSN_MAX_LEN) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: CCKM Ie input length is more than max[%d]", __func__, DOT11F_IE_RSN_MAX_LEN); @@ -4889,7 +4889,7 @@ static int drv_cmd_ccx_beacon_req(hdd_adapter_t *adapter, ret = hdd_parse_ese_beacon_req(value, &eseBcnReq); if (ret) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Failed to parse ese beacon req", __func__); @@ -4916,7 +4916,7 @@ static int drv_cmd_ccx_beacon_req(hdd_adapter_t *adapter, ret = -EBUSY; goto exit; } else if (QDF_STATUS_SUCCESS != status) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: sme_set_ese_beacon_request failed (%d)", __func__, status); @@ -4963,14 +4963,14 @@ static int drv_cmd_max_tx_power(hdd_adapter_t *adapter, QDF_STATUS qdf_status; QDF_STATUS smeStatus; uint8_t *value = command; - 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; hdd_adapter_list_node_t *pAdapterNode = NULL; hdd_adapter_list_node_t *pNext = NULL; status = hdd_parse_setmaxtxpower_command(value, &txPower); if (status) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "Invalid MAXTXPOWER command "); ret = -EINVAL; @@ -5034,7 +5034,7 @@ static int drv_cmd_set_dfs_scan_mode(hdd_adapter_t *adapter, * If the input value is greater than max value of datatype, * then also kstrtou8 fails */ - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: kstrtou8 failed range [%d - %d]", __func__, CFG_ROAMING_DFS_CHANNEL_MIN, @@ -5045,7 +5045,7 @@ static int drv_cmd_set_dfs_scan_mode(hdd_adapter_t *adapter, if ((dfsScanMode < CFG_ROAMING_DFS_CHANNEL_MIN) || (dfsScanMode > CFG_ROAMING_DFS_CHANNEL_MAX)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "dfsScanMode value %d is out of range (Min: %d Max: %d)", dfsScanMode, @@ -5055,7 +5055,7 @@ static int drv_cmd_set_dfs_scan_mode(hdd_adapter_t *adapter, goto exit; } - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Received Command to Set DFS Scan Mode = %d", __func__, dfsScanMode); @@ -5091,9 +5091,9 @@ static int drv_cmd_get_dfs_scan_mode(hdd_adapter_t *adapter, uint8_t len = 0; len = scnprintf(extra, sizeof(extra), "%s %d", command, dfsScanMode); - len = CDF_MIN(priv_data->total_len, len + 1); + len = QDF_MIN(priv_data->total_len, len + 1); if (copy_to_user(priv_data->buf, &extra, len)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); @@ -5115,9 +5115,9 @@ static int drv_cmd_get_link_status(hdd_adapter_t *adapter, uint8_t len; len = scnprintf(extra, sizeof(extra), "%s %d", command, value); - len = CDF_MIN(priv_data->total_len, len + 1); + len = QDF_MIN(priv_data->total_len, len + 1); if (copy_to_user(priv_data->buf, &extra, len)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); @@ -5355,7 +5355,7 @@ static int drv_cmd_get_rssi(hdd_adapter_t *adapter, wlan_hdd_get_rssi(adapter, &rssi); len = scnprintf(extra, sizeof(extra), "%s %d", command, rssi); - len = CDF_MIN(priv_data->total_len, len + 1); + len = QDF_MIN(priv_data->total_len, len + 1); if (copy_to_user(priv_data->buf, &extra, len)) { hddLog(LOGE, FL("Failed to copy data to user buffer")); @@ -5381,7 +5381,7 @@ static int drv_cmd_get_linkspeed(hdd_adapter_t *adapter, return ret; len = scnprintf(extra, sizeof(extra), "%s %d", command, link_speed); - len = CDF_MIN(priv_data->total_len, len + 1); + len = QDF_MIN(priv_data->total_len, len + 1); if (copy_to_user(priv_data->buf, &extra, len)) { hddLog(LOGE, FL("Failed to copy data to user buffer")); ret = -EFAULT; @@ -5598,12 +5598,12 @@ static int drv_cmd_napi(hdd_adapter_t *adapter, if (0 != rc) { const char *msg = "unknown or badly formatted cmd\n%s"; - l = CDF_MIN(MAX_USER_COMMAND_SIZE, + l = QDF_MIN(MAX_USER_COMMAND_SIZE, strlen(msg)+strlen(synopsis)); n = scnprintf(reply, l, msg, synopsis); if (copy_to_user(priv_data->buf, reply, - CDF_MIN(priv_data->total_len, l))) + QDF_MIN(priv_data->total_len, l))) hdd_err("failed to copy data to user buffer"); hdd_debug("reply: %s", reply); @@ -5641,7 +5641,7 @@ static int drv_cmd_napi(hdd_adapter_t *adapter, status_end: hdd_info("wlan: STATUS DATA:\n%s", reply); if (copy_to_user(priv_data->buf, reply, - CDF_MIN(n, priv_data->total_len))) + QDF_MIN(n, priv_data->total_len))) rc = -EINVAL; } else if (!strcmp(subcmd, "STATS")) { int n = 0; @@ -5655,7 +5655,7 @@ static int drv_cmd_napi(hdd_adapter_t *adapter, } if (n > 0) { if (copy_to_user(priv_data->buf, reply, - CDF_MIN(priv_data->total_len, + QDF_MIN(priv_data->total_len, n))) rc = -EINVAL; hdd_info("wlan: STATS_DATA\n%s\n", reply); @@ -5882,7 +5882,7 @@ static int drv_cmd_invalid(hdd_adapter_t *adapter, uint8_t command_len, hdd_priv_data_t *priv_data) { - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_UNSUPPORTED_IOCTL, adapter->sessionId, 0)); @@ -6235,7 +6235,7 @@ static int hdd_driver_command(hdd_adapter_t *adapter, 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; } @@ -6360,20 +6360,20 @@ static int __hdd_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) ENTER(); if (dev != adapter->dev) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL, "%s: HDD adapter/dev inconsistency", __func__); ret = -ENODEV; goto exit; } if ((!ifr) || (!ifr->ifr_data)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: invalid data", __func__); ret = -EINVAL; goto exit; } #if defined(QCA_WIFI_FTM) && defined(LINUX_QCMBR) - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { if (SIOCIOCTLTX99 == cmd) { ret = wlan_hdd_qcmbr_unified_ioctl(adapter, ifr); goto exit; diff --git a/core/hdd/src/wlan_hdd_ipa.c b/core/hdd/src/wlan_hdd_ipa.c index 6199d4d7b5..635433840d 100644 --- a/core/hdd/src/wlan_hdd_ipa.c +++ b/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, diff --git a/core/hdd/src/wlan_hdd_lro.c b/core/hdd/src/wlan_hdd_lro.c index 1a51a05335..1ea7dd4bf8 100644 --- a/core/hdd/src/wlan_hdd_lro.c +++ b/core/hdd/src/wlan_hdd_lro.c @@ -34,7 +34,7 @@ #define HDD_DISALLOW_LEGACY_HDDLOG 1 #include -#include +#include #include #include #include @@ -503,7 +503,7 @@ int hdd_lro_enable(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter) { struct hdd_lro_s *hdd_lro; - 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); size_t lro_mgr_sz, desc_arr_sz, desc_pool_sz, hash_table_sz; uint8_t *lro_mem_ptr; diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index ba20df84a5..3dc87356af 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -55,7 +55,7 @@ #include "wlan_hdd_ftm.h" #include "wlan_hdd_power.h" #include "wlan_hdd_stats.h" -#include "cdf_types.h" +#include "qdf_types.h" #include "cdf_trace.h" #include @@ -189,7 +189,7 @@ void wlan_hdd_auto_shutdown_cb(void); void wlan_hdd_txrx_pause_cb(uint8_t vdev_id, enum netif_action_type action, enum netif_reason_type reason) { - 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; if (!hdd_ctx) { @@ -482,7 +482,7 @@ uint8_t wlan_hdd_find_opclass(tHalHandle hal, uint8_t channel, * * Return: None */ -static void hdd_cdf_trace_enable(CDF_MODULE_ID moduleId, uint32_t bitmask) +static void hdd_cdf_trace_enable(QDF_MODULE_ID moduleId, uint32_t bitmask) { CDF_TRACE_LEVEL level; @@ -744,16 +744,16 @@ QDF_STATUS hdd_set_ibss_power_save_params(hdd_adapter_t *adapter) * Return: None */ void hdd_update_macaddr(struct hdd_config *config, - struct cdf_mac_addr hw_macaddr) + struct qdf_mac_addr hw_macaddr) { int8_t i; uint8_t macaddr_b3, tmp_br3; cdf_mem_copy(config->intfMacAddr[0].bytes, hw_macaddr.bytes, - CDF_MAC_ADDR_SIZE); - for (i = 1; i < CDF_MAX_CONCURRENCY_PERSONA; i++) { + QDF_MAC_ADDR_SIZE); + for (i = 1; i < QDF_MAX_CONCURRENCY_PERSONA; i++) { cdf_mem_copy(config->intfMacAddr[i].bytes, hw_macaddr.bytes, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); macaddr_b3 = config->intfMacAddr[i].bytes[3]; tmp_br3 = ((macaddr_b3 >> 4 & INTF_MACADDR_MASK) + i) & INTF_MACADDR_MASK; @@ -1441,7 +1441,7 @@ static int __hdd_open(struct net_device *dev) hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(adapter); int ret; - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, TRACE_CODE_HDD_OPEN_REQUEST, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_OPEN_REQUEST, adapter->sessionId, adapter->device_mode)); ret = wlan_hdd_validate_context(hdd_ctx); @@ -1497,7 +1497,7 @@ static int __hdd_stop(struct net_device *dev) ENTER(); - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, TRACE_CODE_HDD_STOP_REQUEST, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_STOP_REQUEST, adapter->sessionId, adapter->device_mode)); ret = wlan_hdd_validate_context(hdd_ctx); @@ -1678,12 +1678,12 @@ static int hdd_set_mac_address(struct net_device *dev, void *addr) uint8_t *wlan_hdd_get_intf_addr(hdd_context_t *hdd_ctx) { int i; - for (i = 0; i < CDF_MAX_CONCURRENCY_PERSONA; i++) { + for (i = 0; i < QDF_MAX_CONCURRENCY_PERSONA; i++) { if (0 == ((hdd_ctx->config->intfAddrMask) & (1 << i))) break; } - if (CDF_MAX_CONCURRENCY_PERSONA == i) + if (QDF_MAX_CONCURRENCY_PERSONA == i) return NULL; hdd_ctx->config->intfAddrMask |= (1 << i); @@ -1693,7 +1693,7 @@ uint8_t *wlan_hdd_get_intf_addr(hdd_context_t *hdd_ctx) void wlan_hdd_release_intf_addr(hdd_context_t *hdd_ctx, uint8_t *releaseAddr) { int i; - for (i = 0; i < CDF_MAX_CONCURRENCY_PERSONA; i++) { + for (i = 0; i < QDF_MAX_CONCURRENCY_PERSONA; i++) { if (!memcmp(releaseAddr, &hdd_ctx->config->intfMacAddr[i].bytes[0], 6)) { @@ -1724,7 +1724,7 @@ static void __hdd_set_multicast_list(struct net_device *dev) static const uint8_t ipv6_router_solicitation[] = {0x33, 0x33, 0x00, 0x00, 0x00, 0x02}; - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) return; ENTER(); @@ -2522,7 +2522,7 @@ hdd_adapter_t *hdd_open_adapter(hdd_context_t *hdd_ctx, uint8_t session_type, cds_check_and_restart_sap_with_non_dfs_acs(); } - if ((cds_get_conparam() != CDF_GLOBAL_FTM_MODE) + if ((cds_get_conparam() != QDF_GLOBAL_FTM_MODE) && (!hdd_ctx->config->enable2x2)) { #define HDD_DTIM_1CHAIN_RX_ID 0x5 #define HDD_SMPS_PARAM_VALUE_S 29 @@ -2568,7 +2568,7 @@ hdd_adapter_t *hdd_open_adapter(hdd_context_t *hdd_ctx, uint8_t session_type, #undef HDD_SMPS_PARAM_VALUE_S } - if (CDF_GLOBAL_FTM_MODE != cds_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE != cds_get_conparam()) { ret = wma_cli_set_command(adapter->sessionId, WMI_PDEV_PARAM_HYST_EN, hdd_ctx->config->enableMemDeepSleep, @@ -2585,7 +2585,7 @@ hdd_adapter_t *hdd_open_adapter(hdd_context_t *hdd_ctx, uint8_t session_type, #ifdef CONFIG_FW_LOGS_BASED_ON_INI /* Enable FW logs based on INI configuration */ - if ((CDF_GLOBAL_FTM_MODE != cds_get_conparam()) && + if ((QDF_GLOBAL_FTM_MODE != cds_get_conparam()) && (hdd_ctx->config->enable_fw_log)) { uint8_t count = 0; uint32_t value = 0; @@ -2736,7 +2736,7 @@ QDF_STATUS hdd_close_all_adapters(hdd_context_t *hdd_ctx, bool rtnl_held) void wlan_hdd_reset_prob_rspies(hdd_adapter_t *pHostapdAdapter) { - struct cdf_mac_addr *bssid = NULL; + struct qdf_mac_addr *bssid = NULL; tSirUpdateIE updateIE; switch (pHostapdAdapter->device_mode) { case WLAN_HDD_INFRA_STATION: @@ -3051,7 +3051,7 @@ QDF_STATUS hdd_start_all_adapters(hdd_context_t *hdd_ctx) QDF_STATUS status; hdd_adapter_t *adapter; #ifndef MSM_PLATFORM - struct cdf_mac_addr bcastMac = CDF_MAC_ADDR_BROADCAST_INITIALIZER; + struct qdf_mac_addr bcastMac = QDF_MAC_ADDR_BROADCAST_INITIALIZER; #endif eConnectionState connState; @@ -3642,7 +3642,7 @@ static inline int hdd_logging_sock_deactivate_svc(hdd_context_t *hdd_ctx) */ static void hdd_free_context(hdd_context_t *hdd_ctx) { - if (CDF_GLOBAL_FTM_MODE != hdd_get_conparam()) + if (QDF_GLOBAL_FTM_MODE != hdd_get_conparam()) hdd_logging_sock_deactivate_svc(hdd_ctx); cdf_mem_free(hdd_ctx->config); @@ -3674,7 +3674,7 @@ void hdd_wlan_exit(hdd_context_t *hdd_ctx) hdd_unregister_wext_all_adapters(hdd_ctx); - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_disable_ftm(hdd_ctx); hdd_alert("FTM driver unloaded"); @@ -3823,7 +3823,7 @@ void __hdd_wlan_exit(void) ENTER(); - hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); + hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); if (!hdd_ctx) { hddLog(CDF_TRACE_LEVEL_FATAL, FL("Invalid HDD Context")); EXIT(); @@ -3874,7 +3874,7 @@ void hdd_skip_acs_scan_timer_handler(void *data) * Return: 0 if successful, error number otherwise */ int hdd_wlan_set_ht2040_mode(hdd_adapter_t *adapter, uint16_t staId, - struct cdf_mac_addr macAddrSTA, int channel_type) + struct qdf_mac_addr macAddrSTA, int channel_type) { int status; QDF_STATUS qdf_status; @@ -3915,7 +3915,7 @@ int hdd_wlan_notify_modem_power_state(int state) QDF_STATUS qdf_status; hdd_context_t *hdd_ctx; - hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); + hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); status = wlan_hdd_validate_context(hdd_ctx); if (0 != status) { hddLog(LOGE, FL("HDD context is not valid")); @@ -4614,7 +4614,7 @@ static uint8_t hdd_find_prefd_safe_chnl(hdd_context_t *hdd_ctxt, } safe_channel_count = 0; - unsafe_channel_count = CDF_MIN((uint16_t)hdd_ctxt->unsafe_channel_count, + unsafe_channel_count = QDF_MIN((uint16_t)hdd_ctxt->unsafe_channel_count, (uint16_t)NUM_20MHZ_RF_CHANNELS); for (i = 0; i < NUM_20MHZ_RF_CHANNELS; i++) { @@ -4679,7 +4679,7 @@ void hdd_indicate_mgmt_frame(tSirSmeMgmtFrameInd *frame_ind) } /* Get the HDD context.*/ hdd_ctx = - (hdd_context_t *)cds_get_context(CDF_MODULE_ID_HDD); + (hdd_context_t *)cds_get_context(QDF_MODULE_ID_HDD); if (0 != wlan_hdd_validate_context(hdd_ctx)) return; @@ -4929,7 +4929,7 @@ static void hdd_init_channel_avoidance(hdd_context_t *hdd_ctx) hddLog(CDF_TRACE_LEVEL_INFO, FL("num of unsafe channels is %d"), hdd_ctx->unsafe_channel_count); - unsafe_channel_count = CDF_MIN((uint16_t)hdd_ctx->unsafe_channel_count, + unsafe_channel_count = QDF_MIN((uint16_t)hdd_ctx->unsafe_channel_count, (uint16_t)NUM_20MHZ_RF_CHANNELS); for (index = 0; index < unsafe_channel_count; index++) { @@ -5016,41 +5016,41 @@ static void hdd_override_ini_config(hdd_context_t *hdd_ctx) */ static void hdd_set_trace_level_for_each(hdd_context_t *hdd_ctx) { - hdd_cdf_trace_enable(CDF_MODULE_ID_WMI, + hdd_cdf_trace_enable(QDF_MODULE_ID_WMI, hdd_ctx->config->cdf_trace_enable_wdi); - hdd_cdf_trace_enable(CDF_MODULE_ID_HDD, + hdd_cdf_trace_enable(QDF_MODULE_ID_HDD, hdd_ctx->config->cdf_trace_enable_hdd); - hdd_cdf_trace_enable(CDF_MODULE_ID_SME, + hdd_cdf_trace_enable(QDF_MODULE_ID_SME, hdd_ctx->config->cdf_trace_enable_sme); - hdd_cdf_trace_enable(CDF_MODULE_ID_PE, + hdd_cdf_trace_enable(QDF_MODULE_ID_PE, hdd_ctx->config->cdf_trace_enable_pe); - hdd_cdf_trace_enable(CDF_MODULE_ID_WMA, + hdd_cdf_trace_enable(QDF_MODULE_ID_WMA, hdd_ctx->config->cdf_trace_enable_wma); - hdd_cdf_trace_enable(CDF_MODULE_ID_SYS, + hdd_cdf_trace_enable(QDF_MODULE_ID_SYS, hdd_ctx->config->cdf_trace_enable_sys); - hdd_cdf_trace_enable(CDF_MODULE_ID_CDF, + hdd_cdf_trace_enable(QDF_MODULE_ID_QDF, hdd_ctx->config->cdf_trace_enable_cdf); - hdd_cdf_trace_enable(CDF_MODULE_ID_SAP, + hdd_cdf_trace_enable(QDF_MODULE_ID_SAP, hdd_ctx->config->cdf_trace_enable_sap); - hdd_cdf_trace_enable(CDF_MODULE_ID_HDD_SOFTAP, + hdd_cdf_trace_enable(QDF_MODULE_ID_HDD_SOFTAP, hdd_ctx->config->cdf_trace_enable_hdd_sap); - hdd_cdf_trace_enable(CDF_MODULE_ID_BMI, + hdd_cdf_trace_enable(QDF_MODULE_ID_BMI, hdd_ctx->config->cdf_trace_enable_bmi); - hdd_cdf_trace_enable(CDF_MODULE_ID_CFG, + hdd_cdf_trace_enable(QDF_MODULE_ID_CFG, hdd_ctx->config->cdf_trace_enable_cfg); - hdd_cdf_trace_enable(CDF_MODULE_ID_EPPING, + hdd_cdf_trace_enable(QDF_MODULE_ID_EPPING, hdd_ctx->config->cdf_trace_enable_epping); - hdd_cdf_trace_enable(CDF_MODULE_ID_CDF_DEVICE, + hdd_cdf_trace_enable(QDF_MODULE_ID_QDF_DEVICE, hdd_ctx->config->cdf_trace_enable_cdf_devices); - hdd_cdf_trace_enable(CDF_MODULE_ID_TXRX, + hdd_cdf_trace_enable(QDF_MODULE_ID_TXRX, hdd_ctx->config->cfd_trace_enable_txrx); - hdd_cdf_trace_enable(CDF_MODULE_ID_HTC, + hdd_cdf_trace_enable(QDF_MODULE_ID_HTC, hdd_ctx->config->cdf_trace_enable_htc); - hdd_cdf_trace_enable(CDF_MODULE_ID_HIF, + hdd_cdf_trace_enable(QDF_MODULE_ID_HIF, hdd_ctx->config->cdf_trace_enable_hif); - hdd_cdf_trace_enable(CDF_MODULE_ID_HDD_SAP_DATA, + hdd_cdf_trace_enable(QDF_MODULE_ID_HDD_SAP_DATA, hdd_ctx->config->cdf_trace_enable_hdd_sap_data); - hdd_cdf_trace_enable(CDF_MODULE_ID_HDD_DATA, + hdd_cdf_trace_enable(QDF_MODULE_ID_HDD_DATA, hdd_ctx->config->cdf_trace_enable_hdd_data); hdd_cfg_print(hdd_ctx); @@ -5158,7 +5158,7 @@ hdd_context_t *hdd_init_context(struct device *dev, void *hif_sc) /* Uses to enabled logging after SSR */ hdd_ctx->fw_log_settings.enable = hdd_ctx->config->enable_fw_log; - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) goto skip_multicast_logging; cds_set_multicast_logging(hdd_ctx->config->multicast_host_fw_msgs); @@ -5226,7 +5226,7 @@ static int hdd_open_p2p_interface(hdd_context_t *hdd_ctx, bool rtnl_held) } cdf_mem_copy(&hdd_ctx->p2pDeviceAddress.bytes[0], p2p_dev_addr, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); } adapter = hdd_open_adapter(hdd_ctx, WLAN_HDD_P2P_DEVICE, "p2p%d", @@ -5459,7 +5459,7 @@ int hdd_wlan_startup(struct device *dev, void *hif_sc) if (IS_ERR(hdd_ctx)) return PTR_ERR(hdd_ctx); - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { ret = hdd_enable_ftm(hdd_ctx); if (ret) @@ -5478,7 +5478,7 @@ int hdd_wlan_startup(struct device *dev, void *hif_sc) wlan_hdd_update_wiphy(hdd_ctx->wiphy, hdd_ctx->config); - hdd_ctx->hHal = cds_get_context(CDF_MODULE_ID_SME); + hdd_ctx->hHal = cds_get_context(QDF_MODULE_ID_SME); if (NULL == hdd_ctx->hHal) { hddLog(CDF_TRACE_LEVEL_FATAL, FL("HAL context is null")); @@ -5694,7 +5694,7 @@ int hdd_wlan_startup(struct device *dev, void *hif_sc) #ifdef FEATURE_WLAN_AP_AP_ACS_OPTIMIZE status = cdf_mc_timer_init(&hdd_ctx->skip_acs_scan_timer, - CDF_TIMER_TYPE_SW, + QDF_TIMER_TYPE_SW, hdd_skip_acs_scan_timer_handler, (void *)hdd_ctx); if (!QDF_IS_STATUS_SUCCESS(status)) @@ -5727,7 +5727,7 @@ int hdd_wlan_startup(struct device *dev, void *hif_sc) #ifdef MSM_PLATFORM spin_lock_init(&hdd_ctx->bus_bw_lock); cdf_mc_timer_init(&hdd_ctx->bus_bw_timer, - CDF_TIMER_TYPE_SW, + QDF_TIMER_TYPE_SW, hdd_bus_bw_compute_cbk, (void *)hdd_ctx); #endif @@ -5992,10 +5992,10 @@ int wlan_hdd_gen_wlan_status_pack(struct wlan_status_data *data, pHddStaCtx->conn_info.SSID.SSID.ssId, pHddStaCtx->conn_info.SSID.SSID.length); } - if (CDF_MAC_ADDR_SIZE >= + if (QDF_MAC_ADDR_SIZE >= sizeof(pHddStaCtx->conn_info.bssId)) memcpy(data->bssid, pHddStaCtx->conn_info.bssId.bytes, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); } return 0; } @@ -6203,7 +6203,7 @@ void wlan_hdd_send_status_pkg(hdd_adapter_t *adapter, int ret = 0; struct wlan_status_data data; - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) return; memset(&data, 0, sizeof(struct wlan_status_data)); @@ -6235,7 +6235,7 @@ void wlan_hdd_send_version_pkg(uint32_t fw_version, return; #endif - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) return; memset(&data, 0, sizeof(struct wlan_version_data)); @@ -6960,11 +6960,11 @@ static int con_mode_handler(const char *kmessage, struct kernel_param *kp) * * This is the driver exit point (invoked when module is unloaded using rmmod) * - * Return: enum tCDF_GLOBAL_CON_MODE + * Return: enum tQDF_GLOBAL_CON_MODE */ -enum tCDF_GLOBAL_CON_MODE hdd_get_conparam(void) +enum tQDF_GLOBAL_CON_MODE hdd_get_conparam(void) { - return (enum tCDF_GLOBAL_CON_MODE) curr_con_mode; + return (enum tQDF_GLOBAL_CON_MODE) curr_con_mode; } void hdd_set_conparam(uint32_t con_param) diff --git a/core/hdd/src/wlan_hdd_memdump.c b/core/hdd/src/wlan_hdd_memdump.c index 80951ccd12..841efc2865 100644 --- a/core/hdd/src/wlan_hdd_memdump.c +++ b/core/hdd/src/wlan_hdd_memdump.c @@ -67,9 +67,9 @@ static void memdump_cleanup_timer_cb(void *data) { int status; hdd_context_t *hdd_ctx = data; - cdf_dma_addr_t paddr; - cdf_dma_addr_t dma_ctx = 0; - cdf_device_t cdf_ctx; + qdf_dma_addr_t paddr; + qdf_dma_addr_t dma_ctx = 0; + qdf_device_t cdf_ctx; status = wlan_hdd_validate_context(hdd_ctx); if (0 != status) { @@ -82,7 +82,7 @@ static void memdump_cleanup_timer_cb(void *data) return; } - cdf_ctx = cds_get_context(CDF_MODULE_ID_CDF_DEVICE); + cdf_ctx = cds_get_context(QDF_MODULE_ID_QDF_DEVICE); if (!cdf_ctx) { hddLog(LOGE, FL("CDF context is NULL")); return; @@ -202,9 +202,9 @@ static int __wlan_hdd_cfg80211_get_fw_mem_dump(struct wiphy *wiphy, struct fw_dump_req fw_mem_dump_req; struct fw_dump_seg_req *seg_req; uint8_t loop; - cdf_dma_addr_t paddr; - cdf_dma_addr_t dma_ctx = 0; - cdf_device_t cdf_ctx; + qdf_dma_addr_t paddr; + qdf_dma_addr_t dma_ctx = 0; + qdf_device_t cdf_ctx; unsigned long rc; struct hdd_fw_dump_context *context; @@ -214,7 +214,7 @@ static int __wlan_hdd_cfg80211_get_fw_mem_dump(struct wiphy *wiphy, return status; } - cdf_ctx = cds_get_context(CDF_MODULE_ID_CDF_DEVICE); + cdf_ctx = cds_get_context(QDF_MODULE_ID_QDF_DEVICE); if (!cdf_ctx) { hddLog(LOGE, FL("CDF context is NULL")); return -EINVAL; @@ -393,9 +393,9 @@ static ssize_t memdump_read(struct file *file, char __user *buf, { int status; hdd_context_t *hdd_ctx; - cdf_dma_addr_t paddr; - cdf_dma_addr_t dma_ctx = 0; - cdf_device_t cdf_ctx; + qdf_dma_addr_t paddr; + qdf_dma_addr_t dma_ctx = 0; + qdf_device_t cdf_ctx; hdd_ctx = memdump_get_file_data(file); @@ -405,7 +405,7 @@ static ssize_t memdump_read(struct file *file, char __user *buf, hddLog(LOGE, FL("HDD context is not valid")); return -EINVAL; } - cdf_ctx = cds_get_context(CDF_MODULE_ID_CDF_DEVICE); + cdf_ctx = cds_get_context(QDF_MODULE_ID_QDF_DEVICE); if (!cdf_ctx) { hddLog(LOGE, FL("CDF context is NULL")); return -EINVAL; @@ -481,7 +481,7 @@ static int memdump_procfs_init(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) { hddLog(LOGE , FL("Invalid HDD context")); return -EINVAL; @@ -542,13 +542,13 @@ int memdump_init(void) QDF_STATUS cb_status; QDF_STATUS qdf_status; - hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); + hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); if (!hdd_ctx) { hddLog(LOGE , FL("Invalid HDD context")); return -EINVAL; } - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hddLog(LOGE, FL("Not initializing memdump in FTM mode")); return -EINVAL; } @@ -569,7 +569,7 @@ int memdump_init(void) init_completion(&fw_dump_context.response_event); qdf_status = cdf_mc_timer_init(&hdd_ctx->memdump_cleanup_timer, - CDF_TIMER_TYPE_SW, memdump_cleanup_timer_cb, + QDF_TIMER_TYPE_SW, memdump_cleanup_timer_cb, (void *)hdd_ctx); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(LOGE, FL("Failed to init memdump cleanup timer")); @@ -591,23 +591,23 @@ int memdump_init(void) void memdump_deinit(void) { hdd_context_t *hdd_ctx; - cdf_dma_addr_t paddr; - cdf_dma_addr_t dma_ctx = 0; - cdf_device_t cdf_ctx; + qdf_dma_addr_t paddr; + qdf_dma_addr_t dma_ctx = 0; + qdf_device_t cdf_ctx; QDF_STATUS qdf_status; - hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); + hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); if (!hdd_ctx) { hddLog(LOGE , FL("Invalid HDD context")); return; } - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hddLog(LOGE, FL("Not deinitializing memdump in FTM mode")); return; } - cdf_ctx = cds_get_context(CDF_MODULE_ID_CDF_DEVICE); + cdf_ctx = cds_get_context(QDF_MODULE_ID_QDF_DEVICE); if (!cdf_ctx) { hddLog(LOGE, FL("CDF context is NULL")); return; diff --git a/core/hdd/src/wlan_hdd_nan.c b/core/hdd/src/wlan_hdd_nan.c index 9fe3aee14d..d95413da31 100644 --- a/core/hdd/src/wlan_hdd_nan.c +++ b/core/hdd/src/wlan_hdd_nan.c @@ -68,7 +68,7 @@ static int __wlan_hdd_cfg80211_nan_request(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; } diff --git a/core/hdd/src/wlan_hdd_napi.c b/core/hdd/src/wlan_hdd_napi.c index 15d372d393..29c857962a 100644 --- a/core/hdd/src/wlan_hdd_napi.c +++ b/core/hdd/src/wlan_hdd_napi.c @@ -36,7 +36,7 @@ #include "cds_api.h" /* cds_get_context */ #include "hif.h" /* hif_map_service...*/ #include "wlan_hdd_main.h" /* hdd_err/warn... */ -#include "cdf_types.h" /* CDF_MODULE_ID_... */ +#include "qdf_types.h" /* QDF_MODULE_ID_... */ #include "ce_api.h" /* guaranteed to be initialized to zero/NULL by the standard */ @@ -58,7 +58,7 @@ struct qca_napi_data *hdd_napi_get_all(void) NAPI_DEBUG("-->"); - hif = cds_get_context(CDF_MODULE_ID_HIF); + hif = cds_get_context(QDF_MODULE_ID_HIF); if (unlikely(NULL == hif)) CDF_ASSERT(NULL != hif); /* WARN */ else @@ -110,7 +110,7 @@ int hdd_napi_create(void) NAPI_DEBUG("-->"); - hif_ctx = cds_get_context(CDF_MODULE_ID_HIF); + hif_ctx = cds_get_context(QDF_MODULE_ID_HIF); if (unlikely(NULL == hif_ctx)) { CDF_ASSERT(NULL != hif_ctx); rc = -EFAULT; @@ -166,7 +166,7 @@ int hdd_napi_destroy(int force) if (hdd_napi_map) { struct hif_opaque_softc *hif_ctx; - hif_ctx = cds_get_context(CDF_MODULE_ID_HIF); + hif_ctx = cds_get_context(QDF_MODULE_ID_HIF); if (unlikely(NULL == hif_ctx)) CDF_ASSERT(NULL != hif_ctx); else @@ -210,7 +210,7 @@ int hdd_napi_enabled(int id) struct hif_opaque_softc *hif; int rc = 0; /* NOT enabled */ - hif = cds_get_context(CDF_MODULE_ID_HIF); + hif = cds_get_context(QDF_MODULE_ID_HIF); if (unlikely(NULL == hif)) CDF_ASSERT(hif != NULL); /* WARN_ON; rc = 0 */ else if (-1 == id) @@ -243,7 +243,7 @@ int hdd_napi_event(enum qca_napi_event event, void *data) NAPI_DEBUG("-->(event=%d, aux=%p)", event, data); - hif = cds_get_context(CDF_MODULE_ID_HIF); + hif = cds_get_context(QDF_MODULE_ID_HIF); if (unlikely(NULL == hif)) CDF_ASSERT(hif != NULL); else @@ -269,5 +269,5 @@ int hdd_napi_event(enum qca_napi_event event, void *data) */ int hdd_napi_poll(struct napi_struct *napi, int budget) { - return hif_napi_poll(cds_get_context(CDF_MODULE_ID_HIF), napi, budget); + return hif_napi_poll(cds_get_context(QDF_MODULE_ID_HIF), napi, budget); } diff --git a/core/hdd/src/wlan_hdd_ocb.c b/core/hdd/src/wlan_hdd_ocb.c index cc8543e0de..9b17d2fcc6 100644 --- a/core/hdd/src/wlan_hdd_ocb.c +++ b/core/hdd/src/wlan_hdd_ocb.c @@ -546,7 +546,7 @@ static int __iw_set_dot11p_channel_sched(struct net_device *dev, /* Save the mac address to release later */ cdf_mem_copy(adapter->ocb_mac_address[ adapter->ocb_mac_addr_count].bytes, - mac_addr, CDF_MAC_ADDR_SIZE); + mac_addr, QDF_MAC_ADDR_SIZE); adapter->ocb_mac_addr_count++; } @@ -886,7 +886,7 @@ static int __wlan_hdd_cfg80211_ocb_set_config(struct wiphy *wiphy, goto fail; } cdf_mem_copy(config->channels[i].mac_address.bytes, - mac_addr, CDF_MAC_ADDR_SIZE); + mac_addr, QDF_MAC_ADDR_SIZE); /* Save the mac address to release later */ cdf_copy_macaddr(&adapter->ocb_mac_address[ adapter->ocb_mac_addr_count], diff --git a/core/hdd/src/wlan_hdd_oemdata.c b/core/hdd/src/wlan_hdd_oemdata.c index 187cdc45b9..d877d4e180 100644 --- a/core/hdd/src/wlan_hdd_oemdata.c +++ b/core/hdd/src/wlan_hdd_oemdata.c @@ -183,14 +183,14 @@ static void send_oem_reg_rsp_nlink_msg(void) /* OEM message is always to a specific process and cannot be a broadcast */ if (p_hdd_ctx->oem_pid == 0) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: invalid dest pid", __func__); return; } skb = alloc_skb(NLMSG_SPACE(WLAN_NL_MAX_PAYLOAD), GFP_KERNEL); if (skb == NULL) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: alloc_skb failed", __func__); return; } @@ -223,7 +223,7 @@ static void send_oem_reg_rsp_nlink_msg(void) *deviceMode = pAdapter->device_mode; *vdevId = pAdapter->sessionId; (*numInterfaces)++; - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: numInterfaces: %d, deviceMode: %d, vdevId: %d", __func__, *numInterfaces, *deviceMode, *vdevId); @@ -238,7 +238,7 @@ static void send_oem_reg_rsp_nlink_msg(void) skb_put(skb, NLMSG_SPACE((sizeof(tAniMsgHdr) + aniHdr->length))); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: sending App Reg Response length (%d) to process pid (%d)", __func__, aniHdr->length, p_hdd_ctx->oem_pid); @@ -265,7 +265,7 @@ static void send_oem_err_rsp_nlink_msg(int32_t app_pid, uint8_t error_code) skb = alloc_skb(NLMSG_SPACE(WLAN_NL_MAX_PAYLOAD), GFP_KERNEL); if (skb == NULL) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: alloc_skb failed", __func__); return; } @@ -286,7 +286,7 @@ static void send_oem_err_rsp_nlink_msg(int32_t app_pid, uint8_t error_code) skb_put(skb, NLMSG_SPACE(sizeof(tAniMsgHdr) + aniHdr->length)); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: sending oem error response to process pid (%d)", __func__, app_pid); @@ -314,13 +314,13 @@ void hdd_send_oem_data_rsp_msg(int length, uint8_t *oemDataRsp) /* OEM message is always to a specific process and cannot be a broadcast */ if (p_hdd_ctx->oem_pid == 0) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: invalid dest pid", __func__); return; } if (length > OEM_DATA_RSP_SIZE) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: invalid length of Oem Data response", __func__); return; } @@ -328,7 +328,7 @@ void hdd_send_oem_data_rsp_msg(int length, uint8_t *oemDataRsp) skb = alloc_skb(NLMSG_SPACE(sizeof(tAniMsgHdr) + OEM_DATA_RSP_SIZE), GFP_KERNEL); if (skb == NULL) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: alloc_skb failed", __func__); return; } @@ -348,7 +348,7 @@ void hdd_send_oem_data_rsp_msg(int length, uint8_t *oemDataRsp) skb_put(skb, NLMSG_SPACE((sizeof(tAniMsgHdr) + aniHdr->length))); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: sending Oem Data Response of len (%d) to process pid (%d)", __func__, length, p_hdd_ctx->oem_pid); @@ -376,13 +376,13 @@ static QDF_STATUS oem_process_data_req_msg(int oemDataLen, char *oemData) /* for now, STA interface only */ pAdapter = hdd_get_adapter(p_hdd_ctx, WLAN_HDD_INFRA_STATION); if (!pAdapter) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: No adapter for STA mode", __func__); return QDF_STATUS_E_FAILURE; } if (!oemData) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: oemData is null", __func__); return QDF_STATUS_E_FAILURE; } @@ -398,7 +398,7 @@ static QDF_STATUS oem_process_data_req_msg(int oemDataLen, char *oemData) oemDataReqConfig.data_len = oemDataLen; cdf_mem_copy(oemDataReqConfig.data, oemData, oemDataLen); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: calling sme_oem_data_req", __func__); status = sme_oem_data_req(p_hdd_ctx->hHal, @@ -437,7 +437,7 @@ static int oem_process_channel_info_req_msg(int numOfChannels, char *chanList) /* OEM message is always to a specific process and cannot be a broadcast */ if (p_hdd_ctx->oem_pid == 0) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: invalid dest pid", __func__); return -EPERM; } @@ -446,7 +446,7 @@ static int oem_process_channel_info_req_msg(int numOfChannels, char *chanList) numOfChannels * sizeof(tHddChannelInfo)), GFP_KERNEL); if (skb == NULL) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: alloc_skb failed", __func__); return -ENOMEM; } @@ -498,7 +498,7 @@ static int oem_process_channel_info_req_msg(int numOfChannels, char *chanList) /* channel info is not returned, fill in zeros in channel * info struct */ - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: sme_get_reg_info failed for chan (%d), return info 0", __func__, chanId); hddChanInfo.chan_id = chanId; @@ -516,7 +516,7 @@ static int oem_process_channel_info_req_msg(int numOfChannels, char *chanList) skb_put(skb, NLMSG_SPACE((sizeof(tAniMsgHdr) + aniHdr->length))); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: sending channel info resp for num channels (%d) to pid (%d)", __func__, numOfChannels, p_hdd_ctx->oem_pid); @@ -662,7 +662,7 @@ static int oem_process_get_cap_req_msg(void) * * Return: none */ -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, @@ -674,7 +674,7 @@ void hdd_send_peer_status_ind_to_oem_app(struct cdf_mac_addr *peerMac, tPeerStatusInfo *pPeerInfo; if (!p_hdd_ctx || !p_hdd_ctx->hHal) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Either HDD Ctx is null or Hal Ctx is null", __func__); return; @@ -682,7 +682,7 @@ void hdd_send_peer_status_ind_to_oem_app(struct cdf_mac_addr *peerMac, /* check if oem app has registered and pid is valid */ if ((!p_hdd_ctx->oem_app_registered) || (p_hdd_ctx->oem_pid == 0)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "%s: OEM app is not registered(%d) or pid is invalid(%d)", __func__, p_hdd_ctx->oem_app_registered, p_hdd_ctx->oem_pid); @@ -693,7 +693,7 @@ void hdd_send_peer_status_ind_to_oem_app(struct cdf_mac_addr *peerMac, sizeof(tPeerStatusInfo)), GFP_KERNEL); if (skb == NULL) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: alloc_skb failed", __func__); return; } @@ -741,7 +741,7 @@ void hdd_send_peer_status_ind_to_oem_app(struct cdf_mac_addr *peerMac, } skb_put(skb, NLMSG_SPACE((sizeof(tAniMsgHdr) + aniHdr->length))); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "%s: sending peer " MAC_ADDRESS_STR " status(%d), peerTimingMeasCap(%d), vdevId(%d), chanId(%d)" " to oem app pid(%d), center freq 1 (%d), center freq 2 (%d)," @@ -787,14 +787,14 @@ static int oem_msg_callback(struct sk_buff *skb) nlh = (struct nlmsghdr *)skb->data; if (!nlh) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Netlink header null", __func__); return -EPERM; } ret = wlan_hdd_validate_context(p_hdd_ctx); if (0 != ret) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL("HDD context is not valid")); return ret; } @@ -802,7 +802,7 @@ static int oem_msg_callback(struct sk_buff *skb) msg_hdr = NLMSG_DATA(nlh); if (!msg_hdr) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Message header null", __func__); send_oem_err_rsp_nlink_msg(nlh->nlmsg_pid, OEM_ERR_NULL_MESSAGE_HEADER); @@ -811,7 +811,7 @@ static int oem_msg_callback(struct sk_buff *skb) if (nlh->nlmsg_len < NLMSG_LENGTH(sizeof(tAniMsgHdr) + msg_hdr->length)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Invalid nl msg len, nlh->nlmsg_len (%d), msg_hdr->len (%d)", __func__, nlh->nlmsg_len, msg_hdr->length); send_oem_err_rsp_nlink_msg(nlh->nlmsg_pid, @@ -822,7 +822,7 @@ static int oem_msg_callback(struct sk_buff *skb) switch (msg_hdr->type) { case ANI_MSG_APP_REG_REQ: /* Registration request is only allowed for Qualcomm Application */ - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Received App Req Req from App process pid(%d), len(%d)", __func__, nlh->nlmsg_pid, msg_hdr->length); @@ -830,7 +830,7 @@ static int oem_msg_callback(struct sk_buff *skb) if ((OEM_APP_SIGNATURE_LEN == msg_hdr->length) && (0 == strncmp(sign_str, OEM_APP_SIGNATURE_STR, OEM_APP_SIGNATURE_LEN))) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Valid App Req Req from oem app process pid(%d)", __func__, nlh->nlmsg_pid); @@ -838,7 +838,7 @@ static int oem_msg_callback(struct sk_buff *skb) p_hdd_ctx->oem_pid = nlh->nlmsg_pid; send_oem_reg_rsp_nlink_msg(); } else { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Invalid signature in App Reg Request from pid(%d)", __func__, nlh->nlmsg_pid); send_oem_err_rsp_nlink_msg(nlh->nlmsg_pid, @@ -848,14 +848,14 @@ static int oem_msg_callback(struct sk_buff *skb) break; case ANI_MSG_OEM_DATA_REQ: - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Received Oem Data Request length(%d) from pid: %d", __func__, msg_hdr->length, nlh->nlmsg_pid); if ((!p_hdd_ctx->oem_app_registered) || (nlh->nlmsg_pid != p_hdd_ctx->oem_pid)) { /* either oem app is not registered yet or pid is different */ - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: OEM DataReq: app not registered(%d) or incorrect pid(%d)", __func__, p_hdd_ctx->oem_app_registered, nlh->nlmsg_pid); @@ -865,7 +865,7 @@ static int oem_msg_callback(struct sk_buff *skb) } if ((!msg_hdr->length) || (OEM_DATA_REQ_SIZE < msg_hdr->length)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Invalid length (%d) in Oem Data Request", __func__, msg_hdr->length); send_oem_err_rsp_nlink_msg(nlh->nlmsg_pid, @@ -878,14 +878,14 @@ static int oem_msg_callback(struct sk_buff *skb) break; case ANI_MSG_CHANNEL_INFO_REQ: - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Received channel info request, num channel(%d) from pid: %d", __func__, msg_hdr->length, nlh->nlmsg_pid); if ((!p_hdd_ctx->oem_app_registered) || (nlh->nlmsg_pid != p_hdd_ctx->oem_pid)) { /* either oem app is not registered yet or pid is different */ - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Chan InfoReq: app not registered(%d) or incorrect pid(%d)", __func__, p_hdd_ctx->oem_app_registered, nlh->nlmsg_pid); @@ -897,7 +897,7 @@ static int oem_msg_callback(struct sk_buff *skb) /* message length contains list of channel ids */ if ((!msg_hdr->length) || (WNI_CFG_VALID_CHANNEL_LIST_LEN < msg_hdr->length)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Invalid length (%d) in channel info request", __func__, msg_hdr->length); send_oem_err_rsp_nlink_msg(nlh->nlmsg_pid, @@ -958,7 +958,7 @@ static int oem_msg_callback(struct sk_buff *skb) break; default: - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Received Invalid message type (%d), length (%d)", __func__, msg_hdr->type, msg_hdr->length); send_oem_err_rsp_nlink_msg(nlh->nlmsg_pid, diff --git a/core/hdd/src/wlan_hdd_p2p.c b/core/hdd/src/wlan_hdd_p2p.c index fb48f5f273..f38678d591 100644 --- a/core/hdd/src/wlan_hdd_p2p.c +++ b/core/hdd/src/wlan_hdd_p2p.c @@ -48,7 +48,7 @@ #include #include "wlan_hdd_tdls.h" #include "wlan_hdd_trace.h" -#include "cdf_types.h" +#include "qdf_types.h" #include "cdf_trace.h" #include "cds_sched.h" #include "cds_concurrency.h" @@ -400,7 +400,7 @@ void wlan_hdd_cancel_pending_roc(hdd_adapter_t *adapter) unsigned long rc; hdd_cfg80211_state_t *cfg_state = WLAN_HDD_GET_CFG_STATE_PTR(adapter); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: ROC completion is not received.!!!", __func__); @@ -438,7 +438,7 @@ wait: msecs_to_jiffies (WAIT_CANCEL_REM_CHAN)); if (!rc) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Timeout occurred while waiting for RoC Cancellation", __func__); @@ -472,7 +472,7 @@ void wlan_hdd_cleanup_remain_on_channel_ctx(hdd_adapter_t *pAdapter) mutex_lock(&cfgState->remain_on_chan_ctx_lock); while (pAdapter->is_roc_inprogress) { mutex_unlock(&cfgState->remain_on_chan_ctx_lock); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: ROC in progress for session %d!!!", __func__, pAdapter->sessionId); msleep(500); @@ -567,7 +567,7 @@ static int wlan_hdd_execute_remain_on_channel(hdd_adapter_t *pAdapter, /* Initialize Remain on chan timer */ qdf_status = cdf_mc_timer_init(&pRemainChanCtx->hdd_remain_on_chan_timer, - CDF_TIMER_TYPE_SW, + QDF_TIMER_TYPE_SW, wlan_hdd_remain_on_chan_timeout, pAdapter); if (qdf_status != QDF_STATUS_SUCCESS) { hddLog(CDF_TRACE_LEVEL_ERROR, @@ -673,7 +673,7 @@ static int wlan_hdd_execute_remain_on_channel(hdd_adapter_t *pAdapter, #endif (SIR_MAC_MGMT_FRAME << 2) | (SIR_MAC_MGMT_PROBE_REQ << 4), NULL, 0)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL("wlansap_register_mgmt_frame return fail")); wlansap_cancel_remain_on_channel( #ifdef WLAN_FEATURE_MBSSID @@ -949,12 +949,12 @@ int __wlan_hdd_cfg80211_remain_on_channel(struct wiphy *wiphy, if (0 != ret) return ret; - 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_REMAIN_ON_CHANNEL, pAdapter->sessionId, REMAIN_ON_CHANNEL_REQUEST)); @@ -1000,7 +1000,7 @@ void hdd_remain_chan_ready_handler(hdd_adapter_t *pAdapter, mutex_lock(&cfgState->remain_on_chan_ctx_lock); pRemainChanCtx = cfgState->remain_on_chan_ctx; if (pRemainChanCtx != NULL) { - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_REMAINCHANREADYHANDLER, pAdapter->sessionId, pRemainChanCtx->duration)); @@ -1094,7 +1094,7 @@ int __wlan_hdd_cfg80211_cancel_remain_on_channel(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; } @@ -1255,12 +1255,12 @@ int __wlan_hdd_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev, 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_ACTION, pAdapter->sessionId, pAdapter->device_mode)); status = wlan_hdd_validate_context(pHddCtx); @@ -1576,7 +1576,7 @@ send_frame: sme_send_action(WLAN_HDD_GET_HAL_CTX(pAdapter), sessionId, buf, len, extendedWait, noack, current_freq)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: sme_send_action returned fail", __func__); goto err; } @@ -1723,19 +1723,19 @@ int hdd_set_p2p_noa(struct net_device *dev, uint8_t *command) param = strnchr(command, strlen(command), ' '); if (param == NULL) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: strnchr failed to find delimeter", __func__); return -EINVAL; } param++; ret = sscanf(param, "%d %d %d", &count, &start_time, &duration); if (ret != 3) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: P2P_SET GO NoA: fail to read params, ret=%d", __func__, ret); return -EINVAL; } - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: P2P_SET GO NoA: count=%d start_time=%d duration=%d", __func__, count, start_time, duration); duration = MS_TO_MUS(duration); @@ -1758,7 +1758,7 @@ int hdd_set_p2p_noa(struct net_device *dev, uint8_t *command) NoA.count = count; NoA.sessionid = pAdapter->sessionId; - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: P2P_PS_ATTR:oppPS %d ctWindow %d duration %d " "interval %d count %d single noa duration %d " "PsSelection %x", __func__, NoA.opp_ps, @@ -1801,19 +1801,19 @@ int hdd_set_p2p_opps(struct net_device *dev, uint8_t *command) param = strnchr(command, strlen(command), ' '); if (param == NULL) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: strnchr failed to find delimiter", __func__); return -EINVAL; } param++; ret = sscanf(param, "%d %d %d", &legacy_ps, &opp_ps, &ctwindow); if (ret != 3) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: P2P_SET GO PS: fail to read params, ret=%d", __func__, ret); return -EINVAL; } - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: P2P_SET GO PS: legacy_ps=%d opp_ps=%d ctwindow=%d", __func__, legacy_ps, opp_ps, ctwindow); @@ -1831,7 +1831,7 @@ int hdd_set_p2p_opps(struct net_device *dev, uint8_t *command) */ if (ctwindow != -1) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "Opportunistic Power Save is %s", (true == pAdapter->ops) ? "Enable" : "Disable"); @@ -1849,7 +1849,7 @@ int hdd_set_p2p_opps(struct net_device *dev, uint8_t *command) P2P_POWER_SAVE_TYPE_OPPORTUNISTIC; NoA.sessionid = pAdapter->sessionId; - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: P2P_PS_ATTR:oppPS %d ctWindow %d duration %d " "interval %d count %d single noa duration %d " @@ -1878,7 +1878,7 @@ int hdd_set_p2p_opps(struct net_device *dev, uint8_t *command) NoA.psSelection = P2P_POWER_SAVE_TYPE_OPPORTUNISTIC; NoA.sessionid = pAdapter->sessionId; - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: P2P_PS_ATTR:oppPS %d ctWindow %d duration %d " "interval %d count %d single noa duration %d " "PsSelection %x", __func__, NoA.opp_ps, @@ -1952,7 +1952,7 @@ struct wireless_dev *__wlan_hdd_add_virtual_intf(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 ERR_PTR(-EINVAL); } @@ -1961,7 +1961,7 @@ struct wireless_dev *__wlan_hdd_add_virtual_intf(struct wiphy *wiphy, if (0 != ret) return ERR_PTR(ret); - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_ADD_VIRTUAL_INTF, NO_SESSION, type)); /* * Allow addition multiple interfaces for WLAN_HDD_P2P_GO, @@ -2004,7 +2004,7 @@ struct wireless_dev *__wlan_hdd_add_virtual_intf(struct wiphy *wiphy, * Generate the P2P Interface Address. this address must be * different from the P2P Device Address. */ - struct cdf_mac_addr p2pDeviceAddress = + struct qdf_mac_addr p2pDeviceAddress = pHddCtx->p2pDeviceAddress; p2pDeviceAddress.bytes[4] ^= 0x80; pAdapter = hdd_open_adapter(pHddCtx, @@ -2048,12 +2048,12 @@ int __wlan_hdd_del_virtual_intf(struct wiphy *wiphy, struct wireless_dev *wdev) int status; 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_DEL_VIRTUAL_INTF, pVirtAdapter->sessionId, pVirtAdapter->device_mode)); hddLog(LOG1, FL("Device_mode %s(%d)"), diff --git a/core/hdd/src/wlan_hdd_power.c b/core/hdd/src/wlan_hdd_power.c index 68e69c9f55..ff0cbc5e25 100644 --- a/core/hdd/src/wlan_hdd_power.c +++ b/core/hdd/src/wlan_hdd_power.c @@ -41,7 +41,7 @@ #if defined(WLAN_OPEN_SOURCE) && defined(CONFIG_HAS_WAKELOCK) #include #endif -#include "cdf_types.h" +#include "qdf_types.h" #include "sme_api.h" #include #include @@ -120,14 +120,14 @@ static void hdd_conf_gtk_offload(hdd_adapter_t *pAdapter, bool fenable) &hddGtkOffloadReqParams, pAdapter->sessionId); if (QDF_STATUS_SUCCESS != ret) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: sme_set_gtk_offload failed, returned %d", __func__, ret); return; } - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: sme_set_gtk_offload successfull", __func__); } @@ -146,13 +146,13 @@ static void hdd_conf_gtk_offload(hdd_adapter_t *pAdapter, bool fenable) wlan_hdd_cfg80211_update_replay_counter_callback, pAdapter, pAdapter->sessionId); if (QDF_STATUS_SUCCESS != ret) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: sme_get_gtk_offload failed, returned %d", __func__, ret); return; } else { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: sme_get_gtk_offload successful", __func__); @@ -169,13 +169,13 @@ static void hdd_conf_gtk_offload(hdd_adapter_t *pAdapter, bool fenable) &hddGtkOffloadReqParams, pAdapter->sessionId); if (QDF_STATUS_SUCCESS != ret) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: failed to dissable GTK offload, returned %d", __func__, ret); return; } - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: successfully dissabled GTK offload request to HAL", __func__); @@ -1097,7 +1097,7 @@ hdd_suspend_wlan(void (*callback)(void *callbackContext, bool suspended), hdd_info("%s: WLAN being suspended by OS", __func__); - pHddCtx = cds_get_context(CDF_MODULE_ID_HDD); + pHddCtx = cds_get_context(QDF_MODULE_ID_HDD); if (!pHddCtx) { hddLog(CDF_TRACE_LEVEL_FATAL, "%s: HDD context is Null", __func__); @@ -1154,7 +1154,7 @@ static void hdd_resume_wlan(void) hddLog(CDF_TRACE_LEVEL_INFO, "%s: WLAN being resumed by OS", __func__); - pHddCtx = cds_get_context(CDF_MODULE_ID_HDD); + pHddCtx = cds_get_context(QDF_MODULE_ID_HDD); if (!pHddCtx) { hddLog(CDF_TRACE_LEVEL_FATAL, "%s: HDD context is Null", __func__); @@ -1288,7 +1288,7 @@ QDF_STATUS hdd_wlan_shutdown(void) } /* Get the HDD context. */ - pHddCtx = cds_get_context(CDF_MODULE_ID_HDD); + pHddCtx = cds_get_context(QDF_MODULE_ID_HDD); if (!pHddCtx) { hddLog(CDF_TRACE_LEVEL_FATAL, "%s: HDD context is Null", __func__); @@ -1346,7 +1346,7 @@ QDF_STATUS hdd_wlan_shutdown(void) qdf_status = wma_stop(p_cds_context, HAL_STOP_TYPE_RF_KILL); 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 stop WMA", __func__); CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); wma_setneedshutdown(p_cds_context); @@ -1358,7 +1358,7 @@ QDF_STATUS hdd_wlan_shutdown(void) */ qdf_status = sme_stop(pHddCtx->hHal, HAL_STOP_TYPE_SYS_RESET); 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 stop sme %d", __func__, qdf_status); CDF_ASSERT(0); } @@ -1367,7 +1367,7 @@ QDF_STATUS hdd_wlan_shutdown(void) /* Stop MAC (PE and HAL) */ qdf_status = mac_stop(pHddCtx->hHal, HAL_STOP_TYPE_SYS_RESET); 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 stop mac %d", __func__, qdf_status); CDF_ASSERT(0); } @@ -1420,7 +1420,7 @@ QDF_STATUS hdd_wlan_re_init(void *hif_sc) } /* Get the HDD context */ - pHddCtx = cds_get_context(CDF_MODULE_ID_HDD); + pHddCtx = cds_get_context(QDF_MODULE_ID_HDD); if (!pHddCtx) { hddLog(CDF_TRACE_LEVEL_FATAL, "%s: HDD context is Null", __func__); @@ -1445,7 +1445,7 @@ QDF_STATUS hdd_wlan_re_init(void *hif_sc) } /* Save the hal context in Adapter */ - pHddCtx->hHal = cds_get_context(CDF_MODULE_ID_SME); + pHddCtx->hHal = cds_get_context(QDF_MODULE_ID_SME); if (NULL == pHddCtx->hHal) { hddLog(CDF_TRACE_LEVEL_FATAL, "%s: HAL context is null", __func__); @@ -1726,7 +1726,7 @@ static int __wlan_hdd_cfg80211_resume_wlan(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; } @@ -1752,7 +1752,7 @@ static int __wlan_hdd_cfg80211_resume_wlan(struct wiphy *wiphy) #endif hdd_resume_wlan(); - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_RESUME_WLAN, NO_SESSION, pHddCtx->isWiphySuspended)); cdf_spin_lock(&pHddCtx->sched_scan_lock); @@ -1862,7 +1862,7 @@ static int __wlan_hdd_cfg80211_suspend_wlan(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; } @@ -2015,7 +2015,7 @@ static int __wlan_hdd_cfg80211_suspend_wlan(struct wiphy *wiphy, } pHddCtx->is_ol_rx_thread_suspended = true; #endif - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_SUSPEND_WLAN, NO_SESSION, pHddCtx->isWiphySuspended)); pHddCtx->isWiphySuspended = true; @@ -2082,12 +2082,12 @@ static int __wlan_hdd_cfg80211_set_power_mgmt(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_POWER_MGMT, pAdapter->sessionId, timeout)); @@ -2169,18 +2169,18 @@ static int __wlan_hdd_cfg80211_set_txpower(struct wiphy *wiphy, { hdd_context_t *pHddCtx = (hdd_context_t *) wiphy_priv(wiphy); tHalHandle hHal = NULL; - 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; int status; 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_TXPOWER, NO_SESSION, type)); @@ -2267,7 +2267,7 @@ static int __wlan_hdd_cfg80211_get_txpower(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; } @@ -2284,7 +2284,7 @@ static int __wlan_hdd_cfg80211_get_txpower(struct wiphy *wiphy, return -ENOENT; } - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_GET_TXPOWER, pAdapter->sessionId, pAdapter->device_mode)); wlan_hdd_get_class_astats(pAdapter); diff --git a/core/hdd/src/wlan_hdd_scan.c b/core/hdd/src/wlan_hdd_scan.c index 48ba11ed2c..71a0e3e13e 100644 --- a/core/hdd/src/wlan_hdd_scan.c +++ b/core/hdd/src/wlan_hdd_scan.c @@ -408,7 +408,7 @@ static int hdd_indicate_scan_result(hdd_scan_info_t *scanInfo, * doesn't exceed IW_MAX_BITRATES */ - maxNumRates = CDF_MIN(maxNumRates, IW_MAX_BITRATES); + maxNumRates = QDF_MIN(maxNumRates, IW_MAX_BITRATES); if ((maxNumRates - numBasicRates) > MAX_RATES) { no_of_rates = MAX_RATES; @@ -473,7 +473,7 @@ static int hdd_indicate_scan_result(hdd_scan_info_t *scanInfo, event.cmd = IWEVQUAL; event.u.qual.qual = descriptor->rssi; event.u.qual.noise = descriptor->sinr; - event.u.qual.level = CDF_MIN((descriptor->rssi + descriptor->sinr), 0); + event.u.qual.level = QDF_MIN((descriptor->rssi + descriptor->sinr), 0); event.u.qual.updated = IW_QUAL_ALL_UPDATED; @@ -748,7 +748,7 @@ static int __iw_set_scan(struct net_device *dev, struct iw_request_info *info, /* set bssid using sockaddr from iw_scan_req */ cdf_mem_copy(scanRequest.bssid.bytes, &scanReq->bssid.sa_data, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); if (wrqu->data.flags & IW_SCAN_THIS_ESSID) { @@ -766,7 +766,7 @@ static int __iw_set_scan(struct net_device *dev, struct iw_request_info *info, scanReq->essid_len); } else { scanRequest.SSIDs.numOfSSIDs = 0; - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Unable to allocate memory", __func__); @@ -833,7 +833,7 @@ static int __iw_set_scan(struct net_device *dev, struct iw_request_info *info, pAdapter->sessionId, &scanRequest, &hdd_scan_request_callback, dev); if (!QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL, "%s:sme_scan_request fail %d!!!", __func__, status); goto error; } @@ -904,12 +904,12 @@ static int __iw_get_scan(struct net_device *dev, if (0 != ret) return ret; - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: enter buffer length %d!!!", __func__, (wrqu->data.length) ? wrqu->data.length : IW_SCAN_MAX_DATA); if (true == pAdapter->scan_info.mScanPending) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL, "%s:mScanPending is true !!!", __func__); return -EAGAIN; } @@ -945,7 +945,7 @@ static int __iw_get_scan(struct net_device *dev, sme_scan_result_purge(hHal, pResult); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: exit total %d BSS reported !!!", __func__, i); EXIT(); return status; @@ -1245,12 +1245,12 @@ static int __wlan_hdd_cfg80211_scan(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_SCAN, pAdapter->sessionId, request->n_channels)); @@ -2031,7 +2031,7 @@ static int __wlan_hdd_cfg80211_sched_scan_start(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; } @@ -2059,7 +2059,7 @@ static int __wlan_hdd_cfg80211_sched_scan_start(struct wiphy *wiphy, return -EBUSY; } - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_SCHED_SCAN_START, pAdapter->sessionId, pAdapter->device_mode)); /* @@ -2132,7 +2132,7 @@ static int __wlan_hdd_cfg80211_sched_scan_start(struct wiphy *wiphy, && (CHANNEL_STATE_DFS == cds_get_channel_state( channels_allowed[indx]))) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s : Dropping DFS channel : %d", __func__, @@ -2157,7 +2157,7 @@ static int __wlan_hdd_cfg80211_sched_scan_start(struct wiphy *wiphy, * then ignore the PNO request */ if (num_ignore_dfs_ch == request->n_channels) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s : All requested channels are DFS channels", __func__); ret = -EINVAL; @@ -2306,7 +2306,7 @@ static int __wlan_hdd_cfg80211_sched_scan_stop(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; } @@ -2355,7 +2355,7 @@ static int __wlan_hdd_cfg80211_sched_scan_stop(struct wiphy *wiphy, pPnoRequest->enable = 0; /* Disable PNO */ pPnoRequest->ucNetworksCount = 0; - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_SCHED_SCAN_STOP, pAdapter->sessionId, pAdapter->device_mode)); status = sme_set_preferred_network_list(hHal, pPnoRequest, diff --git a/core/hdd/src/wlan_hdd_softap_tx_rx.c b/core/hdd/src/wlan_hdd_softap_tx_rx.c index 1dddcd699c..e95a24e8b4 100644 --- a/core/hdd/src/wlan_hdd_softap_tx_rx.c +++ b/core/hdd/src/wlan_hdd_softap_tx_rx.c @@ -32,9 +32,9 @@ #include #include #include -#include +#include #include -#include +#include #include #include #include @@ -58,25 +58,25 @@ */ static void hdd_softap_dump_sk_buff(struct sk_buff *skb) { - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "%s: head = %p ", __func__, skb->head); - /* CDF_TRACE( CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,"%s: data = %p ", __func__, skb->data); */ - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + /* CDF_TRACE( QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,"%s: data = %p ", __func__, skb->data); */ + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "%s: tail = %p ", __func__, skb->tail); - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "%s: end = %p ", __func__, skb->end); - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "%s: len = %d ", __func__, skb->len); - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "%s: data_len = %d ", __func__, skb->data_len); - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "%s: mac_len = %d", __func__, skb->mac_len); - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x ", skb->data[0], skb->data[1], skb->data[2], skb->data[3], skb->data[4], skb->data[5], skb->data[6], skb->data[7]); - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x", skb->data[8], skb->data[9], skb->data[10], skb->data[11], skb->data[12], skb->data[13], skb->data[14], skb->data[15]); @@ -103,7 +103,7 @@ void hdd_softap_tx_resume_timer_expired_handler(void *adapter_context) hdd_adapter_t *pAdapter = (hdd_adapter_t *) adapter_context; if (!pAdapter) { - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "%s: INV ARG", __func__); /* INVALID ARG */ return; @@ -129,7 +129,7 @@ void hdd_softap_tx_resume_cb(void *adapter_context, bool tx_resume) hdd_adapter_t *pAdapter = (hdd_adapter_t *) adapter_context; if (!pAdapter) { - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "%s: INV ARG", __func__); /* INVALID ARG */ return; @@ -168,7 +168,7 @@ int hdd_softap_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) sme_ac_enum_type ac = SME_AC_BE; hdd_adapter_t *pAdapter = (hdd_adapter_t *) netdev_priv(dev); hdd_ap_ctx_t *pHddApCtx = WLAN_HDD_GET_AP_CTX_PTR(pAdapter); - struct cdf_mac_addr *pDestMacAddress; + struct qdf_mac_addr *pDestMacAddress; uint8_t STAId; uint8_t proto_type = 0; #ifdef QCA_PKT_PROTO_TRACE @@ -181,7 +181,7 @@ int hdd_softap_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) * lead to a crash. */ if (cds_is_driver_recovering()) { - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_INFO_HIGH, "%s: Recovery in Progress. Ignore!!!", __func__); goto drop_pkt; } @@ -198,7 +198,7 @@ int hdd_softap_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) goto drop_pkt; } - pDestMacAddress = (struct cdf_mac_addr *) skb->data; + pDestMacAddress = (struct qdf_mac_addr *) skb->data; if (cdf_is_macaddr_broadcast(pDestMacAddress) || cdf_is_macaddr_group(pDestMacAddress)) { @@ -211,19 +211,19 @@ int hdd_softap_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) if (QDF_STATUS_SUCCESS != hdd_softap_get_sta_id(pAdapter, pDestMacAddress, &STAId)) { - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_WARN, "%s: Failed to find right station", __func__); goto drop_pkt; } if (STAId == HDD_WLAN_INVALID_STA_ID) { - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_WARN, "%s: Failed to find right station", __func__); goto drop_pkt; } else if (false == pAdapter->aStaInfo[STAId].isUsed) { - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_WARN, "%s: STA %d is unregistered", __func__, STAId); @@ -234,14 +234,14 @@ int hdd_softap_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) pAdapter->aStaInfo[STAId].tlSTAState) && (ol_txrx_peer_state_auth != pAdapter->aStaInfo[STAId].tlSTAState)) { - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_WARN, "%s: Station not connected yet", __func__); goto drop_pkt; } else if (ol_txrx_peer_state_conn == pAdapter->aStaInfo[STAId].tlSTAState) { if (ntohs(skb->protocol) != HDD_ETHERTYPE_802_1_X) { - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_WARN, "%s: NON-EAPOL packet in non-Authenticated state", __func__); @@ -314,7 +314,7 @@ int hdd_softap_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) if (ol_tx_send_data_frame(STAId, skb, proto_type) != NULL) { - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_WARN, "%s: Failed to send packet to txrx for staid:%d", __func__, STAId); ++pAdapter->hdd_stats.hddTxRxStats.txXmitDroppedAC[ac]; @@ -358,7 +358,7 @@ static void __hdd_softap_tx_timeout(struct net_device *dev) DPTRACE(cdf_dp_trace(NULL, CDF_DP_TRACE_HDD_SOFTAP_TX_TIMEOUT, NULL, 0)); - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "%s: Transmission timeout occurred", __func__); /* Getting here implies we disabled the TX queues for too * long. Queues are disabled either because of disassociation @@ -368,7 +368,7 @@ static void __hdd_softap_tx_timeout(struct net_device *dev) */ hdd_ctx = WLAN_HDD_GET_CTX(adapter); if (cds_is_driver_recovering()) { - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "%s: Recovery in Progress. Ignore!!!", __func__); return; } @@ -436,11 +436,11 @@ QDF_STATUS hdd_softap_deinit_tx_rx(hdd_adapter_t *pAdapter) * QDF_STATUS_SUCCESS otherwise */ 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) { spin_lock_bh(&pAdapter->staInfo_lock); if (pAdapter->aStaInfo[STAId].isUsed) { - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "%s: Reinit station %d", __func__, STAId); spin_unlock_bh(&pAdapter->staInfo_lock); return QDF_STATUS_E_FAILURE; @@ -475,7 +475,7 @@ QDF_STATUS hdd_softap_deinit_tx_rx_sta(hdd_adapter_t *pAdapter, uint8_t STAId) if (false == pAdapter->aStaInfo[STAId].isUsed) { spin_unlock_bh(&pAdapter->staInfo_lock); - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "%s: Deinit station not inited %d", __func__, STAId); return QDF_STATUS_E_FAILURE; } @@ -514,14 +514,14 @@ QDF_STATUS hdd_softap_rx_packet_cbk(void *cds_context, /* Sanity check on inputs */ if ((NULL == cds_context) || (NULL == rxBuf)) { - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "%s: Null params being passed", __func__); return QDF_STATUS_E_FAILURE; } - pHddCtx = cds_get_context(CDF_MODULE_ID_HDD); + pHddCtx = cds_get_context(QDF_MODULE_ID_HDD); if (NULL == pHddCtx) { - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "%s: HDD context is Null", __func__); return QDF_STATUS_E_FAILURE; } @@ -543,7 +543,7 @@ QDF_STATUS hdd_softap_rx_packet_cbk(void *cds_context, if (skb->dev == NULL) { - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "%s: ERROR!!Invalid netdevice", __func__); return QDF_STATUS_E_FAILURE; } @@ -608,13 +608,13 @@ QDF_STATUS hdd_softap_deregister_sta(hdd_adapter_t *pAdapter, uint8_t staId) hdd_context_t *pHddCtx; if (NULL == pAdapter) { - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "%s: pAdapter is NULL", __func__); return QDF_STATUS_E_INVAL; } if (WLAN_HDD_ADAPTER_MAGIC != pAdapter->magic) { - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "%s: Invalid pAdapter magic", __func__); return QDF_STATUS_E_INVAL; } @@ -626,7 +626,7 @@ QDF_STATUS hdd_softap_deregister_sta(hdd_adapter_t *pAdapter, uint8_t staId) */ qdf_status = ol_txrx_clear_peer(staId); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "ol_txrx_clear_peer() failed to for staID %d. " "Status= %d [0x%08X]", staId, qdf_status, qdf_status); } @@ -661,7 +661,7 @@ 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 qdf_status = QDF_STATUS_E_FAILURE; @@ -672,7 +672,7 @@ QDF_STATUS hdd_softap_register_sta(hdd_adapter_t *pAdapter, * Clean up old entry if it is not cleaned up properly */ if (pAdapter->aStaInfo[staId].isUsed) { - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_INFO, "clean up old entry for STA %d", staId); hdd_softap_deregister_sta(pAdapter, staId); } @@ -688,7 +688,7 @@ QDF_STATUS hdd_softap_register_sta(hdd_adapter_t *pAdapter, pPeerMacAddress); staDesc.is_qos_enabled = fWmmEnabled; - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_INFO, "HDD SOFTAP register TL QoS_enabled=%d", staDesc.is_qos_enabled); @@ -697,7 +697,7 @@ QDF_STATUS hdd_softap_register_sta(hdd_adapter_t *pAdapter, ol_txrx_register_peer(hdd_softap_rx_packet_cbk, &staDesc); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "SOFTAP ol_txrx_register_peer() failed to register. Status= %d [0x%08X]", qdf_status, qdf_status); return qdf_status; @@ -713,7 +713,7 @@ QDF_STATUS hdd_softap_register_sta(hdd_adapter_t *pAdapter, pAdapter->aStaInfo[staId].isQosEnabled = fWmmEnabled; if (!fAuthRequired) { - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_INFO, "open/shared auth StaId= %d. Changing TL state to AUTHENTICATED at Join time", pAdapter->aStaInfo[staId].ucSTAId); @@ -727,7 +727,7 @@ QDF_STATUS hdd_softap_register_sta(hdd_adapter_t *pAdapter, pAdapter->sessionCtx.ap.uIsAuthenticated = true; } else { - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_INFO, "ULA auth StaId= %d. Changing TL state to CONNECTED at Join time", pAdapter->aStaInfo[staId].ucSTAId); @@ -760,8 +760,8 @@ QDF_STATUS hdd_softap_register_bc_sta(hdd_adapter_t *pAdapter, { QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); - struct cdf_mac_addr broadcastMacAddr = - CDF_MAC_ADDR_BROADCAST_INITIALIZER; + struct qdf_mac_addr broadcastMacAddr = + QDF_MAC_ADDR_BROADCAST_INITIALIZER; hdd_ap_ctx_t *pHddApCtx; pHddApCtx = WLAN_HDD_GET_AP_CTX_PTR(pAdapter); @@ -810,7 +810,7 @@ QDF_STATUS hdd_softap_stop_bss(hdd_adapter_t *pAdapter) * unloading */ if (cds_is_load_or_unload_in_progress()) { - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "%s: Loading_unloading in Progress, state: 0x%x. Ignore!!!", __func__, cds_get_driver_state()); return QDF_STATUS_E_PERM; @@ -819,7 +819,7 @@ QDF_STATUS hdd_softap_stop_bss(hdd_adapter_t *pAdapter) qdf_status = hdd_softap_deregister_bc_sta(pAdapter); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "%s: Failed to deregister BC sta Id %d", __func__, (WLAN_HDD_GET_AP_CTX_PTR(pAdapter))->uBCStaId); } @@ -829,7 +829,7 @@ QDF_STATUS hdd_softap_stop_bss(hdd_adapter_t *pAdapter) if (pAdapter->aStaInfo[staId].isUsed) { qdf_status = hdd_softap_deregister_sta(pAdapter, staId); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "%s: Failed to deregister sta Id %d", __func__, staId); @@ -848,19 +848,19 @@ QDF_STATUS hdd_softap_stop_bss(hdd_adapter_t *pAdapter) * Return: QDF_STATUS_SUCCESS on success, CDF_STATUS_E_* on error */ 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) { uint8_t ucSTAId = WLAN_MAX_STA_COUNT; QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_INFO, "%s: enter", __func__); if (QDF_STATUS_SUCCESS != hdd_softap_get_sta_id(pAdapter, pDestMacAddress, &ucSTAId)) { - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "%s: Failed to find right station", __func__); return QDF_STATUS_E_FAILURE; } @@ -868,7 +868,7 @@ QDF_STATUS hdd_softap_change_sta_state(hdd_adapter_t *pAdapter, if (false == cdf_is_macaddr_equal(&pAdapter->aStaInfo[ucSTAId].macAddrSTA, pDestMacAddress)) { - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "%s: Station MAC address does not matching", __func__); return QDF_STATUS_E_FAILURE; @@ -876,7 +876,7 @@ QDF_STATUS hdd_softap_change_sta_state(hdd_adapter_t *pAdapter, qdf_status = hdd_change_peer_state(pAdapter, ucSTAId, state, false); - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_INFO, "%s: change station to state %d succeed", __func__, state); if (QDF_STATUS_SUCCESS == qdf_status) { @@ -884,7 +884,7 @@ QDF_STATUS hdd_softap_change_sta_state(hdd_adapter_t *pAdapter, ol_txrx_peer_state_auth; } - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_INFO, "%s exit", __func__); return qdf_status; @@ -901,7 +901,7 @@ QDF_STATUS hdd_softap_change_sta_state(hdd_adapter_t *pAdapter, * not found */ QDF_STATUS hdd_softap_get_sta_id(hdd_adapter_t *pAdapter, - struct cdf_mac_addr *pMacAddress, + struct qdf_mac_addr *pMacAddress, uint8_t *staId) { uint8_t i; @@ -909,7 +909,7 @@ QDF_STATUS hdd_softap_get_sta_id(hdd_adapter_t *pAdapter, for (i = 0; i < WLAN_MAX_STA_COUNT; i++) { if (cdf_mem_compare (&pAdapter->aStaInfo[i].macAddrSTA, pMacAddress, - CDF_MAC_ADDR_SIZE) && pAdapter->aStaInfo[i].isUsed) { + QDF_MAC_ADDR_SIZE) && pAdapter->aStaInfo[i].isUsed) { *staId = i; return QDF_STATUS_SUCCESS; } diff --git a/core/hdd/src/wlan_hdd_stats.c b/core/hdd/src/wlan_hdd_stats.c index af723a434a..ad81149f51 100644 --- a/core/hdd/src/wlan_hdd_stats.c +++ b/core/hdd/src/wlan_hdd_stats.c @@ -261,7 +261,7 @@ static bool put_wifi_peer_info(tpSirWifiPeerInfo stats, stats->type) || nla_put(vendor_event, QCA_WLAN_VENDOR_ATTR_LL_STATS_PEER_INFO_MAC_ADDRESS, - CDF_MAC_ADDR_SIZE, &stats->peerMacAddress.bytes[0]) || + QDF_MAC_ADDR_SIZE, &stats->peerMacAddress.bytes[0]) || nla_put_u32(vendor_event, QCA_WLAN_VENDOR_ATTR_LL_STATS_PEER_INFO_CAPABILITIES, stats->capabilities) || @@ -385,7 +385,7 @@ static bool put_wifi_interface_info(tpSirWifiInterfaceInfo stats, stats->mode) || nla_put(vendor_event, QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_INFO_MAC_ADDR, - CDF_MAC_ADDR_SIZE, stats->macAddr.bytes) || + QDF_MAC_ADDR_SIZE, stats->macAddr.bytes) || nla_put_u32(vendor_event, QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_INFO_STATE, stats->state) || @@ -400,7 +400,7 @@ static bool put_wifi_interface_info(tpSirWifiInterfaceInfo stats, strlen(stats->ssid), stats->ssid) || nla_put(vendor_event, QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_INFO_BSSID, - CDF_MAC_ADDR_SIZE, stats->bssid.bytes) || + QDF_MAC_ADDR_SIZE, stats->bssid.bytes) || nla_put(vendor_event, QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_INFO_AP_COUNTRY_STR, WNI_CFG_COUNTRY_CODE_LEN, stats->apCountryStr) || @@ -1002,13 +1002,13 @@ static void wlan_hdd_cfg80211_link_layer_stats_callback(void *ctx, linkLayerStatsResults->ifaceId); if (NULL == pAdapter) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: vdev_id %d does not exist with host", __func__, linkLayerStatsResults->ifaceId); return; } - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Link Layer Indication indType: %d", __func__, indType); switch (indType) { @@ -1144,7 +1144,7 @@ __wlan_hdd_cfg80211_ll_stats_set(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; } @@ -1270,7 +1270,7 @@ __wlan_hdd_cfg80211_ll_stats_get(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; } @@ -1401,7 +1401,7 @@ __wlan_hdd_cfg80211_ll_stats_clear(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; } @@ -1546,7 +1546,7 @@ static int __wlan_hdd_cfg80211_stats_ext_request(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; } @@ -1607,7 +1607,7 @@ static void wlan_hdd_cfg80211_stats_ext_callback(void *ctx, status = wlan_hdd_validate_context(pHddCtx); if (0 != status) { - 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; } @@ -1615,7 +1615,7 @@ static void wlan_hdd_cfg80211_stats_ext_callback(void *ctx, pAdapter = hdd_get_adapter_by_vdev(pHddCtx, data->vdev_id); if (NULL == pAdapter) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: vdev_id %d does not exist with host", __func__, data->vdev_id); return; @@ -1630,7 +1630,7 @@ static void wlan_hdd_cfg80211_stats_ext_callback(void *ctx, GFP_KERNEL); if (!vendor_event) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: cfg80211_vendor_event_alloc failed", __func__); return; } @@ -1638,7 +1638,7 @@ static void wlan_hdd_cfg80211_stats_ext_callback(void *ctx, ret_val = nla_put_u32(vendor_event, QCA_WLAN_VENDOR_ATTR_IFINDEX, pAdapter->dev->ifindex); if (ret_val) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: QCA_WLAN_VENDOR_ATTR_IFINDEX put fail", __func__); kfree_skb(vendor_event); @@ -1650,7 +1650,7 @@ static void wlan_hdd_cfg80211_stats_ext_callback(void *ctx, data->event_data_len, data->event_data); if (ret_val) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: QCA_WLAN_VENDOR_ATTR_STATS_EXT put fail", __func__); kfree_skb(vendor_event); @@ -1723,7 +1723,7 @@ static int __wlan_hdd_cfg80211_get_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; } @@ -2161,7 +2161,7 @@ static int __wlan_hdd_cfg80211_get_station(struct wiphy *wiphy, sinfo->txrate.mcs, sinfo->txrate.flags, sinfo->tx_packets, sinfo->rx_packets); - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_GET_STA, pAdapter->sessionId, maxRate)); EXIT(); @@ -2234,7 +2234,7 @@ static int __wlan_hdd_cfg80211_dump_survey(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; } @@ -2272,7 +2272,7 @@ static int __wlan_hdd_cfg80211_dump_survey(struct wiphy *wiphy, wlan_hdd_get_snr(pAdapter, &snr); wlan_hdd_get_rssi(pAdapter, &rssi); - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_DUMP_SURVEY, pAdapter->sessionId, pAdapter->device_mode)); diff --git a/core/hdd/src/wlan_hdd_subnet_detect.c b/core/hdd/src/wlan_hdd_subnet_detect.c index 96d0377a5a..205865e159 100644 --- a/core/hdd/src/wlan_hdd_subnet_detect.c +++ b/core/hdd/src/wlan_hdd_subnet_detect.c @@ -46,15 +46,15 @@ static const struct nla_policy policy[QCA_WLAN_VENDOR_ATTR_GW_PARAM_CONFIG_MAX + 1] = { [PARAM_MAC_ADDR] = { .type = NLA_BINARY, - .len = CDF_MAC_ADDR_SIZE + .len = QDF_MAC_ADDR_SIZE }, [PARAM_IPV4_ADDR] = { .type = NLA_BINARY, - .len = CDF_IPV4_ADDR_SIZE + .len = QDF_IPV4_ADDR_SIZE }, [PARAM_IPV6_ADDR] = { .type = NLA_BINARY, - .len = CDF_IPV6_ADDR_SIZE + .len = QDF_IPV6_ADDR_SIZE } }; @@ -121,20 +121,20 @@ static int __wlan_hdd_cfg80211_set_gateway_params(struct wiphy *wiphy, return -EINVAL; } nla_memcpy(req.gw_mac_addr.bytes, tb[PARAM_MAC_ADDR], - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); /* req ipv4_addr_type and ipv6_addr_type are initially false due * to zeroing the struct */ if (tb[PARAM_IPV4_ADDR]) { nla_memcpy(req.ipv4_addr, tb[PARAM_IPV4_ADDR], - CDF_IPV4_ADDR_SIZE); + QDF_IPV4_ADDR_SIZE); req.ipv4_addr_type = true; } if (tb[PARAM_IPV6_ADDR]) { nla_memcpy(&req.ipv6_addr, tb[PARAM_IPV6_ADDR], - CDF_IPV6_ADDR_SIZE); + QDF_IPV6_ADDR_SIZE); req.ipv6_addr_type = true; } diff --git a/core/hdd/src/wlan_hdd_tdls.c b/core/hdd/src/wlan_hdd_tdls.c index cd6d9f7e7e..375e547ed5 100644 --- a/core/hdd/src/wlan_hdd_tdls.c +++ b/core/hdd/src/wlan_hdd_tdls.c @@ -196,7 +196,7 @@ void wlan_hdd_tdls_pre_setup_init_work(tdlsCtx_t *pHddTdlsCtx, hddTdlsPeer_t *curr_candidate) { if (!pHddTdlsCtx || !curr_candidate) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: either pHddTdlsCtx or curr_candidate is null", __func__); return; @@ -266,7 +266,7 @@ static void wlan_hdd_tdls_check_power_save_prohibited(hdd_adapter_t *pAdapter) hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); if ((NULL == pHddTdlsCtx) || (NULL == pHddCtx)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL("pHddCtx or pHddTdlsCtx points to NULL")); return; } @@ -293,7 +293,7 @@ static void wlan_hdd_tdls_check_power_save_prohibited(hdd_adapter_t *pAdapter) static void wlan_hdd_tdls_free_scan_request(tdls_scan_context_t *tdls_scan_ctx) { if (NULL == tdls_scan_ctx) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL("tdls_scan_ctx is NULL")); return; } @@ -325,7 +325,7 @@ static void wlan_hdd_tdls_discovery_timeout_peer_cb(void *userData) pHddTdlsCtx = (tdlsCtx_t *) userData; if ((NULL == pHddTdlsCtx) || (NULL == pHddTdlsCtx->pAdapter)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL("pHddTdlsCtx or pAdapter points to NULL")); return; } @@ -381,7 +381,7 @@ static void wlan_hdd_tdls_free_list(tdlsCtx_t *pHddTdlsCtx) struct list_head *pos, *q; if (NULL == pHddTdlsCtx) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL("pHddTdlsCtx is NULL")); return; } @@ -408,7 +408,7 @@ static void wlan_hdd_tdls_schedule_scan(struct work_struct *work) container_of(work, tdls_scan_context_t, tdls_scan_work.work); if (NULL == scan_ctx) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL("scan_ctx is NULL")); return; } @@ -584,7 +584,7 @@ int wlan_hdd_tdls_init(hdd_adapter_t *pAdapter) cdf_mem_zero(pHddTdlsCtx, sizeof(tdlsCtx_t)); cdf_mc_timer_init(&pHddTdlsCtx->peerDiscoveryTimeoutTimer, - CDF_TIMER_TYPE_SW, + QDF_TIMER_TYPE_SW, wlan_hdd_tdls_discovery_timeout_peer_cb, pHddTdlsCtx); @@ -624,7 +624,7 @@ int wlan_hdd_tdls_init(hdd_adapter_t *pAdapter) pHddCtx->tdlsConnInfo[staIdx].staId = 0; pHddCtx->tdlsConnInfo[staIdx].sessionId = 255; cdf_mem_zero(&pHddCtx->tdlsConnInfo[staIdx].peerMac, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); } pHddTdlsCtx->pAdapter = pAdapter; @@ -748,7 +748,7 @@ void wlan_hdd_tdls_exit(hdd_adapter_t *pAdapter) pHddCtx = WLAN_HDD_GET_CTX(pAdapter); if (!pHddCtx) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL("pHddCtx is NULL")); return; } @@ -972,19 +972,19 @@ void wlan_hdd_tdls_set_peer_link_status(hddTdlsPeer_t *curr_peer, int32_t res = 0; hdd_context_t *pHddCtx; if (curr_peer == NULL) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL("curr_peer is NULL")); return; } if (curr_peer->pHddTdlsCtx == NULL) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL("curr_peer->pHddTdlsCtx is NULL")); return; } pHddCtx = WLAN_HDD_GET_CTX(curr_peer->pHddTdlsCtx->pAdapter); if (0 != (wlan_hdd_validate_context(pHddCtx))) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL("pHddCtx is not valid")); return; } @@ -1041,13 +1041,13 @@ void wlan_hdd_tdls_set_link_status(hdd_adapter_t *pAdapter, hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); if (0 != (wlan_hdd_validate_context(pHddCtx))) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL("pHddCtx is not valid")); return; } curr_peer = wlan_hdd_tdls_find_peer(pAdapter, mac, true); if (curr_peer == NULL) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL("curr_peer is NULL")); return; } @@ -1943,7 +1943,7 @@ hddTdlsPeer_t *wlan_hdd_tdls_find_peer(hdd_adapter_t *pAdapter, list_for_each(pos, head) { curr_peer = list_entry(pos, hddTdlsPeer_t, node); if (!memcmp(mac, curr_peer->peerMac, 6)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "findTdlsPeer: found staId %d", curr_peer->staId); if (mutexLock) @@ -2081,7 +2081,7 @@ uint16_t wlan_hdd_tdls_connected_peers(hdd_adapter_t *pAdapter) hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); if (0 != (wlan_hdd_validate_context(pHddCtx))) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL("pHddCtx is not valid")); return 0; } @@ -2167,7 +2167,7 @@ void wlan_hdd_tdls_connection_callback(hdd_adapter_t *pAdapter) hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); if ((NULL == pHddCtx) || (NULL == pHddTdlsCtx)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL("pHddCtx or pHddTdlsCtx points to NULL")); return; } @@ -2201,7 +2201,7 @@ void wlan_hdd_tdls_disconnection_callback(hdd_adapter_t *pAdapter) hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); if ((NULL == pHddCtx) || (NULL == pHddTdlsCtx)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL("pHddCtx or pHddTdlsCtx points to NULL")); return; } @@ -2212,7 +2212,7 @@ void wlan_hdd_tdls_disconnection_callback(hdd_adapter_t *pAdapter) if (NULL == pHddTdlsCtx) { mutex_unlock(&pHddCtx->tdls_lock); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL("pHddTdlsCtx is NULL")); return; } @@ -2322,7 +2322,7 @@ static hddTdlsPeer_t *wlan_hdd_tdls_find_progress_peer(hdd_adapter_t *pAdapter, tdlsCtx_t *pHddTdlsCtx = WLAN_HDD_GET_TDLS_CTX_PTR(pAdapter);; if (NULL == pHddTdlsCtx) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL("pHddTdlsCtx is NULL")); return NULL; } @@ -2409,13 +2409,13 @@ static void __wlan_hdd_tdls_pre_setup(struct work_struct *work) ENTER(); if (NULL == pHddTdlsCtx) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL("pHddTdlsCtx is NULL")); return; } if (unlikely(TDLS_CTX_MAGIC != pHddTdlsCtx->magic)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: tdls magic number mis-match %u", __func__, pHddTdlsCtx->magic); return; @@ -2431,7 +2431,7 @@ static void __wlan_hdd_tdls_pre_setup(struct work_struct *work) curr_peer = pHddTdlsCtx->curr_candidate; if (NULL == curr_peer) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL("pHddCtx is not valid")); goto done; } @@ -2463,7 +2463,7 @@ static void __wlan_hdd_tdls_pre_setup(struct work_struct *work) if (false == curr_peer->isForcedPeer) { if (curr_peer->discovery_attempt >= pHddTdlsCtx->threshold_config.discovery_tries_n) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: discovery attempt (%d) reached max (%d) for peer " MAC_ADDRESS_STR ", ignore discovery trigger from fw", @@ -2865,7 +2865,7 @@ void wlan_hdd_tdls_indicate_teardown(hdd_adapter_t *pAdapter, hddTdlsPeer_t *curr_peer, uint16_t reason) { if (NULL == pAdapter || NULL == curr_peer) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL("parameters passed are invalid")); return; } @@ -2978,7 +2978,7 @@ int wlan_hdd_tdls_get_status(hdd_adapter_t *pAdapter, curr_peer = wlan_hdd_tdls_find_peer(pAdapter, mac, false); if (curr_peer == NULL) { mutex_unlock(&pHddCtx->tdls_lock); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL("curr_peer is NULL")); *state = QCA_WIFI_HAL_TDLS_DISABLED; *reason = eTDLS_LINK_UNSPECIFIED; @@ -3064,7 +3064,7 @@ __wlan_hdd_cfg80211_exttdls_get_status(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; } @@ -3192,7 +3192,7 @@ static int wlan_hdd_cfg80211_exttdls_callback(const uint8_t *mac, reason, state, global_operating_class, channel, MAC_ADDR_ARRAY(mac)); if (nla_put(skb, QCA_WLAN_VENDOR_ATTR_TDLS_STATE_MAC_ADDR, - CDF_MAC_ADDR_SIZE, mac) || + QDF_MAC_ADDR_SIZE, mac) || nla_put_u32(skb, QCA_WLAN_VENDOR_ATTR_TDLS_NEW_STATE, state) || nla_put_s32(skb, QCA_WLAN_VENDOR_ATTR_TDLS_STATE_REASON, @@ -3243,7 +3243,7 @@ __wlan_hdd_cfg80211_exttdls_enable(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; } @@ -3362,7 +3362,7 @@ static int __wlan_hdd_cfg80211_exttdls_disable(struct wiphy *wiphy, struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_TDLS_DISABLE_MAX + 1]; 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; } @@ -3501,7 +3501,7 @@ int wlan_hdd_tdls_add_station(struct wiphy *wiphy, but need to check if any other errno fit into this category. */ numCurrTdlsPeers = wlan_hdd_tdls_connected_peers(pAdapter); if (pHddCtx->max_num_tdls_sta <= numCurrTdlsPeers) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: " MAC_ADDRESS_STR " TDLS Max peer already connected. Request declined." " Num of peers (%d), Max allowed (%d).", @@ -3512,7 +3512,7 @@ int wlan_hdd_tdls_add_station(struct wiphy *wiphy, hddTdlsPeer_t *pTdlsPeer; pTdlsPeer = wlan_hdd_tdls_find_peer(pAdapter, mac, true); if (pTdlsPeer && TDLS_IS_CONNECTED(pTdlsPeer)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: " MAC_ADDRESS_STR " already connected. Request declined.", __func__, MAC_ADDR_ARRAY(mac)); @@ -3552,7 +3552,7 @@ int wlan_hdd_tdls_add_station(struct wiphy *wiphy, } { int i = 0; - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "Supported rates:"); for (i = 0; i < sizeof(StaParams->supported_rates); i++) hddLog(LOG1, "[%d]: %x ", i, @@ -3560,7 +3560,7 @@ int wlan_hdd_tdls_add_station(struct wiphy *wiphy, } } /* end debug code */ else if ((1 == update) && (NULL == StaParams)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s : update is true, but staParams is NULL. Error!", __func__); return -EPERM; @@ -3582,14 +3582,14 @@ int wlan_hdd_tdls_add_station(struct wiphy *wiphy, (WAIT_TIME_TDLS_ADD_STA)); if (!rc) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: timeout waiting for tdls add station indication", __func__); return -EPERM; } if (QDF_STATUS_SUCCESS != pAdapter->tdlsAddStaStatus) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Add Station is unsuccessful", __func__); return -EPERM; } @@ -3670,7 +3670,7 @@ static int __wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy, hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); hdd_context_t *pHddCtx = wiphy_priv(wiphy); hdd_station_ctx_t *hdd_sta_ctx; - u8 peerMac[CDF_MAC_ADDR_SIZE]; + u8 peerMac[QDF_MAC_ADDR_SIZE]; QDF_STATUS status; int max_sta_failed = 0; int responder; @@ -3683,17 +3683,17 @@ static int __wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy, #endif #endif - 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_TDLS_MGMT, pAdapter->sessionId, action_code)); if (0 != wlan_hdd_validate_context(pHddCtx)) { - 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; } @@ -3722,14 +3722,14 @@ static int __wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy, } /* If any concurrency is detected */ - if (((1 << CDF_STA_MODE) != pHddCtx->concurrency_mode) || - (pHddCtx->no_of_active_sessions[CDF_STA_MODE] > 1)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + if (((1 << QDF_STA_MODE) != pHddCtx->concurrency_mode) || + (pHddCtx->no_of_active_sessions[QDF_STA_MODE] > 1)) { + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "%s: Multiple STA OR Concurrency detected. Ignore TDLS MGMT frame. action_code=%d, concurrency_mode: 0x%x, active_sessions: %d", __func__, action_code, pHddCtx->concurrency_mode, - pHddCtx->no_of_active_sessions[CDF_STA_MODE]); + pHddCtx->no_of_active_sessions[QDF_STA_MODE]); return -EPERM; } /* other than teardown frame, mgmt frames are not sent if disabled */ @@ -3746,7 +3746,7 @@ static int __wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy, if (WLAN_IS_TDLS_SETUP_ACTION(action_code)) { if (NULL != wlan_hdd_tdls_is_progress(pHddCtx, peer, true)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: " MAC_ADDRESS_STR " TDLS setup is ongoing. action %d declined.", __func__, MAC_ADDR_ARRAY(peer), action_code); @@ -3763,7 +3763,7 @@ static int __wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy, check again in addtion to add_station(). Anyway, there is no hard to double-check. */ if (SIR_MAC_TDLS_SETUP_REQ == action_code) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: " MAC_ADDRESS_STR " TDLS Max peer already connected. action (%d) declined. Num of peers (%d), Max allowed (%d).", @@ -3775,7 +3775,7 @@ static int __wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy, /* maximum reached. tweak to send error code to peer and return error code to supplicant */ status_code = eSIR_MAC_UNSPEC_FAILURE_STATUS; - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: " MAC_ADDRESS_STR " TDLS Max peer already connected, send response status (%d). Num of peers (%d), Max allowed (%d).", @@ -3791,7 +3791,7 @@ static int __wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy, pTdlsPeer = wlan_hdd_tdls_find_peer(pAdapter, peer, true); if (pTdlsPeer && TDLS_IS_CONNECTED(pTdlsPeer)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s:" MAC_ADDRESS_STR " already connected. action %d declined.", @@ -3819,7 +3819,7 @@ static int __wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy, if (pTdlsPeer && TDLS_IS_CONNECTED(pTdlsPeer)) responder = pTdlsPeer->is_responder; else { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: " MAC_ADDRESS_STR " peer doesn't exist or not connected %d dialog_token %d status %d, len = %zu", __func__, MAC_ADDR_ARRAY(peer), @@ -3843,7 +3843,7 @@ static int __wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy, /* make sure doesn't call send_mgmt() while it is pending */ if (TDLS_CTX_MAGIC == pAdapter->mgmtTxCompletionStatus) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: " MAC_ADDRESS_STR " action %d couldn't sent, as one is pending. return EBUSY", __func__, MAC_ADDR_ARRAY(peer), action_code); @@ -3860,7 +3860,7 @@ static int __wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy, !responder); 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_send_tdls_mgmt_frame failed!", __func__); pAdapter->mgmtTxCompletionStatus = false; return -EINVAL; @@ -3882,7 +3882,7 @@ static int __wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy, msecs_to_jiffies(WAIT_TIME_TDLS_MGMT)); if ((0 == rc) || (true != pAdapter->mgmtTxCompletionStatus)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Mgmt Tx Completion timed out TxCompletion %u", __func__, pAdapter->mgmtTxCompletionStatus); @@ -4028,25 +4028,25 @@ int wlan_hdd_tdls_extctrl_config_peer(hdd_adapter_t *pAdapter, { hddTdlsPeer_t *pTdlsPeer; hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s : NL80211_TDLS_SETUP for " MAC_ADDRESS_STR, __func__, MAC_ADDR_ARRAY(peer)); if ((false == pHddCtx->config->fTDLSExternalControl) || (false == pHddCtx->config->fEnableTDLSImplicitTrigger)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s TDLS External control or Implicit Trigger not enabled ", __func__); return -ENOTSUPP; } pTdlsPeer = wlan_hdd_tdls_get_peer(pAdapter, peer); if (pTdlsPeer == NULL) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: peer " MAC_ADDRESS_STR " does not exist", __func__, MAC_ADDR_ARRAY(peer)); return -EINVAL; } if (0 != wlan_hdd_tdls_set_force_peer(pAdapter, peer, true)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s TDLS Add Force Peer Failed", __func__); return -EINVAL; } @@ -4070,13 +4070,13 @@ int wlan_hdd_tdls_extctrl_config_peer(hdd_adapter_t *pAdapter, if (0 != wlan_hdd_tdls_set_extctrl_param(pAdapter, peer, chan, max_latency, op_class, min_bandwidth)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s TDLS Set Peer's External Ctrl Parameter Failed", __func__); return -EINVAL; } if (0 != wlan_hdd_set_callback(pTdlsPeer, callback)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s TDLS set callback Failed", __func__); return -EINVAL; } @@ -4096,12 +4096,12 @@ int wlan_hdd_tdls_extctrl_deconfig_peer(hdd_adapter_t *pAdapter, { hddTdlsPeer_t *pTdlsPeer; hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s : NL80211_TDLS_TEARDOWN for " MAC_ADDRESS_STR, __func__, MAC_ADDR_ARRAY(peer)); if ((false == pHddCtx->config->fTDLSExternalControl) || (false == pHddCtx->config->fEnableTDLSImplicitTrigger)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s TDLS External control or Implicit Trigger not enabled ", __func__); return -ENOTSUPP; @@ -4117,7 +4117,7 @@ int wlan_hdd_tdls_extctrl_deconfig_peer(hdd_adapter_t *pAdapter, eSIR_MAC_TDLS_TEARDOWN_UNSPEC_REASON); } if (0 != wlan_hdd_tdls_set_force_peer(pAdapter, peer, false)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s Failed", __func__); return -EINVAL; } @@ -4131,7 +4131,7 @@ int wlan_hdd_tdls_extctrl_deconfig_peer(hdd_adapter_t *pAdapter, return -EINVAL; } if (0 != wlan_hdd_set_callback(pTdlsPeer, NULL)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s TDLS set callback Failed", __func__); return -EINVAL; } @@ -4162,16 +4162,16 @@ static int __wlan_hdd_cfg80211_tdls_oper(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_TDLS_OPER, pAdapter->sessionId, oper)); if (NULL == peer) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Invalid arguments", __func__); return -EINVAL; } @@ -4185,7 +4185,7 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy, * received from target, so HDD config gives combined intersected result */ if (false == pHddCtx->config->fEnableTDLSSupport) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "TDLS Disabled in INI OR not enabled in FW. " "Cannot process TDLS commands"); return -ENOTSUPP; @@ -4202,7 +4202,7 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy, wlan_hdd_tdls_find_peer(pAdapter, peer, true); if (NULL == pTdlsPeer) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: peer matching " MAC_ADDRESS_STR " not found, ignore NL80211_TDLS_ENABLE_LINK", @@ -4210,14 +4210,14 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy, return -EINVAL; } - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: NL80211_TDLS_ENABLE_LINK for peer " MAC_ADDRESS_STR " link_status: %d", __func__, MAC_ADDR_ARRAY(peer), pTdlsPeer->link_status); if (!TDLS_STA_INDEX_VALID(pTdlsPeer->staId)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: invalid sta index %u for " MAC_ADDRESS_STR @@ -4253,7 +4253,7 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy, msecs_to_jiffies (WAIT_TIME_TDLS_LINK_ESTABLISH_REQ)); if (!rc) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Link Establish Request timed out", __func__); @@ -4327,7 +4327,7 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy, CFG_TDLS_PREFERRED_OFF_CHANNEL_NUM_DEFAULT; } - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Peer " MAC_ADDRESS_STR "vdevId: %d, peerState: %d, isPeerResponder: %d, uapsdQueues: 0x%x, maxSp: 0x%x, peerBuffStaSupport: %d, peerOffChanSupport: %d, peerCurrOperClass: %d, selfCurrOperClass: %d, peerChanLen: %d, peerOperClassLen: %d, prefOffChanNum: %d, prefOffChanBandwidth: %d, op_class_for_pref_off_chan: %d", @@ -4390,7 +4390,7 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy, &smeTdlsPeerStateParams); if (QDF_STATUS_SUCCESS != cdf_ret_status) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: sme_update_tdls_peer_state failed for " MAC_ADDRESS_STR, @@ -4432,7 +4432,7 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy, wlan_hdd_tdls_find_peer(pAdapter, peer, true); if (NULL == pTdlsPeer) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: peer matching " MAC_ADDRESS_STR " not found, ignore NL80211_TDLS_DISABLE_LINK", @@ -4440,7 +4440,7 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy, return -EINVAL; } - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: NL80211_TDLS_DISABLE_LINK for peer " MAC_ADDRESS_STR " link_status: %d", __func__, MAC_ADDR_ARRAY(peer), @@ -4462,7 +4462,7 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy, msecs_to_jiffies (WAIT_TIME_TDLS_DEL_STA)); if (!rc) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Del station timed out", __func__); @@ -4475,7 +4475,7 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy, eTDLS_LINK_UNSPECIFIED : eTDLS_LINK_DROPPED_BY_REMOTE); } else { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: TDLS Peer Station doesn't exist.", __func__); @@ -4488,7 +4488,7 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy, wlan_hdd_tdls_extctrl_deconfig_peer(pAdapter, peer); if (0 != status) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Error in TDLS Teardown", __func__); @@ -4502,7 +4502,7 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy, peer, NULL, pHddCtx->config->fTDLSPrefOffChanNum, 0, 0, 0); if (0 != status) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Error in TDLS Setup", __func__); return status; @@ -4511,12 +4511,12 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy, break; case NL80211_TDLS_DISCOVERY_REQ: /* We don't support in-driver setup/teardown/discovery */ - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, "%s: We don't support in-driver setup/teardown/discovery", __func__); return -ENOTSUPP; default: - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: unsupported event", __func__); return -ENOTSUPP; } diff --git a/core/hdd/src/wlan_hdd_trace.c b/core/hdd/src/wlan_hdd_trace.c index a5cec605bd..41d51fb247 100644 --- a/core/hdd/src/wlan_hdd_trace.c +++ b/core/hdd/src/wlan_hdd_trace.c @@ -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. * @@ -35,7 +35,7 @@ */ #include "cdf_trace.h" -#include "cdf_types.h" +#include "qdf_types.h" #include "wlan_hdd_trace.h" #include "wlan_hdd_main.h" @@ -69,7 +69,7 @@ hdd_trace_dump(void *mac, tp_cdf_trace_record record, uint16_t index) */ void hdd_trace_init(void) { - cdf_trace_register(CDF_MODULE_ID_HDD, hdd_trace_dump); + cdf_trace_register(QDF_MODULE_ID_HDD, hdd_trace_dump); } #endif /* ifdef HDD_TRACE_RECORD */ diff --git a/core/hdd/src/wlan_hdd_tx_rx.c b/core/hdd/src/wlan_hdd_tx_rx.c index 3826d725c0..dc7565c661 100644 --- a/core/hdd/src/wlan_hdd_tx_rx.c +++ b/core/hdd/src/wlan_hdd_tx_rx.c @@ -159,7 +159,7 @@ void hdd_register_tx_flow_control(hdd_adapter_t *adapter, { if (adapter->tx_flow_timer_initialized == false) { cdf_mc_timer_init(&adapter->tx_flow_control_timer, - CDF_TIMER_TYPE_SW, + QDF_TIMER_TYPE_SW, timer_callback, adapter); adapter->tx_flow_timer_initialized = true; @@ -242,7 +242,7 @@ static bool wlan_hdd_is_eapol(struct sk_buff *skb) ether_type = (uint16_t)(*(uint16_t *) (skb->data + HDD_ETHERTYPE_802_1_X_FRAME_OFFSET)); - if (ether_type == CDF_SWAP_U16(HDD_ETHERTYPE_802_1_X)) + if (ether_type == QDF_SWAP_U16(HDD_ETHERTYPE_802_1_X)) return true; return false; @@ -271,8 +271,8 @@ static bool wlan_hdd_is_eapol_or_wai(struct sk_buff *skb) ether_type = (uint16_t)(*(uint16_t *) (skb->data + HDD_ETHERTYPE_802_1_X_FRAME_OFFSET)); - if (ether_type == CDF_SWAP_U16(HDD_ETHERTYPE_802_1_X) || - ether_type == CDF_SWAP_U16(HDD_ETHERTYPE_WAI)) + if (ether_type == QDF_SWAP_U16(HDD_ETHERTYPE_802_1_X) || + ether_type == QDF_SWAP_U16(HDD_ETHERTYPE_WAI)) return true; /* No error msg handled since this will happen often */ @@ -305,7 +305,7 @@ int hdd_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) #endif /* QCA_PKT_PROTO_TRACE */ #ifdef QCA_WIFI_FTM - if (hdd_get_conparam() == CDF_GLOBAL_FTM_MODE) { + if (hdd_get_conparam() == QDF_GLOBAL_FTM_MODE) { kfree_skb(skb); return NETDEV_TX_OK; } @@ -313,7 +313,7 @@ int hdd_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) ++pAdapter->hdd_stats.hddTxRxStats.txXmitCalled; if (cds_is_driver_recovering()) { - CDF_TRACE(CDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_WARN, "Recovery in progress, dropping the packet"); ++pAdapter->stats.tx_dropped; ++pAdapter->hdd_stats.hddTxRxStats.txXmitDropped; @@ -322,8 +322,8 @@ int hdd_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) } if (WLAN_HDD_IBSS == pAdapter->device_mode) { - struct cdf_mac_addr *pDestMacAddress = - (struct cdf_mac_addr *) skb->data; + struct qdf_mac_addr *pDestMacAddress = + (struct qdf_mac_addr *) skb->data; if (QDF_STATUS_SUCCESS != hdd_ibss_get_sta_id(&pAdapter->sessionCtx.station, @@ -334,11 +334,11 @@ int hdd_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) (cdf_is_macaddr_broadcast(pDestMacAddress) || cdf_is_macaddr_group(pDestMacAddress))) { STAId = pHddStaCtx->broadcast_ibss_staid; - CDF_TRACE(CDF_MODULE_ID_HDD_DATA, + CDF_TRACE(QDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_INFO_LOW, "%s: BC/MC packet", __func__); } else if (STAId == HDD_WLAN_INVALID_STA_ID) { - CDF_TRACE(CDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_WARN, "%s: Received Unicast frame with invalid staID", __func__); ++pAdapter->stats.tx_dropped; @@ -350,7 +350,7 @@ int hdd_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) if (WLAN_HDD_OCB != pAdapter->device_mode && eConnectionState_Associated != pHddStaCtx->conn_info.connState) { - CDF_TRACE(CDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_INFO, FL("Tx frame in not associated state in %d context"), pAdapter->device_mode); ++pAdapter->stats.tx_dropped; @@ -391,7 +391,7 @@ int hdd_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) ++pAdapter->hdd_stats.hddTxRxStats.txXmitClassifiedAC[ac]; #ifdef HDD_WMM_DEBUG - CDF_TRACE(CDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_FATAL, "%s: Classified as ac %d up %d", __func__, ac, up); #endif /* HDD_WMM_DEBUG */ @@ -491,7 +491,7 @@ int hdd_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) if (ol_tx_send_data_frame(STAId, (cdf_nbuf_t) skb, proto_type) != NULL) { - CDF_TRACE(CDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_WARN, "%s: Failed to send packet to txrx for staid:%d", __func__, STAId); goto drop_pkt; @@ -526,13 +526,13 @@ drop_pkt: */ QDF_STATUS hdd_ibss_get_sta_id(hdd_station_ctx_t *pHddStaCtx, - struct cdf_mac_addr *pMacAddress, uint8_t *staId) + struct qdf_mac_addr *pMacAddress, uint8_t *staId) { uint8_t idx; for (idx = 0; idx < MAX_IBSS_PEERS; idx++) { if (cdf_mem_compare(&pHddStaCtx->conn_info.peerMacAddress[idx], - pMacAddress, CDF_MAC_ADDR_SIZE)) { + pMacAddress, QDF_MAC_ADDR_SIZE)) { *staId = pHddStaCtx->conn_info.staId[idx]; return QDF_STATUS_SUCCESS; } @@ -556,7 +556,7 @@ static void __hdd_tx_timeout(struct net_device *dev) struct netdev_queue *txq; int i = 0; - CDF_TRACE(CDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_ERROR, "%s: Transmission timeout occurred jiffies %lu trans_start %lu", __func__, jiffies, dev->trans_start); DPTRACE(cdf_dp_trace(NULL, CDF_DP_TRACE_HDD_TX_TIMEOUT, @@ -571,12 +571,12 @@ static void __hdd_tx_timeout(struct net_device *dev) for (i = 0; i < NUM_TX_QUEUES; i++) { txq = netdev_get_tx_queue(dev, i); - CDF_TRACE(CDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_INFO, "Queue%d status: %d txq->trans_start %lu", i, netif_tx_queue_stopped(txq), txq->trans_start); } - CDF_TRACE(CDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_INFO, "carrier state: %d", netif_carrier_ok(dev)); } @@ -609,7 +609,7 @@ QDF_STATUS hdd_init_tx_rx(hdd_adapter_t *pAdapter) QDF_STATUS status = QDF_STATUS_SUCCESS; if (NULL == pAdapter) { - CDF_TRACE(CDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_ERROR, FL("pAdapter is NULL")); CDF_ASSERT(0); return QDF_STATUS_E_FAILURE; @@ -630,7 +630,7 @@ QDF_STATUS hdd_deinit_tx_rx(hdd_adapter_t *pAdapter) QDF_STATUS status = QDF_STATUS_SUCCESS; if (NULL == pAdapter) { - CDF_TRACE(CDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_ERROR, FL("pAdapter is NULL")); CDF_ASSERT(0); return QDF_STATUS_E_FAILURE; @@ -666,14 +666,14 @@ QDF_STATUS hdd_rx_packet_cbk(void *cds_context, cdf_nbuf_t rxBuf, uint8_t staId) /* Sanity check on inputs */ if ((NULL == cds_context) || (NULL == rxBuf)) { - CDF_TRACE(CDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_ERROR, "%s: Null params being passed", __func__); return QDF_STATUS_E_FAILURE; } - pHddCtx = cds_get_context(CDF_MODULE_ID_HDD); + pHddCtx = cds_get_context(QDF_MODULE_ID_HDD); if (NULL == pHddCtx) { - CDF_TRACE(CDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_ERROR, "%s: HDD context is Null", __func__); return QDF_STATUS_E_FAILURE; } @@ -690,7 +690,7 @@ QDF_STATUS hdd_rx_packet_cbk(void *cds_context, cdf_nbuf_t rxBuf, uint8_t staId) skb = (struct sk_buff *)rxBuf; if (WLAN_HDD_ADAPTER_MAGIC != pAdapter->magic) { - CDF_TRACE(CDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_FATAL, "Magic cookie(%x) for adapter sanity verification is invalid", pAdapter->magic); return QDF_STATUS_E_FAILURE; @@ -700,7 +700,7 @@ QDF_STATUS hdd_rx_packet_cbk(void *cds_context, cdf_nbuf_t rxBuf, uint8_t staId) if ((pHddStaCtx->conn_info.proxyARPService) && cfg80211_is_gratuitous_arp_unsolicited_na(skb)) { ++pAdapter->hdd_stats.hddTxRxStats.rxDropped[cpu_index]; - CDF_TRACE(CDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_INFO, "%s: Dropping HS 2.0 Gratuitous ARP or Unsolicited NA", __func__); /* Remove SKB from internal tracking table before submitting diff --git a/core/hdd/src/wlan_hdd_wext.c b/core/hdd/src/wlan_hdd_wext.c index ecb1fcfaf5..f710d2dd00 100644 --- a/core/hdd/src/wlan_hdd_wext.c +++ b/core/hdd/src/wlan_hdd_wext.c @@ -510,20 +510,20 @@ void *mem_alloc_copy_from_user_helper(const __user void *wrqu_data, size_t len) * (4096 bytes). So we use 4096 as the upper boundary for now. */ if (len > MAX_USER_COMMAND_SIZE) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "Invalid length"); return NULL; } ptr = kmalloc(len + 1, GFP_KERNEL); if (NULL == ptr) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "unable to allocate memory"); return NULL; } if (copy_from_user(ptr, wrqu_data, len)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); kfree(ptr); return NULL; @@ -738,7 +738,7 @@ void hdd_wlan_get_version(hdd_adapter_t *pAdapter, union iwreq_data *wrqu, pHddContext = WLAN_HDD_GET_CTX(pAdapter); if (!pHddContext) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s:Invalid context, HDD context is null", __func__); goto error; } @@ -789,7 +789,7 @@ int hdd_wlan_get_rts_threshold(hdd_adapter_t *pAdapter, union iwreq_data *wrqu) 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; } @@ -801,14 +801,14 @@ int hdd_wlan_get_rts_threshold(hdd_adapter_t *pAdapter, union iwreq_data *wrqu) if (QDF_STATUS_SUCCESS != sme_cfg_get_int(hHal, WNI_CFG_RTS_THRESHOLD, &threshold)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, FL ("failed to get ini parameter, WNI_CFG_RTS_THRESHOLD")); return -EIO; } wrqu->rts.value = threshold; - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, ("Rts-Threshold=%d!!"), wrqu->rts.value); EXIT(); @@ -836,7 +836,7 @@ int hdd_wlan_get_frag_threshold(hdd_adapter_t *pAdapter, 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; } @@ -848,14 +848,14 @@ int hdd_wlan_get_frag_threshold(hdd_adapter_t *pAdapter, if (sme_cfg_get_int(hHal, WNI_CFG_FRAGMENTATION_THRESHOLD, &threshold) != QDF_STATUS_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, FL ("failed to get ini parameter, WNI_CFG_FRAGMENTATION_THRESHOLD")); return -EIO; } wrqu->frag.value = threshold; - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, ("Frag-Threshold=%d!!"), wrqu->frag.value); EXIT(); @@ -881,7 +881,7 @@ int hdd_wlan_get_freq(uint32_t channel, uint32_t *pfreq) } } } - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, ("Invalid channel no=%d!!"), channel); return -EINVAL; } @@ -1330,7 +1330,7 @@ hdd_get_link_speed_cb(tSirLinkSpeedInfo *pLinkSpeed, void *pContext) * otherwise a CDF_STATUS_E_* error. */ QDF_STATUS wlan_hdd_get_linkspeed_for_peermac(hdd_adapter_t *pAdapter, - struct cdf_mac_addr macAddress) { + struct qdf_mac_addr macAddress) { QDF_STATUS status; unsigned long rc; struct linkspeedContext context; @@ -1342,7 +1342,7 @@ QDF_STATUS wlan_hdd_get_linkspeed_for_peermac(hdd_adapter_t *pAdapter, } linkspeed_req = cdf_mem_malloc(sizeof(*linkspeed_req)); if (NULL == linkspeed_req) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s Request Buffer Alloc Fail", __func__); return QDF_STATUS_E_NOMEM; } @@ -1419,7 +1419,7 @@ int wlan_hdd_get_link_speed(hdd_adapter_t *sta_adapter, uint32_t *link_speed) *link_speed = 0; } else { QDF_STATUS status; - struct cdf_mac_addr bssid; + struct qdf_mac_addr bssid; cdf_copy_macaddr(&bssid, &hdd_stactx->conn_info.bssId); @@ -1962,7 +1962,7 @@ static int __iw_set_freq(struct net_device *dev, struct iw_request_info *info, if (sme_cfg_get_str(hHal, WNI_CFG_VALID_CHANNEL_LIST, validChan, &numChans) != QDF_STATUS_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, FL + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, FL ("failed to get ini parameter, WNI_CFG_VALID_CHANNEL_LIST")); return -EIO; } @@ -2051,7 +2051,7 @@ static int __iw_get_freq(struct net_device *dev, struct iw_request_info *info, if (pHddStaCtx->conn_info.connState == eConnectionState_Associated) { if (sme_get_operation_channel(hHal, &channel, pAdapter->sessionId) != QDF_STATUS_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL("failed to get operating channel %u"), pAdapter->sessionId); return -EIO; @@ -2182,7 +2182,7 @@ static int __iw_set_tx_power(struct net_device *dev, if (sme_cfg_set_int(hHal, WNI_CFG_CURRENT_TX_POWER_LEVEL, wrqu->txpower.value) != QDF_STATUS_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL ("failed to set ini parameter, WNI_CFG_CURRENT_TX_POWER_LEVEL")); return -EIO; } @@ -2390,7 +2390,7 @@ static int __iw_set_bitrate(struct net_device *dev, } if (sme_cfg_set_int(WLAN_HDD_GET_HAL_CTX(pAdapter), WNI_CFG_FIXED_RATE, rate) != QDF_STATUS_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL ("failed to set ini parameter, WNI_CFG_FIXED_RATE")); return -EIO; } @@ -2456,7 +2456,7 @@ static int __iw_set_genie(struct net_device *dev, base_genie = mem_alloc_copy_from_user_helper(wrqu->data.pointer, wrqu->data.length); if (NULL == base_genie) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "mem_alloc_copy_from_user_helper fail"); return -ENOMEM; } @@ -2639,7 +2639,7 @@ static int __iw_get_genie(struct net_device *dev, status = csr_roam_get_wpa_rsn_req_ie(WLAN_HDD_GET_HAL_CTX(pAdapter), pAdapter->sessionId, &length, genIeBytes); - length = CDF_MIN((uint16_t) length, DOT11F_IE_RSN_MAX_LEN); + length = QDF_MIN((uint16_t) length, DOT11F_IE_RSN_MAX_LEN); if (wrqu->data.length < length) { hddLog(LOG1, "%s: failed to copy data to user buffer", __func__); @@ -2825,7 +2825,7 @@ static int __iw_set_rts_threshold(struct net_device *dev, if (sme_cfg_set_int(hHal, WNI_CFG_RTS_THRESHOLD, wrqu->rts.value) != QDF_STATUS_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL ("failed to set ini parameter, WNI_CFG_RTS_THRESHOLD")); return -EIO; } @@ -2955,7 +2955,7 @@ static int __iw_set_frag_threshold(struct net_device *dev, if (sme_cfg_set_int (hHal, WNI_CFG_FRAGMENTATION_THRESHOLD, wrqu->frag.value) != QDF_STATUS_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL ("failed to set ini parameter, WNI_CFG_FRAGMENTATION_THRESHOLD")); return -EIO; } @@ -3129,7 +3129,7 @@ static int __iw_get_range(struct net_device *dev, struct iw_request_info *info, if (sme_cfg_get_int(hHal, WNI_CFG_DOT11_MODE, &active_phy_mode) == QDF_STATUS_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "active_phy_mode = %d", active_phy_mode); if (active_phy_mode == WNI_CFG_DOT11_MODE_11A @@ -3191,7 +3191,7 @@ static int __iw_get_range(struct net_device *dev, struct iw_request_info *info, if (sme_cfg_get_str ((hHal), WNI_CFG_VALID_CHANNEL_LIST, channels, &num_channels) != QDF_STATUS_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, FL ("failed to get ini parameter, WNI_CFG_VALID_CHANNEL_LIST")); return -EIO; @@ -3771,7 +3771,7 @@ static int __iw_set_encode(struct net_device *dev, struct iw_request_info *info, } if (wrqu->data.flags & IW_ENCODE_DISABLED) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "****iwconfig wlan0 key off*****"); if (!fKeyPresent) { @@ -4071,7 +4071,7 @@ static int __iw_set_encodeext(struct net_device *dev, (IW_ENCODE_ALG_WEP == ext->alg)) { if (IW_AUTH_KEY_MGMT_802_1X == pWextState->authKeyMgmt) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, ("Invalid Configuration:%s"), __func__); return -EINVAL; } else { @@ -4112,7 +4112,7 @@ static int __iw_set_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); } /*For supplicant pae role is zero */ @@ -4179,7 +4179,7 @@ static int __iw_set_encodeext(struct net_device *dev, break; } - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, ("%s:cipher_alg:%d key_len[%d] *pEncryptionType :%d"), __func__, (int)ext->alg, (int)ext->key_len, setKey.encType); @@ -4206,7 +4206,7 @@ static int __iw_set_encodeext(struct net_device *dev, &setKey, &roamId); if (cdf_ret_status != QDF_STATUS_SUCCESS) { - 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__, cdf_ret_status); @@ -4265,7 +4265,7 @@ static int __iw_set_retry(struct net_device *dev, struct iw_request_info *info, if (wrqu->retry.value < WNI_CFG_LONG_RETRY_LIMIT_STAMIN || wrqu->retry.value > WNI_CFG_LONG_RETRY_LIMIT_STAMAX) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, ("Invalid Retry-Limit=%d!!"), wrqu->retry.value); return -EINVAL; @@ -4277,7 +4277,7 @@ static int __iw_set_retry(struct net_device *dev, struct iw_request_info *info, if (sme_cfg_set_int (hHal, WNI_CFG_LONG_RETRY_LIMIT, wrqu->retry.value) != QDF_STATUS_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL ("failed to set ini parameter, WNI_CFG_LONG_RETRY_LIMIT")); return -EIO; @@ -4286,7 +4286,7 @@ static int __iw_set_retry(struct net_device *dev, struct iw_request_info *info, if (sme_cfg_set_int (hHal, WNI_CFG_SHORT_RETRY_LIMIT, wrqu->retry.value) != QDF_STATUS_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL ("failed to set ini parameter, WNI_CFG_LONG_RETRY_LIMIT")); return -EIO; @@ -4296,7 +4296,7 @@ static int __iw_set_retry(struct net_device *dev, struct iw_request_info *info, return -EOPNOTSUPP; } - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, ("Set Retry-Limit=%d!!"), wrqu->retry.value); EXIT(); @@ -4356,7 +4356,7 @@ static int __iw_get_retry(struct net_device *dev, struct iw_request_info *info, if (sme_cfg_get_int(hHal, WNI_CFG_LONG_RETRY_LIMIT, &retry) != QDF_STATUS_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, FL ("failed to get ini parameter, WNI_CFG_LONG_RETRY_LIMIT")); return -EIO; @@ -4368,7 +4368,7 @@ static int __iw_get_retry(struct net_device *dev, struct iw_request_info *info, if (sme_cfg_get_int(hHal, WNI_CFG_SHORT_RETRY_LIMIT, &retry) != QDF_STATUS_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, FL ("failed to get ini parameter, WNI_CFG_LONG_RETRY_LIMIT")); return -EIO; @@ -4379,7 +4379,7 @@ static int __iw_get_retry(struct net_device *dev, struct iw_request_info *info, return -EOPNOTSUPP; } - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, ("Retry-Limit=%d!!"), + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, ("Retry-Limit=%d!!"), retry); EXIT(); @@ -4573,7 +4573,7 @@ int wlan_hdd_update_phymode(struct net_device *net, tHalHandle hal, } vhtchanwidth = phddctx->config->vhtChannelWidth; - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, ("ch_bond24=%d " + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, ("ch_bond24=%d " "ch_bond5g=%d band_24=%d band_5g=%d VHT_ch_width=%u"), ch_bond24, ch_bond5g, band_24, band_5g, vhtchanwidth); @@ -4808,7 +4808,7 @@ int wlan_hdd_update_phymode(struct net_device *net, tHalHandle hal, smeconfig.csrConfig.channelBondingMode5GHz; phddctx->config->vhtChannelWidth = vhtchanwidth; if (hdd_update_config_dat(phddctx) == false) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: could not update config_dat", __func__); return -EIO; } @@ -4819,7 +4819,7 @@ int wlan_hdd_update_phymode(struct net_device *net, tHalHandle hal, phddctx->wiphy->bands[IEEE80211_BAND_5GHZ]->ht_cap.cap &= ~IEEE80211_HT_CAP_SUP_WIDTH_20_40; - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, "New_Phymode= %d ch_bonding=%d band=%d VHT_ch_width=%u", phymode, chwidth, curr_band, vhtchanwidth); } @@ -4957,7 +4957,7 @@ static int __iw_setint_getnone(struct net_device *dev, smeConfig.csrConfig.Is11dSupportEnabled = (bool) set_value; - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, ("11D state=%d!!"), smeConfig.csrConfig. @@ -5033,7 +5033,7 @@ static int __iw_setint_getnone(struct net_device *dev, } else if (sme_cfg_set_int(hHal, WNI_CFG_ASSOC_STA_LIMIT, set_value) != QDF_STATUS_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL ("failed to set ini parameter, WNI_CFG_ASSOC_STA_LIMIT")); ret = -EIO; @@ -5070,7 +5070,7 @@ static int __iw_setint_getnone(struct net_device *dev, } case WE_SET_TX_POWER: { - struct cdf_mac_addr bssid; + struct qdf_mac_addr bssid; cdf_copy_macaddr(&bssid, &pHddStaCtx->conn_info.bssId); if (sme_set_tx_power @@ -5085,8 +5085,8 @@ static int __iw_setint_getnone(struct net_device *dev, } case WE_SET_MAX_TX_POWER: { - struct cdf_mac_addr bssid; - struct cdf_mac_addr selfMac; + struct qdf_mac_addr bssid; + struct qdf_mac_addr selfMac; hddLog(CDF_TRACE_LEVEL_INFO, "%s: Setting maximum tx power %d dBm", __func__, @@ -5273,7 +5273,7 @@ static int __iw_setint_getnone(struct net_device *dev, /* get the HT capability info */ ret = sme_cfg_get_int(hHal, WNI_CFG_HT_CAP_INFO, &value); if (QDF_STATUS_SUCCESS != ret) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: could not get HT capability info", __func__); @@ -5292,7 +5292,7 @@ static int __iw_setint_getnone(struct net_device *dev, } if (ret) - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "Failed to set LDPC value"); @@ -5311,7 +5311,7 @@ static int __iw_setint_getnone(struct net_device *dev, /* get the HT capability info */ ret = sme_cfg_get_int(hHal, WNI_CFG_HT_CAP_INFO, &value); if (QDF_STATUS_SUCCESS != ret) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: could not get HT capability info", __func__); @@ -5329,7 +5329,7 @@ static int __iw_setint_getnone(struct net_device *dev, } if (ret) - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "Failed to set TX STBC value"); @@ -5349,7 +5349,7 @@ static int __iw_setint_getnone(struct net_device *dev, /* get the HT capability info */ ret = sme_cfg_get_int(hHal, WNI_CFG_HT_CAP_INFO, &value); if (QDF_STATUS_SUCCESS != ret) { - CDF_TRACE(CDF_MODULE_ID_CDF, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: could not get HT capability info", __func__); @@ -5369,7 +5369,7 @@ static int __iw_setint_getnone(struct net_device *dev, } if (ret) - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "Failed to set RX STBC value"); break; @@ -5382,7 +5382,7 @@ static int __iw_setint_getnone(struct net_device *dev, WNI_CFG_HT_CAP_INFO_SHORT_GI_20MHZ, set_value); if (ret) - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "Failed to set ShortGI value"); break; @@ -6185,7 +6185,7 @@ static int __iw_setchar_getnone(struct net_device *dev, struct iw_point s_priv_data; 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; } @@ -6212,23 +6212,23 @@ static int __iw_setchar_getnone(struct net_device *dev, pBuffer = mem_alloc_copy_from_user_helper(s_priv_data.pointer, s_priv_data.length); if (NULL == pBuffer) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "mem_alloc_copy_from_user_helper fail"); return -ENOMEM; } - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Received length %d", __func__, s_priv_data.length); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Received data %s", __func__, pBuffer); switch (sub_cmd) { case WE_WOWL_ADD_PTRN: - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "ADD_PTRN"); + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "ADD_PTRN"); hdd_add_wowl_ptrn(pAdapter, pBuffer); break; case WE_WOWL_DEL_PTRN: - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "DEL_PTRN"); + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "DEL_PTRN"); hdd_del_wowl_ptrn(pAdapter, pBuffer); break; #if defined WLAN_FEATURE_VOWIFI @@ -6238,7 +6238,7 @@ static int __iw_setchar_getnone(struct net_device *dev, tRrmNeighborRspCallbackInfo callbackInfo; if (pConfig->fRrmEnable) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "Neighbor Request"); neighborReq.no_ssid = @@ -6340,14 +6340,14 @@ static int __iw_setnone_getint(struct net_device *dev, *value = smeConfig.csrConfig.Is11dSupportEnabled; - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, ("11D state=%d!!"), *value); break; } case WE_IBSS_STATUS: - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "****Return IBSS Status*****"); break; @@ -6362,7 +6362,7 @@ static int __iw_setnone_getint(struct net_device *dev, if (sme_cfg_get_int (hHal, WNI_CFG_ASSOC_STA_LIMIT, (uint32_t *) value) != QDF_STATUS_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, FL ("failed to get ini parameter, WNI_CFG_ASSOC_STA_LIMIT")); ret = -EIO; @@ -6378,7 +6378,7 @@ static int __iw_setnone_getint(struct net_device *dev, { *value = cds_get_concurrency_mode(); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, ("concurrency mode=%d"), *value); break; } @@ -7118,7 +7118,7 @@ static int __iw_get_char_setnone(struct net_device *dev, case WE_GET_CFG: { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Printing CLD global INI Config", __func__); hdd_cfg_get_global_config(WLAN_HDD_GET_CTX(pAdapter), @@ -7293,7 +7293,7 @@ static int __iw_get_char_setnone(struct net_device *dev, phymode = sme_get_phy_mode(hal); if ((QDF_STATUS_SUCCESS != sme_get_freq_band(hal, &currBand))) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Failed to get current band config", __func__); @@ -7919,9 +7919,9 @@ static int __iw_set_var_ints_getnone(struct net_device *dev, msg.reserved = 0; msg.bodyptr = unitTestArgs; if (QDF_STATUS_SUCCESS != - cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { + cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) { cdf_mem_free(unitTestArgs); - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL ("Not able to post UNIT_TEST_CMD message to WMA")); @@ -7981,7 +7981,7 @@ static int iw_hdd_set_var_ints_getnone(struct net_device *dev, int ret, num_args; 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; } @@ -8152,7 +8152,7 @@ static int __iw_add_tspec(struct net_device *dev, struct iw_request_info *info, return 0; } - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "%s:TS_INFO PSB %d UP %d !!!", __func__, tSpec.ts_info.psb, tSpec.ts_info.up); @@ -8425,7 +8425,7 @@ static int __iw_set_host_offload(struct net_device *dev, return ret; if (!hdd_conn_is_connected(WLAN_HDD_GET_STATION_CTX_PTR(pAdapter))) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL, "%s:LOGP dev is not in CONNECTED state, ignore!!!", __func__); return -EINVAL; @@ -8745,7 +8745,7 @@ static int __iw_set_packet_filter_params(struct net_device *dev, struct pkt_filter_cfg *request = NULL; 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; } @@ -9282,19 +9282,19 @@ int hdd_set_band(struct net_device *dev, u8 ui_band) band = eCSR_BAND_MAX; } - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: change band to %u", __func__, band); if (band == eCSR_BAND_MAX) { /* Received change band request with invalid band value */ - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Invalid band value %u", __func__, ui_band); return -EINVAL; } if ((band == eCSR_BAND_24 && pHddCtx->config->nBandCapability == 2) || (band == eCSR_BAND_5G && pHddCtx->config->nBandCapability == 1)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: band value %u violate INI settings %u", __func__, band, pHddCtx->config->nBandCapability); return -EIO; @@ -9308,7 +9308,7 @@ int hdd_set_band(struct net_device *dev, u8 ui_band) } if (QDF_STATUS_SUCCESS != sme_get_freq_band(hHal, &currBand)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Failed to get current band config", __func__); return -EIO; } @@ -9318,7 +9318,7 @@ int hdd_set_band(struct net_device *dev, u8 ui_band) * Abort pending scan requests, flush the existing scan results, * and change the band capability */ - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Current band value = %u, new setting %u ", __func__, currBand, band); @@ -9388,7 +9388,7 @@ int hdd_set_band(struct net_device *dev, u8 ui_band) if (QDF_STATUS_SUCCESS != sme_set_freq_band(hHal, pAdapter->sessionId, band)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL, FL("Failed to set the band value to %u"), band); return -EINVAL; @@ -9423,7 +9423,7 @@ static int __iw_set_band_config(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; } @@ -10692,9 +10692,9 @@ static const struct iw_priv_args we_private_args[] = { }; const struct iw_handler_def we_handler_def = { - .num_standard = CDF_ARRAY_SIZE(we_handler), - .num_private = CDF_ARRAY_SIZE(we_private), - .num_private_args = CDF_ARRAY_SIZE(we_private_args), + .num_standard = QDF_ARRAY_SIZE(we_handler), + .num_private = QDF_ARRAY_SIZE(we_private), + .num_private_args = QDF_ARRAY_SIZE(we_private_args), .standard = (iw_handler *) we_handler, .private = (iw_handler *) we_private, @@ -10765,19 +10765,19 @@ int hdd_register_wext(struct net_device *dev) if (!QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, ("ERROR: hdd_set_wext failed!!")); return QDF_STATUS_E_FAILURE; } if (!QDF_IS_STATUS_SUCCESS(qdf_event_create(&pwextBuf->hdd_cdf_event))) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, ("ERROR: HDD cdf event init failed!!")); return QDF_STATUS_E_FAILURE; } if (!QDF_IS_STATUS_SUCCESS(qdf_event_create(&pwextBuf->scanevent))) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, ("ERROR: HDD scan event init failed!!")); return QDF_STATUS_E_FAILURE; } diff --git a/core/hdd/src/wlan_hdd_wmm.c b/core/hdd/src/wlan_hdd_wmm.c index 3cbff02210..8f9dc21e98 100644 --- a/core/hdd/src/wlan_hdd_wmm.c +++ b/core/hdd/src/wlan_hdd_wmm.c @@ -166,7 +166,7 @@ static void hdd_wmm_enable_tl_uapsd(hdd_wmm_qos_context_t *pQosContext) /* The TSPEC must be valid */ if (pAc->wmmAcTspecValid == false) { - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: Invoked with invalid TSPEC", __func__); return; } @@ -178,7 +178,7 @@ static void hdd_wmm_enable_tl_uapsd(hdd_wmm_qos_context_t *pQosContext) } else { /* no service interval is present in the TSPEC */ /* this is OK, there just won't be U-APSD */ - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: No service interval supplied", __func__); service_interval = 0; } @@ -194,7 +194,7 @@ static void hdd_wmm_enable_tl_uapsd(hdd_wmm_qos_context_t *pQosContext) (pAc->wmmAcUapsdSuspensionInterval == suspension_interval) && (pAc->wmmAcUapsdDirection == direction) && (pAc->wmmAcIsUapsdEnabled == psb)) { - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: No change in U-APSD parameters", __func__); return; } @@ -210,7 +210,7 @@ static void hdd_wmm_enable_tl_uapsd(hdd_wmm_qos_context_t *pQosContext) pHddCtx->config->DelayedTriggerFrmInt); if (!QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: Failed to enable U-APSD for AC=%d", __func__, acType); return; @@ -222,7 +222,7 @@ static void hdd_wmm_enable_tl_uapsd(hdd_wmm_qos_context_t *pQosContext) pAc->wmmAcUapsdDirection = direction; pAc->wmmAcIsUapsdEnabled = psb; - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: Enabled UAPSD in TL srv_int=%d " "susp_int=%d dir=%d AC=%d", __func__, @@ -255,13 +255,13 @@ static void hdd_wmm_disable_tl_uapsd(hdd_wmm_qos_context_t *pQosContext) acType, pAdapter->sessionId); if (!QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: Failed to disable U-APSD for AC=%d", __func__, acType); } else { /* TL no longer has valid UAPSD info */ pAc->wmmAcUapsdInfoValid = false; - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: Disabled UAPSD in TL for AC=%d", __func__, acType); } @@ -281,7 +281,7 @@ static void hdd_wmm_free_context(hdd_wmm_qos_context_t *pQosContext) { hdd_adapter_t *pAdapter; - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Entered, context %p", __func__, pQosContext); if (unlikely((NULL == pQosContext) || @@ -325,12 +325,12 @@ static void hdd_wmm_notify_app(hdd_wmm_qos_context_t *pQosContext) union iwreq_data wrqu; char buf[MAX_NOTIFY_LEN + 1]; - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Entered, context %p", __func__, pQosContext); if (unlikely((NULL == pQosContext) || (HDD_WMM_CTX_MAGIC != pQosContext->magic))) { - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: Invalid QoS Context", __func__); return; } @@ -350,7 +350,7 @@ static void hdd_wmm_notify_app(hdd_wmm_qos_context_t *pQosContext) pAdapter = pQosContext->pAdapter; /* send the event */ - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: Sending [%s]", __func__, buf); wireless_send_event(pAdapter->dev, IWEVCUSTOM, &wrqu, buf); } @@ -388,7 +388,7 @@ static void hdd_wmm_inactivity_timer_cb(void *user_data) pAdapter->hdd_stats.hddTxRxStats.txXmitClassifiedAC[pQosContext-> acType]; - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, FL( "WMM inactivity Timer for AC=%d, currentCnt=%d, prevCnt=%d" ), @@ -396,7 +396,7 @@ static void hdd_wmm_inactivity_timer_cb(void *user_data) if (pAc->wmmPrevTrafficCnt == currentTrafficCnt) { /* there is no traffic activity, delete the TSPEC for this AC */ status = hdd_wmm_delts(pAdapter, pQosContext->handle); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, FL( "Deleted TS on AC %d, due to inactivity with status = %d!!!" ), @@ -409,7 +409,7 @@ static void hdd_wmm_inactivity_timer_cb(void *user_data) cdf_mc_timer_start(&pAc->wmmInactivityTimer, pAc->wmmInactivityTime); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL( "Restarting inactivity timer failed on AC %d" @@ -452,11 +452,11 @@ hdd_wmm_enable_inactivity_timer(hdd_wmm_qos_context_t *pQosContext, pAc = &pAdapter->hddWmmStatus.wmmAcStatus[acType]; qdf_status = cdf_mc_timer_init(&pAc->wmmInactivityTimer, - CDF_TIMER_TYPE_SW, + QDF_TIMER_TYPE_SW, hdd_wmm_inactivity_timer_cb, pQosContext); 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, FL("Initializing inactivity timer failed on AC %d"), acType); return qdf_status; @@ -465,7 +465,7 @@ hdd_wmm_enable_inactivity_timer(hdd_wmm_qos_context_t *pQosContext, qdf_status = cdf_mc_timer_start(&pAc->wmmInactivityTimer, inactivityTime); 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, FL("Starting inactivity timer failed on AC %d"), acType); qdf_status = cdf_mc_timer_destroy(&pAc->wmmInactivityTimer); @@ -549,12 +549,12 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, sme_ac_enum_type acType; hdd_wmm_ac_status_t *pAc; - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Entered, context %p", __func__, pQosContext); if (unlikely((NULL == pQosContext) || (HDD_WMM_CTX_MAGIC != pQosContext->magic))) { - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: Invalid QoS Context", __func__); return QDF_STATUS_E_FAILURE; } @@ -563,14 +563,14 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, acType = pQosContext->acType; pAc = &pAdapter->hddWmmStatus.wmmAcStatus[acType]; - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: status %d flowid %d info %p", __func__, smeStatus, qosFlowId, pCurrentQosInfo); switch (smeStatus) { case SME_QOS_STATUS_SETUP_SUCCESS_IND: - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Setup is complete", __func__); /* there will always be a TSPEC returned with this @@ -588,7 +588,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, if (HDD_WMM_HANDLE_IMPLICIT != pQosContext->handle) { - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: Explicit Qos, notifying user space", __func__); @@ -601,7 +601,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, #ifdef FEATURE_WLAN_ESE /* Check if the inactivity interval is specified */ if (pCurrentQosInfo && pCurrentQosInfo->inactivity_interval) { - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: Inactivity timer value = %d for AC=%d", __func__, pCurrentQosInfo->inactivity_interval, acType); @@ -617,7 +617,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, break; case SME_QOS_STATUS_SETUP_SUCCESS_APSD_SET_ALREADY: - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: Setup is complete (U-APSD set previously)", __func__); @@ -627,7 +627,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, if (HDD_WMM_HANDLE_IMPLICIT != pQosContext->handle) { - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: Explicit Qos, notifying user space", __func__); @@ -640,7 +640,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, break; case SME_QOS_STATUS_SETUP_FAILURE_RSP: - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: Setup failed", __func__); /* QoS setup failed */ @@ -649,7 +649,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, pAc->wmmAcAccessAllowed = false; if (HDD_WMM_HANDLE_IMPLICIT != pQosContext->handle) { - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: Explicit Qos, notifying user space", __func__); @@ -672,7 +672,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, break; case SME_QOS_STATUS_SETUP_INVALID_PARAMS_RSP: - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: Setup Invalid Params, notify TL", __func__); /* QoS setup failed */ pAc->wmmAcAccessAllowed = false; @@ -689,7 +689,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, pAc->wmmAcAccessAllowed = true; } else { - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: Explicit Qos, notifying user space", __func__); @@ -701,10 +701,10 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, break; case SME_QOS_STATUS_SETUP_NOT_QOS_AP_RSP: - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: Setup failed, not a QoS AP", __func__); if (HDD_WMM_HANDLE_IMPLICIT != pQosContext->handle) { - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: Explicit Qos, notifying user space", __func__); @@ -716,13 +716,13 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, break; case SME_QOS_STATUS_SETUP_REQ_PENDING_RSP: - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: Setup pending", __func__); /* not a callback status -- ignore if we get it */ break; case SME_QOS_STATUS_SETUP_MODIFIED_IND: - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: Setup modified", __func__); if (pCurrentQosInfo) { /* update the TSPEC */ @@ -731,7 +731,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, pCurrentQosInfo, sizeof(pAc->wmmAcTspecInfo)); if (HDD_WMM_HANDLE_IMPLICIT != pQosContext->handle) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: Explicit Qos, notifying user space", __func__); @@ -757,7 +757,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, pAc->wmmAcAccessAllowed = true; } else { - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: Explicit Qos, notifying user space", __func__); @@ -773,7 +773,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, break; case SME_QOS_STATUS_SETUP_SUCCESS_IND_APSD_SET_FAILED: - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: Setup successful but U-APSD failed", __func__); if (HDD_WMM_HANDLE_IMPLICIT == pQosContext->handle) { @@ -789,7 +789,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, pAc->wmmAcAccessPending = false; } else { - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: Explicit Qos, notifying user space", __func__); @@ -807,11 +807,11 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, break; case SME_QOS_STATUS_RELEASE_SUCCESS_RSP: - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: Release is complete", __func__); if (pCurrentQosInfo) { - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: flows still active", __func__); /* there is still at least one flow active for @@ -823,7 +823,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, /* need to tell TL to update its UAPSD handling */ hdd_wmm_enable_tl_uapsd(pQosContext); } else { - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: last flow", __func__); /* this is the last flow active for this AC so @@ -839,7 +839,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, } if (HDD_WMM_HANDLE_IMPLICIT != pQosContext->handle) { - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: Explicit Qos, notifying user space", __func__); @@ -853,14 +853,14 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, break; case SME_QOS_STATUS_RELEASE_FAILURE_RSP: - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: Release failure", __func__); /* we don't need to update our state or TL since * nothing has changed */ if (HDD_WMM_HANDLE_IMPLICIT != pQosContext->handle) { - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: Explicit Qos, notifying user space", __func__); @@ -873,7 +873,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, break; case SME_QOS_STATUS_RELEASE_QOS_LOST_IND: - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: QOS Lost indication received", __func__); /* current TSPEC is no longer valid */ @@ -889,7 +889,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, pAc->wmmAcAccessGranted = false; pAc->wmmAcAccessFailed = false; } else { - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Explicit Qos, notifying user space", __func__); @@ -903,13 +903,13 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, break; case SME_QOS_STATUS_RELEASE_REQ_PENDING_RSP: - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Release pending", __func__); /* not a callback status -- ignore if we get it */ break; case SME_QOS_STATUS_RELEASE_INVALID_PARAMS_RSP: - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: Release Invalid Params", __func__); if (HDD_WMM_HANDLE_IMPLICIT != pQosContext->handle) { /* this was triggered by an application */ @@ -920,7 +920,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, break; case SME_QOS_STATUS_MODIFY_SETUP_SUCCESS_IND: - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Modification is complete, notify TL", __func__); /* there will always be a TSPEC returned with this @@ -966,7 +966,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, break; case SME_QOS_STATUS_MODIFY_SETUP_PENDING_RSP: - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: modification pending", __func__); /* not a callback status -- ignore if we get it */ break; @@ -999,7 +999,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, break; case SME_QOS_STATUS_MODIFY_SETUP_SUCCESS_IND_APSD_SET_FAILED: - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: Modify successful but U-APSD failed", __func__); /* QoS modification was successful but setting U=APSD @@ -1035,7 +1035,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, break; default: - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: unexpected SME Status=%d", __func__, smeStatus); CDF_ASSERT(0); } @@ -1055,7 +1055,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, pAc->wmmAcAccessAllowed = true; } - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: complete, access for TL AC %d is%sallowed", __func__, acType, pAc->wmmAcAccessAllowed ? " " : " not "); @@ -1074,12 +1074,12 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, int hdd_wmmps_helper(hdd_adapter_t *pAdapter, uint8_t *ptr) { if (NULL == pAdapter) { - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: pAdapter is NULL", __func__); return -EINVAL; } if (NULL == ptr) { - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: ptr is NULL", __func__); return -EINVAL; } @@ -1110,11 +1110,11 @@ static void __hdd_wmm_do_implicit_qos(struct work_struct *work) sme_QosWmmTspecInfo qosInfo; hdd_context_t *hdd_ctx; - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Entered, context %p", __func__, pQosContext); if (unlikely(HDD_WMM_CTX_MAGIC != pQosContext->magic)) { - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: Invalid QoS Context", __func__); return; } @@ -1130,11 +1130,11 @@ static void __hdd_wmm_do_implicit_qos(struct work_struct *work) acType = pQosContext->acType; pAc = &pAdapter->hddWmmStatus.wmmAcStatus[acType]; - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: pAdapter %p acType %d", __func__, pAdapter, acType); if (!pAc->wmmAcAccessNeeded) { - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: AC %d doesn't need service", __func__, acType); pQosContext->magic = 0; kfree(pQosContext); @@ -1298,7 +1298,7 @@ static void __hdd_wmm_do_implicit_qos(struct work_struct *work) qosInfo.ts_info.up, &pQosContext->qosFlowId); - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: sme_qos_setup_req returned %d flowid %d", __func__, smeStatus, pQosContext->qosFlowId); @@ -1309,7 +1309,7 @@ static void __hdd_wmm_do_implicit_qos(struct work_struct *work) /* setup is pending, so no more work to do now. all * further work will be done in hdd_wmm_sme_callback() */ - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Setup is pending, no further work", __func__); break; @@ -1332,7 +1332,7 @@ static void __hdd_wmm_do_implicit_qos(struct work_struct *work) /* for these cases everything is already setup so we * can signal TL that it has work to do */ - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Setup is complete, notify TL", __func__); pAc->wmmAcAccessAllowed = true; @@ -1342,7 +1342,7 @@ static void __hdd_wmm_do_implicit_qos(struct work_struct *work) break; default: - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: unexpected SME Status=%d", __func__, smeStatus); CDF_ASSERT(0); } @@ -1378,7 +1378,7 @@ QDF_STATUS hdd_wmm_init(hdd_adapter_t *pAdapter) sme_QosWmmUpType *hddWmmDscpToUpMap = pAdapter->hddWmmDscpToUpMap; uint8_t dscp; - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Entered", __func__); /* DSCP to User Priority Lookup Table @@ -1409,7 +1409,7 @@ QDF_STATUS hdd_wmm_adapter_init(hdd_adapter_t *pAdapter) hdd_wmm_ac_status_t *pAcStatus; sme_ac_enum_type acType; - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Entered", __func__); pAdapter->hddWmmStatus.wmmQap = false; @@ -1447,7 +1447,7 @@ QDF_STATUS hdd_wmm_adapter_clear(hdd_adapter_t *pAdapter) { hdd_wmm_ac_status_t *pAcStatus; sme_ac_enum_type acType; - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Entered", __func__); for (acType = 0; acType < WLAN_MAX_AC; acType++) { pAcStatus = &pAdapter->hddWmmStatus.wmmAcStatus[acType]; @@ -1476,7 +1476,7 @@ QDF_STATUS hdd_wmm_adapter_close(hdd_adapter_t *pAdapter) { hdd_wmm_qos_context_t *pQosContext; - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Entered", __func__); /* free any context records that we still have linked */ @@ -1526,7 +1526,7 @@ void hdd_wmm_classify_pkt(hdd_adapter_t *adapter, */ #ifdef HDD_WMM_DEBUG - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Entered", __func__); #endif /* HDD_WMM_DEBUG */ @@ -1534,7 +1534,7 @@ void hdd_wmm_classify_pkt(hdd_adapter_t *adapter, eth_hdr = (union generic_ethhdr *)pkt; #ifdef HDD_WMM_DEBUG - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: proto is 0x%04x", __func__, skb->protocol); #endif /* HDD_WMM_DEBUG */ @@ -1543,7 +1543,7 @@ void hdd_wmm_classify_pkt(hdd_adapter_t *adapter, ip_hdr = (struct iphdr *)&pkt[sizeof(eth_hdr->eth_II)]; tos = ip_hdr->tos; #ifdef HDD_WMM_DEBUG - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Ethernet II IP Packet, tos is %d", __func__, tos); #endif /* HDD_WMM_DEBUG */ @@ -1552,7 +1552,7 @@ void hdd_wmm_classify_pkt(hdd_adapter_t *adapter, ipv6hdr = ipv6_hdr(skb); tos = ntohs(*(const __be16 *)ipv6hdr) >> 4; #ifdef HDD_WMM_DEBUG - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Ethernet II IPv6 Packet, tos is %d", __func__, tos); #endif /* HDD_WMM_DEBUG */ @@ -1565,7 +1565,7 @@ void hdd_wmm_classify_pkt(hdd_adapter_t *adapter, ip_hdr = (struct iphdr *)&pkt[sizeof(eth_hdr->eth_8023)]; tos = ip_hdr->tos; #ifdef HDD_WMM_DEBUG - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: 802.3 LLC/SNAP IP Packet, tos is %d", __func__, tos); #endif /* HDD_WMM_DEBUG */ @@ -1580,7 +1580,7 @@ void hdd_wmm_classify_pkt(hdd_adapter_t *adapter, &pkt[sizeof(eth_hdr->eth_IIv)]; tos = ip_hdr->tos; #ifdef HDD_WMM_DEBUG - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Ethernet II VLAN tagged IP Packet, tos is %d", __func__, tos); @@ -1602,7 +1602,7 @@ void hdd_wmm_classify_pkt(hdd_adapter_t *adapter, &pkt[sizeof(eth_hdr->eth_8023v)]; tos = ip_hdr->tos; #ifdef HDD_WMM_DEBUG - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: 802.3 LLC/SNAP VLAN tagged IP Packet, tos is %d", __func__, tos); @@ -1610,7 +1610,7 @@ void hdd_wmm_classify_pkt(hdd_adapter_t *adapter, } else { /* default */ #ifdef HDD_WMM_DEBUG - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_WARN, "%s: VLAN tagged Unhandled Protocol, using default tos", __func__); @@ -1620,7 +1620,7 @@ void hdd_wmm_classify_pkt(hdd_adapter_t *adapter, } else { /* default */ #ifdef HDD_WMM_DEBUG - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_WARN, "%s: Unhandled Protocol, using default tos", __func__); #endif /* HDD_WMM_DEBUG */ @@ -1637,7 +1637,7 @@ void hdd_wmm_classify_pkt(hdd_adapter_t *adapter, *user_pri = adapter->hddWmmDscpToUpMap[dscp]; #ifdef HDD_WMM_DEBUG - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: tos is %d, dscp is %d, up is %d", __func__, tos, dscp, *user_pri); #endif /* HDD_WMM_DEBUG */ @@ -1777,7 +1777,7 @@ void hdd_wmm_acquire_access_required(hdd_adapter_t *pAdapter, pAdapter->psbChanged &= ~SME_QOS_UAPSD_CFG_VO_CHANGED_MASK; break; default: - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: Invalid AC Type", __func__); break; } @@ -1799,7 +1799,7 @@ QDF_STATUS hdd_wmm_acquire_access(hdd_adapter_t *pAdapter, { hdd_wmm_qos_context_t *pQosContext; - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Entered for AC %d", __func__, acType); if (!hdd_wmm_is_active(pAdapter) || @@ -1808,7 +1808,7 @@ QDF_STATUS hdd_wmm_acquire_access(hdd_adapter_t *pAdapter, /* either we don't want QoS or the AP doesn't support * QoS or we don't want to do implicit QoS */ - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: QoS not configured on both ends ", __func__); *pGranted = @@ -1823,7 +1823,7 @@ QDF_STATUS hdd_wmm_acquire_access(hdd_adapter_t *pAdapter, /* request already pending so we need to wait for that * response */ - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Implicit QoS for TL AC %d already scheduled", __func__, acType); @@ -1838,7 +1838,7 @@ QDF_STATUS hdd_wmm_acquire_access(hdd_adapter_t *pAdapter, /* request previously failed * allow access, but we'll be downgraded */ - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Implicit QoS for TL AC %d previously failed", __func__, acType); @@ -1856,7 +1856,7 @@ QDF_STATUS hdd_wmm_acquire_access(hdd_adapter_t *pAdapter, return QDF_STATUS_SUCCESS; } /* we need to establish implicit QoS */ - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: Need to schedule implicit QoS for TL AC %d, pAdapter is %p", __func__, acType, pAdapter); @@ -1867,7 +1867,7 @@ QDF_STATUS hdd_wmm_acquire_access(hdd_adapter_t *pAdapter, /* no memory for QoS context. Nothing we can do but * let data flow */ - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: Unable to allocate context", __func__); pAdapter->hddWmmStatus.wmmAcStatus[acType].wmmAcAccessAllowed = true; @@ -1889,7 +1889,7 @@ QDF_STATUS hdd_wmm_acquire_access(hdd_adapter_t *pAdapter, INIT_WORK(&pQosContext->wmmAcSetupImplicitQos, hdd_wmm_do_implicit_qos); #endif - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: Scheduling work for AC %d, context %p", __func__, acType, pQosContext); @@ -1923,7 +1923,7 @@ QDF_STATUS hdd_wmm_assoc(hdd_adapter_t *pAdapter, * enable UAPSD for any access categories */ - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Entered", __func__); if (pRoamInfo->fReassocReq) { @@ -1936,7 +1936,7 @@ QDF_STATUS hdd_wmm_assoc(hdd_adapter_t *pAdapter, * parameters will be updated there */ - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Reassoc so no work, Exiting", __func__); return QDF_STATUS_SUCCESS; @@ -1945,7 +1945,7 @@ QDF_STATUS hdd_wmm_assoc(hdd_adapter_t *pAdapter, uapsdMask = pRoamInfo->u.pConnectedProfile->modifyProfileFields.uapsd_mask; - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: U-APSD mask is 0x%02x", __func__, (int)uapsdMask); if (uapsdMask & HDD_AC_VO) { @@ -2020,7 +2020,7 @@ QDF_STATUS hdd_wmm_assoc(hdd_adapter_t *pAdapter, hdd_wmm_init(pAdapter); } - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Exiting", __func__); return QDF_STATUS_SUCCESS; @@ -2051,7 +2051,7 @@ QDF_STATUS hdd_wmm_connect(hdd_adapter_t *pAdapter, bool qosConnection; uint8_t acmMask; - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Entered", __func__); if ((eCSR_BSS_TYPE_INFRASTRUCTURE == eBssType) && @@ -2065,7 +2065,7 @@ QDF_STATUS hdd_wmm_connect(hdd_adapter_t *pAdapter, acmMask = 0x0; } - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: qap is %d, qosConnection is %d, acmMask is 0x%x", __func__, qap, qosConnection, acmMask); @@ -2074,7 +2074,7 @@ QDF_STATUS hdd_wmm_connect(hdd_adapter_t *pAdapter, for (ac = 0; ac < WLAN_MAX_AC; ac++) { if (qap && qosConnection && (acmMask & acm_mask_bit[ac])) { - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: ac %d on", __func__, ac); /* admission is required */ @@ -2094,7 +2094,7 @@ QDF_STATUS hdd_wmm_connect(hdd_adapter_t *pAdapter, wmmAcAccessAllowed = true; } } else { - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: ac %d off", __func__, ac); /* admission is not required so access is allowed */ pAdapter->hddWmmStatus.wmmAcStatus[ac]. @@ -2105,7 +2105,7 @@ QDF_STATUS hdd_wmm_connect(hdd_adapter_t *pAdapter, } - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Exiting", __func__); return QDF_STATUS_SUCCESS; @@ -2199,7 +2199,7 @@ hdd_wlan_wmm_status_e hdd_wmm_addts(hdd_adapter_t *pAdapter, #endif bool found = false; - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Entered with handle 0x%x", __func__, handle); /* see if a context already exists with the given handle */ @@ -2214,7 +2214,7 @@ hdd_wlan_wmm_status_e hdd_wmm_addts(hdd_adapter_t *pAdapter, mutex_unlock(&pAdapter->hddWmmStatus.wmmLock); if (found) { /* record with that handle already exists */ - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: Record already exists with handle 0x%x", __func__, handle); @@ -2250,7 +2250,7 @@ hdd_wlan_wmm_status_e hdd_wmm_addts(hdd_adapter_t *pAdapter, /* we didn't get back one of the * SME_QOS_STATUS_MODIFY_* status codes */ - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: unexpected SME Status=%d", __func__, smeStatus); CDF_ASSERT(0); @@ -2269,7 +2269,7 @@ hdd_wlan_wmm_status_e hdd_wmm_addts(hdd_adapter_t *pAdapter, pQosContext = kmalloc(sizeof(*pQosContext), GFP_KERNEL); if (NULL == pQosContext) { /* no memory for QoS context. Nothing we can do */ - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: Unable to allocate QoS context", __func__); return HDD_WLAN_WMM_STATUS_INTERNAL_FAILURE; } @@ -2279,7 +2279,7 @@ hdd_wlan_wmm_status_e hdd_wmm_addts(hdd_adapter_t *pAdapter, if (pTspec->ts_info.up < HDD_WMM_UP_TO_AC_MAP_SIZE) pQosContext->acType = hdd_wmm_up_to_ac_map[pTspec->ts_info.up]; else { - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: ts_info.up (%d) larger than max value (%d), use default acType (%d)", __func__, pTspec->ts_info.up, HDD_WMM_UP_TO_AC_MAP_SIZE - 1, hdd_wmm_up_to_ac_map[0]); @@ -2289,7 +2289,7 @@ hdd_wlan_wmm_status_e hdd_wmm_addts(hdd_adapter_t *pAdapter, pQosContext->qosFlowId = 0; pQosContext->magic = HDD_WMM_CTX_MAGIC; - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: Setting up QoS, context %p", __func__, pQosContext); mutex_lock(&pAdapter->hddWmmStatus.wmmLock); @@ -2305,7 +2305,7 @@ hdd_wlan_wmm_status_e hdd_wmm_addts(hdd_adapter_t *pAdapter, pTspec->ts_info.up, &pQosContext->qosFlowId); - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: sme_qos_setup_req returned %d flowid %d", __func__, smeStatus, pQosContext->qosFlowId); @@ -2342,7 +2342,7 @@ hdd_wlan_wmm_status_e hdd_wmm_addts(hdd_adapter_t *pAdapter, * SME_QOS_STATUS_SETUP_* status codes */ hdd_wmm_free_context(pQosContext); - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: unexpected SME Status=%d", __func__, smeStatus); CDF_ASSERT(0); return HDD_WLAN_WMM_STATUS_SETUP_FAILED; @@ -2378,7 +2378,7 @@ hdd_wlan_wmm_status_e hdd_wmm_delts(hdd_adapter_t *pAdapter, uint32_t handle) sme_QosStatusType smeStatus; #endif - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Entered with handle 0x%x", __func__, handle); /* locate the context with the given handle */ @@ -2396,12 +2396,12 @@ hdd_wlan_wmm_status_e hdd_wmm_delts(hdd_adapter_t *pAdapter, uint32_t handle) if (false == found) { /* we didn't find the handle */ - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: handle 0x%x not found", __func__, handle); return HDD_WLAN_WMM_STATUS_RELEASE_FAILED_BAD_PARAM; } - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: found handle 0x%x, flow %d, AC %d, context %p", __func__, handle, qosFlowId, acType, pQosContext); @@ -2409,7 +2409,7 @@ hdd_wlan_wmm_status_e hdd_wmm_delts(hdd_adapter_t *pAdapter, uint32_t handle) smeStatus = sme_qos_release_req(WLAN_HDD_GET_HAL_CTX(pAdapter), qosFlowId); - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: SME flow %d released, SME status %d", __func__, qosFlowId, smeStatus); @@ -2455,7 +2455,7 @@ hdd_wlan_wmm_status_e hdd_wmm_delts(hdd_adapter_t *pAdapter, uint32_t handle) /* we didn't get back one of the * SME_QOS_STATUS_RELEASE_* status codes */ - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: unexpected SME Status=%d", __func__, smeStatus); CDF_ASSERT(0); status = HDD_WLAN_WMM_STATUS_RELEASE_FAILED; @@ -2484,7 +2484,7 @@ hdd_wlan_wmm_status_e hdd_wmm_checkts(hdd_adapter_t *pAdapter, uint32_t handle) hdd_wmm_qos_context_t *pQosContext; hdd_wlan_wmm_status_e status = HDD_WLAN_WMM_STATUS_LOST; - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Entered with handle 0x%x", __func__, handle); /* locate the context with the given handle */ @@ -2492,7 +2492,7 @@ hdd_wlan_wmm_status_e hdd_wmm_checkts(hdd_adapter_t *pAdapter, uint32_t handle) list_for_each_entry(pQosContext, &pAdapter->hddWmmStatus.wmmContextList, node) { if (pQosContext->handle == handle) { - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: found handle 0x%x, context %p", __func__, handle, pQosContext); diff --git a/core/hdd/src/wlan_hdd_wowl.c b/core/hdd/src/wlan_hdd_wowl.c index fc1992a506..def8b33625 100644 --- a/core/hdd/src/wlan_hdd_wowl.c +++ b/core/hdd/src/wlan_hdd_wowl.c @@ -59,7 +59,7 @@ static inline int find_ptrn_len(const char *ptrn) static void hdd_wowl_callback(void *pContext, QDF_STATUS cdf_ret_status) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Return code = (%d)", __func__, cdf_ret_status); } @@ -67,7 +67,7 @@ static void hdd_wowl_callback(void *pContext, QDF_STATUS cdf_ret_status) static void hdd_wowl_wake_indication_callback(void *pContext, tpSirWakeReasonInd wake_reason_ind) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Wake Reason %d", + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Wake Reason %d", __func__, wake_reason_ind->ulReason); hdd_exit_wowl((hdd_adapter_t *) pContext); } @@ -83,25 +83,25 @@ static void dump_hdd_wowl_ptrn(struct wow_add_pattern *ptrn) { int i; - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Patetrn Id = 0x%x", __func__, ptrn->pattern_id); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Pattern Byte Offset = 0x%x", __func__, ptrn->pattern_byte_offset); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: pattern_size = 0x%x", __func__, ptrn->pattern_size); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: pattern_mask_size = 0x%x", __func__, ptrn->pattern_mask_size); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Pattern: ", + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Pattern: ", __func__); for (i = 0; i < ptrn->pattern_size; i++) - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, " %02X", + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, " %02X", ptrn->pattern[i]); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: pattern_mask: ", + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: pattern_mask: ", __func__); for (i = 0; i < ptrn->pattern_mask_size; i++) - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%02X", + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%02X", ptrn->pattern_mask[i]); } @@ -139,7 +139,7 @@ bool hdd_add_wowl_ptrn(hdd_adapter_t *pAdapter, const char *ptrn) /* Pattern Already configured, skip to * next pattern */ - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "Trying to add duplicate WoWL pattern. Skip it!"); ptrn += len; @@ -159,7 +159,7 @@ bool hdd_add_wowl_ptrn(hdd_adapter_t *pAdapter, const char *ptrn) /* Maximum number of patterns have been configured already */ if (first_empty_slot == -1) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Cannot add anymore patterns. No free slot!", __func__); return false; @@ -167,7 +167,7 @@ bool hdd_add_wowl_ptrn(hdd_adapter_t *pAdapter, const char *ptrn) /* Validate the pattern */ if (ptrn[2] != WOWL_INTRA_PTRN_TOKENIZER || ptrn[5] != WOWL_INTRA_PTRN_TOKENIZER) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Malformed pattern string. Skip!", __func__); ptrn += len; @@ -186,7 +186,7 @@ bool hdd_add_wowl_ptrn(hdd_adapter_t *pAdapter, const char *ptrn) if (localPattern.pattern_size > SIR_WOWL_BCAST_PATTERN_MAX_SIZE || localPattern.pattern_mask_size > WOWL_PTRN_MASK_MAX_SIZE) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Invalid length specified. Skip!", __func__); ptrn += len; @@ -196,7 +196,7 @@ bool hdd_add_wowl_ptrn(hdd_adapter_t *pAdapter, const char *ptrn) offset = 5 + 2 * localPattern.pattern_size + 1; if ((offset >= len) || (ptrn[offset] != WOWL_INTRA_PTRN_TOKENIZER)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Malformed pattern string..skip!", __func__); ptrn += len; @@ -206,7 +206,7 @@ bool hdd_add_wowl_ptrn(hdd_adapter_t *pAdapter, const char *ptrn) offset = offset + 2 * localPattern.pattern_mask_size; if (offset + 1 != len) { /* offset begins with 0 */ - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Malformed pattern string...skip!", __func__); ptrn += len; @@ -241,7 +241,7 @@ bool hdd_add_wowl_ptrn(hdd_adapter_t *pAdapter, const char *ptrn) g_hdd_wowl_ptrns[first_empty_slot] = kmalloc(len + 1, GFP_KERNEL); if (g_hdd_wowl_ptrns[first_empty_slot] == NULL) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: kmalloc failure", __func__); return false; } @@ -258,7 +258,7 @@ bool hdd_add_wowl_ptrn(hdd_adapter_t *pAdapter, const char *ptrn) sessionId); if (!QDF_IS_STATUS_SUCCESS(cdf_ret_status)) { /* Add failed, so invalidate the local storage */ - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "sme_wowl_add_bcast_pattern failed with error code (%d)", cdf_ret_status); kfree(g_hdd_wowl_ptrns[first_empty_slot]); @@ -316,7 +316,7 @@ bool hdd_del_wowl_ptrn(hdd_adapter_t *pAdapter, const char *ptrn) sessionId); if (QDF_IS_STATUS_SUCCESS(cdf_ret_status)) { /* Remove from local storage as well */ - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "Deleted pattern with id %d [%s]", id, g_hdd_wowl_ptrns[id]); @@ -350,7 +350,7 @@ bool hdd_add_wowl_ptrn_debugfs(hdd_adapter_t *pAdapter, uint8_t pattern_idx, uint16_t pattern_len, mask_len, i; if (pattern_idx > (WOWL_MAX_PTRNS_ALLOWED - 1)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: WoW pattern index %d is out of range (0 ~ %d).", __func__, pattern_idx, WOWL_MAX_PTRNS_ALLOWED - 1); @@ -361,7 +361,7 @@ bool hdd_add_wowl_ptrn_debugfs(hdd_adapter_t *pAdapter, uint8_t pattern_idx, /* 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 WoW pattern!", __func__); return false; @@ -369,7 +369,7 @@ bool hdd_add_wowl_ptrn_debugfs(hdd_adapter_t *pAdapter, uint8_t pattern_idx, pattern_len >>= 1; if (!pattern_len || pattern_len > WOWL_PTRN_MAX_SIZE) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: WoW pattern length %d is out of range (1 ~ %d).", __func__, pattern_len, WOWL_PTRN_MAX_SIZE); @@ -382,7 +382,7 @@ bool hdd_add_wowl_ptrn_debugfs(hdd_adapter_t *pAdapter, uint8_t pattern_idx, localPattern.session_id = session_id; if (localPattern.pattern_size > SIR_WOWL_BCAST_PATTERN_MAX_SIZE) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: WoW pattern size (%d) greater than max (%d)", __func__, localPattern.pattern_size, SIR_WOWL_BCAST_PATTERN_MAX_SIZE); @@ -406,13 +406,13 @@ bool hdd_add_wowl_ptrn_debugfs(hdd_adapter_t *pAdapter, uint8_t pattern_idx, mask_len = strlen(pattern_mask); if ((mask_len % 2) || (localPattern.pattern_mask_size != (mask_len >> 1))) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Malformed WoW pattern mask!", __func__); return false; } if (localPattern.pattern_mask_size > WOWL_PTRN_MASK_MAX_SIZE) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: WoW pattern mask size (%d) greater than max (%d)", __func__, localPattern.pattern_mask_size, WOWL_PTRN_MASK_MAX_SIZE); @@ -433,7 +433,7 @@ bool hdd_add_wowl_ptrn_debugfs(hdd_adapter_t *pAdapter, uint8_t pattern_idx, sme_wow_add_pattern(hHal, &localPattern, session_id); if (!QDF_IS_STATUS_SUCCESS(cdf_ret_status)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: sme_wowl_add_bcast_pattern failed with error code (%d).", __func__, cdf_ret_status); @@ -467,7 +467,7 @@ bool hdd_del_wowl_ptrn_debugfs(hdd_adapter_t *pAdapter, uint8_t pattern_idx) uint8_t sessionId = pAdapter->sessionId; if (pattern_idx > (WOWL_MAX_PTRNS_ALLOWED - 1)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: WoW pattern index %d is not in the range (0 ~ %d).", __func__, pattern_idx, WOWL_MAX_PTRNS_ALLOWED - 1); @@ -475,7 +475,7 @@ bool hdd_del_wowl_ptrn_debugfs(hdd_adapter_t *pAdapter, uint8_t pattern_idx) } if (!g_hdd_wowl_ptrns_debugfs[pattern_idx]) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: WoW pattern %d is not in the table.", __func__, pattern_idx); @@ -488,7 +488,7 @@ bool hdd_del_wowl_ptrn_debugfs(hdd_adapter_t *pAdapter, uint8_t pattern_idx) sessionId); if (!QDF_IS_STATUS_SUCCESS(cdf_ret_status)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: sme_wowl_del_bcast_pattern failed with error code (%d).", __func__, cdf_ret_status); @@ -544,7 +544,7 @@ bool hdd_enter_wowl(hdd_adapter_t *pAdapter, bool enable_mp, bool enable_pbm) if (!QDF_IS_STATUS_SUCCESS(cdf_ret_status)) { if (QDF_STATUS_PMC_PENDING != cdf_ret_status) { /* We failed to enter WoWL */ - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "sme_enter_wowl failed with error code (%d)", cdf_ret_status); return false; @@ -569,7 +569,7 @@ bool hdd_exit_wowl(hdd_adapter_t *pAdapter) cdf_ret_status = sme_exit_wowl(hHal, &wowParams); if (!QDF_IS_STATUS_SUCCESS(cdf_ret_status)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "sme_exit_wowl failed with error code (%d)", cdf_ret_status); return false; diff --git a/core/mac/inc/ani_global.h b/core/mac/inc/ani_global.h index cb22f9a2a7..5e9e82046d 100644 --- a/core/mac/inc/ani_global.h +++ b/core/mac/inc/ani_global.h @@ -34,7 +34,7 @@ typedef struct sAniSirGlobal *tpAniSirGlobal; #endif -#include "cdf_types.h" +#include "qdf_types.h" #include "sir_common.h" #include "ani_system_defs.h" #include "sys_def.h" diff --git a/core/mac/inc/ani_system_defs.h b/core/mac/inc/ani_system_defs.h index 578d0b8339..ebaa1311bc 100644 --- a/core/mac/inc/ani_system_defs.h +++ b/core/mac/inc/ani_system_defs.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. * @@ -198,7 +198,7 @@ typedef struct sTrafStrmMetrics { uint16_t UplinkPktCount; uint8_t RoamingCount; uint16_t RoamingDly; -} cdf_packed tTrafStrmMetrics, *tpTrafStrmMetrics; +} qdf_packed tTrafStrmMetrics, *tpTrafStrmMetrics; typedef struct sBcnReportFields { uint8_t ChanNum; @@ -211,6 +211,6 @@ typedef struct sBcnReportFields { uint32_t TargetTsf[2]; uint16_t BcnInterval; uint16_t CapabilityInfo; -} cdf_packed tBcnReportFields, *tpBcnReportFields; +} qdf_packed tBcnReportFields, *tpBcnReportFields; #endif /* __ANI_SYSTEM_DEFS_H */ diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h index 878ce5f883..91deff13ae 100644 --- a/core/mac/inc/sir_api.h +++ b/core/mac/inc/sir_api.h @@ -403,7 +403,7 @@ typedef struct sSirRemainOnChnReq { uint16_t messageType; uint16_t length; uint8_t sessionId; - struct cdf_mac_addr selfMacAddr; + struct qdf_mac_addr selfMacAddr; uint8_t chnNum; uint8_t phyMode; uint32_t duration; @@ -544,7 +544,7 @@ typedef enum eSirNwType { /* / Definition for new iBss peer info */ typedef struct sSirNewIbssPeerInfo { - struct cdf_mac_addr peerAddr; + struct qdf_mac_addr peerAddr; uint16_t aid; } tSirNewIbssPeerInfo, *tpSirNewIbssPeerInfo; @@ -559,7 +559,7 @@ typedef struct sSirHtConfig { /* Enable/Disable SGI */ uint32_t ht_sgi:1; uint32_t unused:27; -} cdf_packed tSirHTConfig, *tpSirHTConfig; +} qdf_packed tSirHTConfig, *tpSirHTConfig; typedef struct sSirAddIeParams { uint16_t probeRespDataLen; @@ -592,8 +592,8 @@ typedef struct sSirSmeStartBssReq { uint16_t length; uint8_t sessionId; /* Added for BT-AMP Support */ uint16_t transactionId; /* Added for BT-AMP Support */ - struct cdf_mac_addr bssid; /* Added for BT-AMP Support */ - struct cdf_mac_addr self_macaddr; /* Added for BT-AMP Support */ + struct qdf_mac_addr bssid; /* Added for BT-AMP Support */ + struct qdf_mac_addr self_macaddr; /* Added for BT-AMP Support */ uint16_t beaconInterval; /* Added for BT-AMP Support */ uint8_t dot11mode; #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH @@ -621,7 +621,7 @@ typedef struct sSirSmeStartBssReq { uint32_t dtimPeriod; uint8_t wps_state; uint8_t isCoalesingInIBSSAllowed; /* Coalesing on/off knob */ - enum tCDF_ADAPTER_MODE bssPersona; + enum tQDF_ADAPTER_MODE bssPersona; uint8_t txLdpcIniFeatureEnabled; @@ -655,7 +655,7 @@ typedef struct sSirBssDescription { /* offset of the ieFields from bssId. */ uint16_t length; tSirMacAddr bssId; - v_TIME_t scanSysTimeMsec; + unsigned long scanSysTimeMsec; uint32_t timeStamp[2]; uint16_t beaconInterval; uint16_t capabilityInfo; @@ -783,9 +783,9 @@ typedef struct sSirSmeScanReq { uint16_t length; uint8_t sessionId; /* Session ID */ uint16_t transactionId; /* Transaction ID for cmd */ - struct cdf_mac_addr bssId; + struct qdf_mac_addr bssId; tSirMacSSid ssId[SIR_SCAN_MAX_NUM_SSID]; - struct cdf_mac_addr selfMacAddr; /* Added For BT-AMP Support */ + struct qdf_mac_addr selfMacAddr; /* Added For BT-AMP Support */ tSirBssType bssType; uint8_t dot11mode; tSirScanType scanType; @@ -909,7 +909,7 @@ typedef struct sSirSmeScanChanReq { typedef struct sSirOemDataReq { uint16_t messageType; /* eWNI_SME_OEM_DATA_REQ */ uint16_t messageLen; - struct cdf_mac_addr selfMacAddr; + struct qdf_mac_addr selfMacAddr; uint8_t data_len; uint8_t *data; } tSirOemDataReq, *tpSirOemDataReq; @@ -952,7 +952,7 @@ typedef struct sSirSmeJoinReq { #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH uint8_t cc_switch_mode; #endif - enum tCDF_ADAPTER_MODE staPersona; /* Persona */ + enum tQDF_ADAPTER_MODE staPersona; /* Persona */ ePhyChanBondState cbMode; /* Pass CB mode value in Join. */ /*This contains the UAPSD Flag for all 4 AC @@ -1084,7 +1084,7 @@ typedef struct sSirSmeProbereq { uint16_t messageType; uint16_t length; uint8_t sessionId; - struct cdf_mac_addr peer_macaddr; + struct qdf_mac_addr peer_macaddr; uint16_t devicePasswdId; } tSirSmeProbeReq, *tpSirSmeProbeReq; @@ -1145,10 +1145,10 @@ typedef struct sSirSmeAssocCnf { uint16_t messageType; /* eWNI_SME_ASSOC_CNF */ uint16_t length; tSirResultCodes statusCode; - struct cdf_mac_addr bssid; /* Self BSSID */ - struct cdf_mac_addr peer_macaddr; + struct qdf_mac_addr bssid; /* Self BSSID */ + struct qdf_mac_addr peer_macaddr; uint16_t aid; - struct cdf_mac_addr alternate_bssid; + struct qdf_mac_addr alternate_bssid; uint8_t alternateChannelId; } tSirSmeAssocCnf, *tpSirSmeAssocCnf; @@ -1169,7 +1169,7 @@ typedef enum eSirSmeStatusChangeCode { } tSirSmeStatusChangeCode; typedef struct sSirSmeNewBssInfo { - struct cdf_mac_addr bssId; + struct qdf_mac_addr bssId; uint8_t channelNumber; uint8_t reserved; tSirMacSSid ssId; @@ -1177,7 +1177,7 @@ typedef struct sSirSmeNewBssInfo { typedef struct sSirSmeApNewCaps { uint16_t capabilityInfo; - struct cdf_mac_addr bssId; + struct qdf_mac_addr bssId; uint8_t channelId; uint8_t reserved[3]; tSirMacSSid ssId; @@ -1213,7 +1213,7 @@ typedef struct sSirSmeWmStatusChangeNtf { uint16_t length; uint8_t sessionId; /* Session ID */ tSirSmeStatusChangeCode statusChangeCode; - struct cdf_mac_addr bssid; /* Self BSSID */ + struct qdf_mac_addr bssid; /* Self BSSID */ union { uint16_t deAuthReasonCode; /* eSIR_SME_DEAUTH_FROM_PEER */ /* eSIR_SME_DISASSOC_FROM_PEER */ @@ -1236,13 +1236,13 @@ typedef struct sSirSmeDisassocReq { uint16_t length; uint8_t sessionId; /* Session ID */ uint16_t transactionId; /* Transaction ID for cmd */ - struct cdf_mac_addr bssid; /* Peer BSSID */ - struct cdf_mac_addr peer_macaddr; + struct qdf_mac_addr bssid; /* Peer BSSID */ + struct qdf_mac_addr peer_macaddr; uint16_t reasonCode; /* This flag tells LIM whether to send the disassoc OTA or not */ /* This will be set in while handing off from one AP to other */ uint8_t doNotSendOverTheAir; -} cdf_packed tSirSmeDisassocReq, *tpSirSmeDisassocReq; +} qdf_packed tSirSmeDisassocReq, *tpSirSmeDisassocReq; /* / Definition for Tkip countermeasures request */ typedef struct sSirSmeTkipCntrMeasReq { @@ -1250,9 +1250,9 @@ typedef struct sSirSmeTkipCntrMeasReq { uint16_t length; uint8_t sessionId; /* Session ID */ uint16_t transactionId; /* Transaction ID for cmd */ - struct cdf_mac_addr bssId; /* Peer BSSID */ + struct qdf_mac_addr bssId; /* Peer BSSID */ bool bEnable; /* Start/stop countermeasures */ -} cdf_packed tSirSmeTkipCntrMeasReq, *tpSirSmeTkipCntrMeasReq; +} qdf_packed tSirSmeTkipCntrMeasReq, *tpSirSmeTkipCntrMeasReq; typedef struct sAni64BitCounters { uint32_t Hi; @@ -1372,10 +1372,10 @@ typedef struct sSirSmeDisassocRsp { uint8_t sessionId; /* Session ID */ uint16_t transactionId; /* Transaction ID for cmd */ tSirResultCodes statusCode; - struct cdf_mac_addr peer_macaddr; + struct qdf_mac_addr peer_macaddr; tAniStaStatStruct perStaStats; /* STA stats */ uint16_t staId; -} cdf_packed tSirSmeDisassocRsp, *tpSirSmeDisassocRsp; +} qdf_packed tSirSmeDisassocRsp, *tpSirSmeDisassocRsp; /* / Definition for Disassociation indication from peer */ typedef struct sSirSmeDisassocInd { @@ -1384,8 +1384,8 @@ typedef struct sSirSmeDisassocInd { uint8_t sessionId; /* Session Identifier */ uint16_t transactionId; /* Transaction Identifier with PE */ tSirResultCodes statusCode; - struct cdf_mac_addr bssid; - struct cdf_mac_addr peer_macaddr; + struct qdf_mac_addr bssid; + struct qdf_mac_addr peer_macaddr; tAniStaStatStruct perStaStats; /* STA stats */ uint16_t staId; uint32_t reasonCode; @@ -1397,8 +1397,8 @@ typedef struct sSirSmeDisassocCnf { uint16_t messageType; /* eWNI_SME_DISASSOC_CNF */ uint16_t length; tSirResultCodes statusCode; - struct cdf_mac_addr bssid; - struct cdf_mac_addr peer_macaddr; + struct qdf_mac_addr bssid; + struct qdf_mac_addr peer_macaddr; } tSirSmeDisassocCnf, *tpSirSmeDisassocCnf, tSirSmeDeauthCnf, *tpSirSmeDeauthCnf; @@ -1408,8 +1408,8 @@ typedef struct sSirSmeDeauthReq { uint16_t length; uint8_t sessionId; /* Session ID */ uint16_t transactionId; /* Transaction ID for cmd */ - struct cdf_mac_addr bssid; /* AP BSSID */ - struct cdf_mac_addr peer_macaddr; + struct qdf_mac_addr bssid; /* AP BSSID */ + struct qdf_mac_addr peer_macaddr; uint16_t reasonCode; } tSirSmeDeauthReq, *tpSirSmeDeauthReq; @@ -1420,7 +1420,7 @@ typedef struct sSirSmeDeauthRsp { uint8_t sessionId; /* Session ID */ uint16_t transactionId; /* Transaction ID for cmd */ tSirResultCodes statusCode; - struct cdf_mac_addr peer_macaddr; + struct qdf_mac_addr peer_macaddr; } tSirSmeDeauthRsp, *tpSirSmeDeauthRsp; /* / Definition for Deauthetication indication from peer */ @@ -1430,8 +1430,8 @@ typedef struct sSirSmeDeauthInd { uint8_t sessionId; /* Added for BT-AMP */ uint16_t transactionId; /* Added for BT-AMP */ tSirResultCodes statusCode; - struct cdf_mac_addr bssid; /* AP BSSID */ - struct cdf_mac_addr peer_macaddr; + struct qdf_mac_addr bssid; /* AP BSSID */ + struct qdf_mac_addr peer_macaddr; uint16_t staId; uint32_t reasonCode; @@ -1445,7 +1445,7 @@ typedef struct sSirSmeStopBssReq { uint8_t sessionId; /* Session ID */ uint16_t transactionId; /* tranSaction ID for cmd */ tSirResultCodes reasonCode; - struct cdf_mac_addr bssid; /* Self BSSID */ + struct qdf_mac_addr bssid; /* Self BSSID */ } tSirSmeStopBssReq, *tpSirSmeStopBssReq; /* / Definition for stop BSS response message */ @@ -1464,7 +1464,7 @@ typedef struct sSirSmeSwitchChannelInd { uint16_t length; uint8_t sessionId; uint16_t newChannelId; - struct cdf_mac_addr bssid; /* BSSID */ + struct qdf_mac_addr bssid; /* BSSID */ } tSirSmeSwitchChannelInd, *tpSirSmeSwitchChannelInd; /* / Definition for Neighbor BSS indication */ @@ -1484,7 +1484,7 @@ typedef struct sSirSmeMicFailureInd { uint16_t messageType; /* eWNI_SME_MIC_FAILURE_IND */ uint16_t length; uint8_t sessionId; - struct cdf_mac_addr bssId; + struct qdf_mac_addr bssId; tSirMicFailureInfo info; } tSirSmeMicFailureInd, *tpSirSmeMicFailureInd; @@ -1501,8 +1501,8 @@ typedef struct sSirSmeSetContextReq { uint16_t length; uint8_t sessionId; /* Session ID */ uint16_t transactionId; /* Transaction ID for cmd */ - struct cdf_mac_addr peer_macaddr; - struct cdf_mac_addr bssid; /* BSSID */ + struct qdf_mac_addr peer_macaddr; + struct qdf_mac_addr bssid; /* BSSID */ tSirKeyMaterial keyMaterial; } tSirSmeSetContextReq, *tpSirSmeSetContextReq; @@ -1514,7 +1514,7 @@ typedef struct sSirSmeSetContextRsp { uint8_t sessionId; /* Session ID */ uint16_t transactionId; /* Transaction ID for cmd */ tSirResultCodes statusCode; - struct cdf_mac_addr peer_macaddr; + struct qdf_mac_addr peer_macaddr; } tSirSmeSetContextRsp, *tpSirSmeSetContextRsp; /* / Statistic definitions */ @@ -1711,7 +1711,7 @@ typedef struct sAniGetTsmStatsReq { uint16_t msgLen; /* length of the entire request */ uint8_t staId; uint8_t tid; /* traffic id */ - struct cdf_mac_addr bssId; + struct qdf_mac_addr bssId; void *tsmStatsCallback; void *pDevContext; /* device context */ void *p_cds_context; /* cds context */ @@ -1835,8 +1835,8 @@ typedef struct sAniDHCPStopInd { uint16_t msgType; uint16_t msgLen; uint8_t device_mode; - struct cdf_mac_addr adapterMacAddr; - struct cdf_mac_addr peerMacAddr; + struct qdf_mac_addr adapterMacAddr; + struct qdf_mac_addr peerMacAddr; } tAniDHCPInd, *tpAniDHCPInd; typedef enum eTxRateInfo { @@ -1908,8 +1908,8 @@ typedef struct sSirTclasInfo { tSirMacTclasParamIPv4 ipv4; tSirMacTclasParamIPv6 ipv6; tSirMacTclasParam8021dq t8021dq; - } cdf_packed tclasParams; -} cdf_packed tSirTclasInfo; + } qdf_packed tclasParams; +} qdf_packed tSirTclasInfo; #if defined(FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_ESE_UPLOAD) #define TSRS_11AG_RATE_6MBPS 0xC @@ -1925,7 +1925,7 @@ typedef struct sSirMacESETSMIE { } tSirMacESETSMIE; typedef struct sTSMStats { uint8_t tid; - struct cdf_mac_addr bssid; + struct qdf_mac_addr bssid; tTrafStrmMetrics tsmMetrics; } tTSMStats, *tpTSMStats; typedef struct sEseTSMContext { @@ -1990,7 +1990,7 @@ typedef struct sSirAddtsReq { uint16_t length; uint8_t sessionId; /* Session ID */ uint16_t transactionId; - struct cdf_mac_addr bssid; /* BSSID */ + struct qdf_mac_addr bssid; /* BSSID */ uint32_t timeout; /* in ms */ uint8_t rspReqd; tSirAddtsReqInfo req; @@ -2010,9 +2010,9 @@ typedef struct sSirDeltsReq { uint16_t length; uint8_t sessionId; /* Session ID */ uint16_t transactionId; - struct cdf_mac_addr bssid; /* BSSID */ + struct qdf_mac_addr bssid; /* BSSID */ uint16_t aid; /* use 0 if macAddr is being specified */ - struct cdf_mac_addr macaddr; /* only on AP to specify the STA */ + struct qdf_mac_addr macaddr; /* only on AP to specify the STA */ uint8_t rspReqd; tSirDeltsReqInfo req; } tSirDeltsReq, *tpSirDeltsReq; @@ -2024,7 +2024,7 @@ typedef struct sSirDeltsRsp { uint16_t transactionId; /* sme transaction Id - for BT-AMP Support */ uint32_t rc; uint16_t aid; /* use 0 if macAddr is being specified */ - struct cdf_mac_addr macaddr; /* only on AP to specify the STA */ + struct qdf_mac_addr macaddr; /* only on AP to specify the STA */ tSirDeltsReqInfo rsp; } tSirDeltsRsp, *tpSirDeltsRsp; @@ -2038,7 +2038,7 @@ typedef struct sSirPlmReq { /* no of times the STA should cycle through PLM ch list */ uint8_t burstLen; int8_t desiredTxPwr; /* desired tx power */ - struct cdf_mac_addr mac_addr; /* MC dest addr */ + struct qdf_mac_addr mac_addr; /* MC dest addr */ /* no of channels */ uint8_t plmNumCh; /* channel numbers */ @@ -2061,7 +2061,7 @@ typedef struct sSirAggrQosReq { uint16_t length; uint8_t sessionId; /* Session ID */ uint16_t transactionId; - struct cdf_mac_addr bssid; /* BSSID */ + struct qdf_mac_addr bssid; /* BSSID */ uint32_t timeout; /* in ms */ uint8_t rspReqd; tSirAggrQosReqInfo aggrInfo; @@ -2092,7 +2092,7 @@ typedef struct sSmeIbssPeerInd { uint16_t mesgLen; uint8_t sessionId; - struct cdf_mac_addr peer_addr; + struct qdf_mac_addr peer_addr; uint16_t staId; /* @@ -2111,7 +2111,7 @@ typedef struct sSmeIbssPeerInd { typedef struct sSirIbssPeerInactivityInd { uint8_t bssIdx; uint8_t staIdx; - struct cdf_mac_addr peer_addr; + struct qdf_mac_addr peer_addr; } tSirIbssPeerInactivityInd, *tpSirIbssPeerInactivityInd; typedef struct sLimScanChn { @@ -2137,7 +2137,7 @@ typedef struct sLimScanChnInfo { typedef struct sSirSmeGetAssocSTAsReq { uint16_t messageType; /* eWNI_SME_GET_ASSOC_STAS_REQ */ uint16_t length; - struct cdf_mac_addr bssid; /* BSSID */ + struct qdf_mac_addr bssid; /* BSSID */ uint16_t modId; void *pUsrContext; void *pSapEventCallback; @@ -2150,13 +2150,13 @@ typedef struct sSmeMaxAssocInd { uint16_t mesgLen; uint8_t sessionId; /* the new peer that got rejected max assoc limit reached */ - struct cdf_mac_addr peer_mac; + struct qdf_mac_addr peer_mac; } tSmeMaxAssocInd, *tpSmeMaxAssocInd; typedef struct sSmeCsaOffloadInd { uint16_t mesgType; /* eWNI_SME_CSA_OFFLOAD_EVENT */ uint16_t mesgLen; - struct cdf_mac_addr bssid; /* BSSID */ + struct qdf_mac_addr bssid; /* BSSID */ } tSmeCsaOffloadInd, *tpSmeCsaOffloadInd; /* WOW related structures */ @@ -2201,7 +2201,7 @@ typedef struct sSirSmeWowlEnterParams { uint8_t ucMagicPktEnable; /* Magic pattern */ - struct cdf_mac_addr magic_ptrn; + struct qdf_mac_addr magic_ptrn; /* Enables/disables packet pattern filtering */ uint8_t ucPatternFilteringEnable; @@ -2234,7 +2234,7 @@ typedef struct sSirSmeWowlEnterParams { uint8_t ucWoWBSSConnLoss; #endif /* WLAN_WAKEUP_EVENTS */ - struct cdf_mac_addr bssid; + struct qdf_mac_addr bssid; } tSirSmeWowlEnterParams, *tpSirSmeWowlEnterParams; /* PE<->HAL: Enter WOWLAN parameters */ @@ -2245,7 +2245,7 @@ typedef struct sSirHalWowlEnterParams { uint8_t ucMagicPktEnable; /* Magic pattern */ - struct cdf_mac_addr magic_ptrn; + struct qdf_mac_addr magic_ptrn; /* Enables/disables packet pattern filtering in firmware. Enabling this flag enables broadcast pattern matching @@ -2458,7 +2458,7 @@ typedef struct sSirUpdateAPWPSIEsReq { uint16_t messageType; /* eWNI_SME_UPDATE_APWPSIE_REQ */ uint16_t length; uint16_t transactionId; /* Transaction ID for cmd */ - struct cdf_mac_addr bssid; /* BSSID */ + struct qdf_mac_addr bssid; /* BSSID */ uint8_t sessionId; /* Session ID */ tSirAPWPSIEs APWPSIEs; } tSirUpdateAPWPSIEsReq, *tpSirUpdateAPWPSIEsReq; @@ -2475,7 +2475,7 @@ typedef struct sSirChangeBIParams { uint16_t messageType; uint16_t length; uint16_t beaconInterval; /* Beacon Interval */ - struct cdf_mac_addr bssid; + struct qdf_mac_addr bssid; uint8_t sessionId; /* Session ID */ } tSirChangeBIParams, *tpSirChangeBIParams; @@ -2485,7 +2485,7 @@ typedef struct sSirSetHT2040Mode { uint16_t length; uint8_t cbMode; bool obssEnabled; - struct cdf_mac_addr bssid; + struct qdf_mac_addr bssid; uint8_t sessionId; /* Session ID */ } tSirSetHT2040Mode, *tpSirSetHT2040Mode; #endif @@ -2494,7 +2494,7 @@ typedef struct sSirSetHT2040Mode { typedef struct sSirWPSPBCSession { struct sSirWPSPBCSession *next; - struct cdf_mac_addr addr; + struct qdf_mac_addr addr; uint8_t uuid_e[SIR_WPS_UUID_LEN]; uint32_t timestamp; } tSirWPSPBCSession; @@ -2504,13 +2504,13 @@ typedef struct sSirSmeGetWPSPBCSessionsReq { uint16_t length; void *pUsrContext; void *pSapEventCallback; - struct cdf_mac_addr bssid; /* BSSID */ + struct qdf_mac_addr bssid; /* BSSID */ /* MAC Address of STA in WPS Session to be removed */ - struct cdf_mac_addr remove_mac; + struct qdf_mac_addr remove_mac; } tSirSmeGetWPSPBCSessionsReq, *tpSirSmeGetWPSPBCSessionsReq; typedef struct sSirWPSPBCProbeReq { - struct cdf_mac_addr peer_macaddr; + struct qdf_mac_addr peer_macaddr; uint16_t probeReqIELen; uint8_t probeReqIE[512]; } tSirWPSPBCProbeReq, *tpSirWPSPBCProbeReq; @@ -2520,7 +2520,7 @@ typedef struct sSirSmeProbeReqInd { uint16_t messageType; /* eWNI_SME_WPS_PBC_PROBE_REQ_IND */ uint16_t length; uint8_t sessionId; - struct cdf_mac_addr bssid; + struct qdf_mac_addr bssid; tSirWPSPBCProbeReq WPSPBCProbeReq; } tSirSmeProbeReqInd, *tpSirSmeProbeReqInd; @@ -2528,7 +2528,7 @@ typedef struct sSirUpdateAPWPARSNIEsReq { uint16_t messageType; /* eWNI_SME_SET_APWPARSNIEs_REQ */ uint16_t length; uint16_t transactionId; /* Transaction ID for cmd */ - struct cdf_mac_addr bssid; /* BSSID */ + struct qdf_mac_addr bssid; /* BSSID */ uint8_t sessionId; /* Session ID */ tSirRSNie APWPARSNIEs; } tSirUpdateAPWPARSNIEsReq, *tpSirUpdateAPWPARSNIEsReq; @@ -2567,7 +2567,7 @@ typedef struct sSirNsOffloadReq { uint8_t srcIPv6Addr[SIR_MAC_IPV6_ADDR_LEN]; uint8_t selfIPv6Addr[SIR_MAC_NUM_TARGET_IPV6_NS_OFFLOAD_NA][SIR_MAC_IPV6_ADDR_LEN]; uint8_t targetIPv6Addr[SIR_MAC_NUM_TARGET_IPV6_NS_OFFLOAD_NA][SIR_MAC_IPV6_ADDR_LEN]; - struct cdf_mac_addr self_macaddr; + struct qdf_mac_addr self_macaddr; uint8_t srcIPv6AddrValid; uint8_t targetIPv6AddrValid[SIR_MAC_NUM_TARGET_IPV6_NS_OFFLOAD_NA]; uint8_t slotIdx; @@ -2585,7 +2585,7 @@ typedef struct sSirHostOffloadReq { #ifdef WLAN_NS_OFFLOAD tSirNsOffloadReq nsOffloadInfo; #endif /* WLAN_NS_OFFLOAD */ - struct cdf_mac_addr bssid; + struct qdf_mac_addr bssid; } tSirHostOffloadReq, *tpSirHostOffloadReq; /* Packet Types. */ @@ -2598,8 +2598,8 @@ typedef struct sSirKeepAliveReq { uint32_t timePeriod; tSirIpv4Addr hostIpv4Addr; tSirIpv4Addr destIpv4Addr; - struct cdf_mac_addr dest_macaddr; - struct cdf_mac_addr bssid; + struct qdf_mac_addr dest_macaddr; + struct qdf_mac_addr bssid; uint8_t sessionId; } tSirKeepAliveReq, *tpSirKeepAliveReq; @@ -2674,7 +2674,7 @@ typedef struct { typedef struct { uint8_t vdev_id; - struct cdf_mac_addr wakee_mac_addr; + struct qdf_mac_addr wakee_mac_addr; uint8_t identification_id[8]; uint8_t password[16]; uint32_t id_length; @@ -2703,7 +2703,7 @@ typedef struct { uint32_t keepalive_max; /* Maximum ping interval */ uint32_t keepalive_inc; /* Increment of ping interval */ - struct cdf_mac_addr gateway_mac; + struct qdf_mac_addr gateway_mac; uint32_t tcp_tx_timeout_val; uint32_t tcp_rx_timeout_val; } tSirAppType2Params, *tpSirAppType2Params; @@ -2718,8 +2718,8 @@ typedef struct sSirWlanSetRxpFilters { #define ANI_MAX_IBSS_ROUTE_TABLE_ENTRY 100 typedef struct sAniDestIpNextHopMacPair { - uint8_t destIpv4Addr[CDF_IPV4_ADDR_SIZE]; - uint8_t nextHopMacAddr[CDF_MAC_ADDR_SIZE]; + uint8_t destIpv4Addr[QDF_IPV4_ADDR_SIZE]; + uint8_t nextHopMacAddr[QDF_MAC_ADDR_SIZE]; } tAniDestIpNextHopMacPair; typedef struct sAniIbssRouteTable { @@ -2837,7 +2837,7 @@ typedef struct { typedef struct { tSirMacSSid ssId; - uint8_t currAPbssid[CDF_MAC_ADDR_SIZE]; + uint8_t currAPbssid[QDF_MAC_ADDR_SIZE]; uint32_t authentication; uint8_t encryption; uint8_t mcencryption; @@ -2904,8 +2904,8 @@ struct roam_ext_params { uint8_t num_ssid_allowed_list; uint8_t num_bssid_favored; tSirMacSSid ssid_allowed_list[MAX_SSID_ALLOWED_LIST]; - struct cdf_mac_addr bssid_avoid_list[MAX_BSSID_AVOID_LIST]; - struct cdf_mac_addr bssid_favored[MAX_BSSID_FAVORED]; + struct qdf_mac_addr bssid_avoid_list[MAX_BSSID_AVOID_LIST]; + struct qdf_mac_addr bssid_favored[MAX_BSSID_FAVORED]; uint8_t bssid_favored_factor[MAX_BSSID_FAVORED]; int raise_rssi_thresh_5g; int drop_rssi_thresh_5g; @@ -3053,8 +3053,8 @@ typedef struct sSirRcvPktFilterCfg { eSirReceivePacketFilterType filterType; uint32_t numFieldParams; uint32_t coalesceTime; - struct cdf_mac_addr self_macaddr; - struct cdf_mac_addr bssid; /* Bssid of the connected AP */ + struct qdf_mac_addr self_macaddr; + struct qdf_mac_addr bssid; /* Bssid of the connected AP */ tSirRcvPktFilterFieldParams paramsData[SIR_MAX_NUM_TESTS_PER_FILTER]; } tSirRcvPktFilterCfgType, *tpSirRcvPktFilterCfgType; @@ -3073,7 +3073,7 @@ typedef struct sSirRcvFltPktMatchRsp { /* Success or Failure */ uint32_t status; tSirRcvFltPktMatchCnt filterMatchCnt[SIR_MAX_NUM_FILTERS]; - struct cdf_mac_addr bssid; + struct qdf_mac_addr bssid; } tSirRcvFltPktMatchRsp, *tpSirRcvFltPktMatchRsp; /* */ @@ -3082,8 +3082,8 @@ typedef struct sSirRcvFltPktMatchRsp { typedef struct sSirRcvFltPktClearParam { uint32_t status; /* only valid for response message */ uint8_t filterId; - struct cdf_mac_addr self_macaddr; - struct cdf_mac_addr bssid; + struct qdf_mac_addr self_macaddr; + struct qdf_mac_addr bssid; } tSirRcvFltPktClearParam, *tpSirRcvFltPktClearParam; /* */ @@ -3091,9 +3091,9 @@ typedef struct sSirRcvFltPktClearParam { /* */ typedef struct sSirRcvFltMcAddrList { uint32_t ulMulticastAddrCnt; - struct cdf_mac_addr multicastAddr[SIR_MAX_NUM_MULTICAST_ADDRESS]; - struct cdf_mac_addr self_macaddr; - struct cdf_mac_addr bssid; + struct qdf_mac_addr multicastAddr[SIR_MAX_NUM_MULTICAST_ADDRESS]; + struct qdf_mac_addr self_macaddr; + struct qdf_mac_addr bssid; uint8_t action; } tSirRcvFltMcAddrList, *tpSirRcvFltMcAddrList; #endif /* WLAN_FEATURE_PACKET_FILTERING */ @@ -3117,7 +3117,7 @@ typedef struct { uint8_t aKCK[16]; /* Key confirmation key */ uint8_t aKEK[16]; /* key encryption key */ uint64_t ullKeyReplayCounter; /* replay counter */ - struct cdf_mac_addr bssid; + struct qdf_mac_addr bssid; } tSirGtkOffloadParams, *tpSirGtkOffloadParams; /*--------------------------------------------------------------------------- @@ -3132,7 +3132,7 @@ typedef struct { uint32_t ulTotalRekeyCount; /* total rekey attempts */ uint32_t ulGTKRekeyCount; /* successful GTK rekeys */ uint32_t ulIGTKRekeyCount; /* successful iGTK rekeys */ - struct cdf_mac_addr bssid; + struct qdf_mac_addr bssid; } tSirGtkOffloadGetInfoRspParams, *tpSirGtkOffloadGetInfoRspParams; #endif /* WLAN_FEATURE_GTK_OFFLOAD */ @@ -3359,8 +3359,8 @@ typedef struct sSirTdlsSendMgmtReq { uint8_t responder; uint32_t peerCapability; /* For multi-session, for PE to locate peSession ID */ - struct cdf_mac_addr bssid; - struct cdf_mac_addr peer_mac; + struct qdf_mac_addr bssid; + struct qdf_mac_addr peer_mac; /* Variable length. Dont add any field after this. */ uint8_t addIe[1]; } tSirTdlsSendMgmtReq, *tpSirSmeTdlsSendMgmtReq; @@ -3378,9 +3378,9 @@ typedef struct sSirTdlsAddStaReq { uint8_t sessionId; /* Session ID */ uint16_t transactionId; /* Transaction ID for cmd */ /* For multi-session, for PE to locate peSession ID */ - struct cdf_mac_addr bssid; + struct qdf_mac_addr bssid; eTdlsAddOper tdlsAddOper; - struct cdf_mac_addr peermac; + struct qdf_mac_addr peermac; uint16_t capability; uint8_t extn_capability[SIR_MAC_MAX_EXTN_CAP]; uint8_t supported_rates_length; @@ -3398,7 +3398,7 @@ typedef struct sSirTdlsAddStaRsp { uint16_t messageType; uint16_t length; tSirResultCodes statusCode; - struct cdf_mac_addr peermac; + struct qdf_mac_addr peermac; uint8_t sessionId; /* Session ID */ uint16_t staId; uint16_t staType; @@ -3420,8 +3420,8 @@ typedef struct { uint8_t isOffChannelSupported; uint8_t isResponder; /* Is Peer a responder. */ /* For multi-session, for PE to locate peSession ID */ - struct cdf_mac_addr bssid; - struct cdf_mac_addr peermac; + struct qdf_mac_addr bssid; + struct qdf_mac_addr peermac; uint8_t supportedChannelsLen; uint8_t supportedChannels[SIR_MAC_MAX_SUPP_CHANNELS]; uint8_t supportedOperClassesLen; @@ -3435,7 +3435,7 @@ typedef struct { uint8_t sessionId; /* Session ID */ uint16_t transactionId; /* Transaction ID for cmd */ tSirResultCodes statusCode; - struct cdf_mac_addr peermac; + struct qdf_mac_addr peermac; } tSirTdlsLinkEstablishReqRsp, *tpSirTdlsLinkEstablishReqRsp; /* TDLS Request struct SME-->PE */ @@ -3445,8 +3445,8 @@ typedef struct sSirTdlsDelStaReq { uint8_t sessionId; /* Session ID */ uint16_t transactionId; /* Transaction ID for cmd */ /* For multi-session, for PE to locate peSession ID */ - struct cdf_mac_addr bssid; - struct cdf_mac_addr peermac; + struct qdf_mac_addr bssid; + struct qdf_mac_addr peermac; } tSirTdlsDelStaReq, *tpSirSmeTdlsDelStaReq; /* TDLS Response struct PE-->SME */ typedef struct sSirTdlsDelStaRsp { @@ -3454,7 +3454,7 @@ typedef struct sSirTdlsDelStaRsp { uint16_t length; uint8_t sessionId; /* Session ID */ tSirResultCodes statusCode; - struct cdf_mac_addr peermac; + struct qdf_mac_addr peermac; uint16_t staId; } tSirTdlsDelStaRsp, *tpSirTdlsDelStaRsp; /* TDLS Delete Indication struct PE-->SME */ @@ -3462,7 +3462,7 @@ typedef struct sSirTdlsDelStaInd { uint16_t messageType; uint16_t length; uint8_t sessionId; /* Session ID */ - struct cdf_mac_addr peermac; + struct qdf_mac_addr peermac; uint16_t staId; uint16_t reasonCode; } tSirTdlsDelStaInd, *tpSirTdlsDelStaInd; @@ -3480,7 +3480,7 @@ typedef struct sSirMgmtTxCompletionInd { typedef struct sSirTdlsEventnotify { uint8_t sessionId; - struct cdf_mac_addr peermac; + struct qdf_mac_addr peermac; uint16_t messageType; uint32_t peer_reason; } tSirTdlsEventnotify; @@ -3496,7 +3496,7 @@ typedef struct sSirActiveModeSetBcnFilterReq { typedef struct sSirResetAPCapsChange { uint16_t messageType; uint16_t length; - struct cdf_mac_addr bssId; + struct qdf_mac_addr bssId; } tSirResetAPCapsChange, *tpSirResetAPCapsChange; /* / Definition for Candidate found indication from FW */ @@ -3509,7 +3509,7 @@ typedef struct sSirSmeCandidateFoundInd { #ifdef WLAN_FEATURE_11W typedef struct sSirWlanExcludeUnencryptParam { bool excludeUnencrypt; - struct cdf_mac_addr bssid; + struct qdf_mac_addr bssid; } tSirWlanExcludeUnencryptParam, *tpSirWlanExcludeUnencryptParam; #endif @@ -3523,7 +3523,7 @@ typedef struct sAniHandoffReq { uint16_t msgType; /* message type is same as the request type */ uint16_t msgLen; /* length of the entire request */ uint8_t sessionId; - uint8_t bssid[CDF_MAC_ADDR_SIZE]; + uint8_t bssid[QDF_MAC_ADDR_SIZE]; uint8_t channel; uint8_t handoff_src; } tAniHandoffReq, *tpAniHandoffReq; @@ -3547,11 +3547,11 @@ typedef struct sAniHandoffReq { typedef struct sSirScanOffloadReq { uint8_t sessionId; - struct cdf_mac_addr bssId; + struct qdf_mac_addr bssId; uint8_t numSsid; tSirMacSSid ssId[SIR_SCAN_MAX_NUM_SSID]; uint8_t hiddenSsid; - struct cdf_mac_addr selfMacAddr; + struct qdf_mac_addr selfMacAddr; tSirBssType bssType; uint8_t dot11mode; tSirScanType scanType; @@ -3658,7 +3658,7 @@ typedef struct sSirLPHBTcpParamStruct { uint16_t dst_port; uint16_t timeout; uint8_t session; - struct cdf_mac_addr gateway_mac; + struct qdf_mac_addr gateway_mac; uint16_t timePeriodSec; /* in seconds */ uint32_t tcpSn; } tSirLPHBTcpParamStruct; @@ -3678,7 +3678,7 @@ typedef struct sSirLPHBUdpParamStruct { uint16_t interval; uint16_t timeout; uint8_t session; - struct cdf_mac_addr gateway_mac; + struct qdf_mac_addr gateway_mac; } tSirLPHBUdpParamStruct; typedef struct sSirLPHBUdpFilterStruct { @@ -3715,13 +3715,13 @@ typedef struct sSirChAvoidUpdateReq { typedef struct sSirLinkSpeedInfo { /* MAC Address for the peer */ - struct cdf_mac_addr peer_macaddr; + struct qdf_mac_addr peer_macaddr; uint32_t estLinkSpeed; /* Linkspeed from firmware */ } tSirLinkSpeedInfo, *tpSirLinkSpeedInfo; typedef struct sSirAddPeriodicTxPtrn { /* MAC Address for the adapter */ - struct cdf_mac_addr mac_address; + struct qdf_mac_addr mac_address; uint8_t ucPtrnId; /* Pattern ID */ uint16_t ucPtrnSize; /* Pattern size */ uint32_t usPtrnIntervalMs; /* In msec */ @@ -3730,7 +3730,7 @@ typedef struct sSirAddPeriodicTxPtrn { typedef struct sSirDelPeriodicTxPtrn { /* MAC Address for the adapter */ - struct cdf_mac_addr mac_address; + struct qdf_mac_addr mac_address; /* Bitmap of pattern IDs that need to be deleted */ uint32_t ucPatternIdBitmap; uint8_t ucPtrnId; /* Pattern ID */ @@ -3750,8 +3750,8 @@ typedef struct { #endif typedef struct sSirRateUpdateInd { uint8_t nss; /* 0: 1x1, 1: 2x2 */ - struct cdf_mac_addr bssid; - enum tCDF_ADAPTER_MODE dev_mode; + struct qdf_mac_addr bssid; + enum tQDF_ADAPTER_MODE dev_mode; int32_t bcastDataRate; /* bcast rate unit Mbpsx10, -1:not used */ /* * 0 implies RA, positive value implies fixed rate, -1 implies ignore @@ -3828,7 +3828,7 @@ typedef struct sSirChanChangeRequest { phy_ch_width ch_width; uint8_t center_freq_seg_0; uint8_t center_freq_seg_1; - uint8_t bssid[CDF_MAC_ADDR_SIZE]; + uint8_t bssid[QDF_MAC_ADDR_SIZE]; uint32_t dot11mode; tSirMacRateSet operational_rateset; tSirMacRateSet extended_rateset; @@ -3845,7 +3845,7 @@ typedef struct sSirStartBeaconIndication { uint16_t messageType; uint16_t messageLen; uint8_t beaconStartStatus; - uint8_t bssid[CDF_MAC_ADDR_SIZE]; + uint8_t bssid[QDF_MAC_ADDR_SIZE]; } tSirStartBeaconIndication, *tpSirStartBeaconIndication; /* additional IE type */ @@ -3863,7 +3863,7 @@ typedef enum tUpdateIEsType { /* Modify particular IE in addition IE for prob resp Bcn */ typedef struct sSirModifyIE { - struct cdf_mac_addr bssid; + struct qdf_mac_addr bssid; uint16_t smeSessionId; bool notify; uint8_t ieID; @@ -3883,7 +3883,7 @@ typedef struct sSirModifyIEsInd { /* Message format for Update IE message sent to PE */ typedef struct sSirUpdateIE { - struct cdf_mac_addr bssid; + struct qdf_mac_addr bssid; uint16_t smeSessionId; bool append; bool notify; @@ -3905,7 +3905,7 @@ typedef struct sSirDfsCsaIeRequest { uint16_t msgLen; uint8_t targetChannel; uint8_t csaIeRequired; - uint8_t bssid[CDF_MAC_ADDR_SIZE]; + uint8_t bssid[QDF_MAC_ADDR_SIZE]; struct ch_params_s ch_params; } tSirDfsCsaIeRequest, *tpSirDfsCsaIeRequest; @@ -3983,7 +3983,7 @@ typedef struct sSirSmeRoamOffloadSynchInd { uint16_t reassoc_req_length; uint8_t isBeacon; uint8_t roamedVdevId; - struct cdf_mac_addr bssid; + struct qdf_mac_addr bssid; int8_t txMgmtPower; uint32_t authStatus; uint8_t rssi; @@ -4052,7 +4052,7 @@ enum extscan_configuration_flags { }; typedef struct { - struct cdf_mac_addr bssid; + struct qdf_mac_addr bssid; /* Low threshold */ int32_t low; @@ -4130,7 +4130,7 @@ typedef struct { /* Null terminated SSID */ uint8_t ssid[SIR_MAC_MAX_SSID_LENGTH + 1]; - struct cdf_mac_addr bssid; + struct qdf_mac_addr bssid; /* Frequency in MHz */ uint32_t channel; @@ -4443,7 +4443,7 @@ typedef struct { } tSirExtScanSetSigChangeReqParams, *tpSirExtScanSetSigChangeReqParams; typedef struct { - struct cdf_mac_addr bssid; + struct qdf_mac_addr bssid; uint32_t channel; uint32_t numOfRssi; @@ -4659,7 +4659,7 @@ typedef struct { /* interface mode */ uint8_t mode; /* interface mac address (self) */ - struct cdf_mac_addr macAddr; + struct qdf_mac_addr macAddr; /* tSirWifiConnectionState */ /* connection state (valid for STA, CLI only) */ uint8_t state; @@ -4671,7 +4671,7 @@ typedef struct { /* null terminated SSID */ uint8_t ssid[33]; /* bssid */ - struct cdf_mac_addr bssid; + struct qdf_mac_addr bssid; /* country string advertised by AP */ uint8_t apCountryStr[WNI_CFG_COUNTRY_CODE_LEN]; /* country string for this association */ @@ -4804,7 +4804,7 @@ typedef struct { /* peer type (AP, TDLS, GO etc.) */ tSirWifiPeerType type; /* mac address */ - struct cdf_mac_addr peerMacAddress; + struct qdf_mac_addr peerMacAddress; /* peer WIFI_CAPABILITY_XXX */ uint32_t capabilities; /* number of rates */ @@ -5072,7 +5072,7 @@ struct rssi_breach_event { uint32_t request_id; uint32_t session_id; int8_t curr_rssi; - struct cdf_mac_addr curr_bssid; + struct qdf_mac_addr curr_bssid; }; #define MAX_NUM_FW_SEGMENTS 4 @@ -5235,7 +5235,7 @@ typedef void (*dcc_stats_event_callback_t)(void *hdd_ctx, uint32_t vdev_id, struct sir_ocb_config_channel { uint32_t chan_freq; uint32_t bandwidth; - struct cdf_mac_addr mac_address; + struct qdf_mac_addr mac_address; struct sir_qos_params qos_params[MAX_NUM_AC]; uint32_t max_pwr; uint32_t min_pwr; @@ -5462,9 +5462,9 @@ struct gateway_param_update_req { uint32_t timeout; uint32_t ipv4_addr_type; uint32_t ipv6_addr_type; - struct cdf_mac_addr gw_mac_addr; - uint8_t ipv4_addr[CDF_IPV4_ADDR_SIZE]; - uint8_t ipv6_addr[CDF_IPV6_ADDR_SIZE]; + struct qdf_mac_addr gw_mac_addr; + uint8_t ipv4_addr[QDF_IPV4_ADDR_SIZE]; + uint8_t ipv6_addr[QDF_IPV6_ADDR_SIZE]; }; #else struct gateway_param_update_req; diff --git a/core/mac/inc/sir_mac_prot_def.h b/core/mac/inc/sir_mac_prot_def.h index 144aa89d94..ed4fa0b7b3 100644 --- a/core/mac/inc/sir_mac_prot_def.h +++ b/core/mac/inc/sir_mac_prot_def.h @@ -800,7 +800,7 @@ typedef struct sSirMacFrameCtl { #endif -} cdf_packed tSirMacFrameCtl, *tpSirMacFrameCtl; +} qdf_packed tSirMacFrameCtl, *tpSirMacFrameCtl; /* / Sequence control field */ typedef struct sSirMacSeqCtl { @@ -819,7 +819,7 @@ typedef struct sSirMacSeqCtl { uint8_t seqNumHi:8; #endif -} cdf_packed tSirMacSeqCtl, *tpSirMacSeqCtl; +} qdf_packed tSirMacSeqCtl, *tpSirMacSeqCtl; /* / QoS control field */ typedef struct sSirMacQosCtl { @@ -843,7 +843,7 @@ typedef struct sSirMacQosCtl { uint8_t txop:8; #endif -} cdf_packed tSirMacQosCtl, *tpSirMacQosCtl; +} qdf_packed tSirMacQosCtl, *tpSirMacQosCtl; /* / Length (in bytes) of MAC header in 3 address format */ #define SIR_MAC_HDR_LEN_3A 24 @@ -855,7 +855,7 @@ typedef struct sSirMacDot3Hdr { tSirMacAddr da; tSirMacAddr sa; uint16_t length; -} cdf_packed tSirMacDot3Hdr, *tpSirMacDot3Hdr; +} qdf_packed tSirMacDot3Hdr, *tpSirMacDot3Hdr; /* / 3 address MAC data header format (24/26 bytes) */ typedef struct sSirMacDataHdr3a { @@ -867,7 +867,7 @@ typedef struct sSirMacDataHdr3a { tSirMacAddr addr3; tSirMacSeqCtl seqControl; tSirMacQosCtl qosControl; -} cdf_packed tSirMacDataHdr3a, *tpSirMacDataHdr3a; +} qdf_packed tSirMacDataHdr3a, *tpSirMacDataHdr3a; /* / Management header format */ typedef struct sSirMacMgmtHdr { @@ -878,7 +878,7 @@ typedef struct sSirMacMgmtHdr { tSirMacAddr sa; tSirMacAddr bssId; tSirMacSeqCtl seqControl; -} cdf_packed tSirMacMgmtHdr, *tpSirMacMgmtHdr; +} qdf_packed tSirMacMgmtHdr, *tpSirMacMgmtHdr; /* / ERP information field */ typedef struct sSirMacErpInfo { @@ -893,7 +893,7 @@ typedef struct sSirMacErpInfo { uint8_t barkerPreambleMode:1; uint8_t reserved:5; #endif -} cdf_packed tSirMacErpInfo, *tpSirMacErpInfo; +} qdf_packed tSirMacErpInfo, *tpSirMacErpInfo; /* / Capability information field */ typedef struct sSirMacCapabilityInfo { @@ -932,14 +932,14 @@ typedef struct sSirMacCapabilityInfo { uint16_t delayedBA:1; uint16_t immediateBA:1; #endif -} cdf_packed tSirMacCapabilityInfo, *tpSirMacCapabilityInfo; +} qdf_packed tSirMacCapabilityInfo, *tpSirMacCapabilityInfo; typedef struct sSirMacCfParamSet { uint8_t cfpCount; uint8_t cfpPeriod; uint16_t cfpMaxDuration; uint16_t cfpDurRemaining; -} cdf_packed tSirMacCfParamSet; +} qdf_packed tSirMacCfParamSet; typedef struct sSirMacTim { uint8_t dtimCount; @@ -947,7 +947,7 @@ typedef struct sSirMacTim { uint8_t bitmapControl; uint8_t bitmapLength; uint8_t bitmap[251]; -} cdf_packed tSirMacTim; +} qdf_packed tSirMacTim; /* 12 Bytes long because this structure can be used to represent rate */ /* and extended rate set IEs */ @@ -955,22 +955,22 @@ typedef struct sSirMacTim { typedef struct sSirMacRateSet { uint8_t numRates; uint8_t rate[SIR_MAC_RATESET_EID_MAX]; -} cdf_packed tSirMacRateSet; +} qdf_packed tSirMacRateSet; typedef struct sSirMacSSid { uint8_t length; uint8_t ssId[SIR_MAC_MAX_SSID_LENGTH]; -} cdf_packed tSirMacSSid; +} qdf_packed tSirMacSSid; typedef struct sSirMacWpaInfo { uint8_t length; uint8_t info[SIR_MAC_MAX_IE_LENGTH]; -} cdf_packed tSirMacWpaInfo, *tpSirMacWpaInfo, +} qdf_packed tSirMacWpaInfo, *tpSirMacWpaInfo, tSirMacRsnInfo, *tpSirMacRsnInfo; typedef struct sSirMacWapiInfo { uint8_t length; uint8_t info[SIR_MAC_MAX_IE_LENGTH]; -} cdf_packed tSirMacWapiInfo, *tpSirMacWapiInfo, +} qdf_packed tSirMacWapiInfo, *tpSirMacWapiInfo, tSirMacWapiInfo, *tpSirMacWapiInfo; typedef struct sSirMacFHParamSet { @@ -1082,7 +1082,7 @@ typedef struct sSirMacAciAifsn { uint8_t aci:2; uint8_t rsvd:1; #endif -} cdf_packed tSirMacAciAifsn; +} qdf_packed tSirMacAciAifsn; /* contention window size */ typedef struct sSirMacCW { @@ -1093,13 +1093,13 @@ typedef struct sSirMacCW { uint8_t min:4; uint8_t max:4; #endif -} cdf_packed tSirMacCW; +} qdf_packed tSirMacCW; typedef struct sSirMacEdcaParamRecord { tSirMacAciAifsn aci; tSirMacCW cw; uint16_t txoplimit; -} cdf_packed tSirMacEdcaParamRecord; +} qdf_packed tSirMacEdcaParamRecord; typedef struct sSirMacQosInfo { #ifndef ANI_LITTLE_BIT_ENDIAN @@ -1115,7 +1115,7 @@ typedef struct sSirMacQosInfo { uint8_t txopreq:1; uint8_t uapsd:1; #endif -} cdf_packed tSirMacQosInfo; +} qdf_packed tSirMacQosInfo; typedef struct sSirMacQosInfoStation { #ifdef ANI_LITTLE_BIT_ENDIAN @@ -1135,7 +1135,7 @@ typedef struct sSirMacQosInfoStation { uint8_t acvi_uapsd:1; uint8_t acvo_uapsd:1; #endif -} cdf_packed tSirMacQosInfoStation, *tpSirMacQosInfoStation; +} qdf_packed tSirMacQosInfoStation, *tpSirMacQosInfoStation; typedef struct sSirMacEdcaParamSetIE { uint8_t type; @@ -1146,14 +1146,14 @@ typedef struct sSirMacEdcaParamSetIE { tSirMacEdcaParamRecord acbk; /* background */ tSirMacEdcaParamRecord acvi; /* video */ tSirMacEdcaParamRecord acvo; /* voice */ -} cdf_packed tSirMacEdcaParamSetIE; +} qdf_packed tSirMacEdcaParamSetIE; typedef struct sSirMacQoSParams { uint8_t count; uint16_t limit; uint8_t CWmin[8]; uint8_t AIFS[8]; -} cdf_packed tSirMacQoSParams; +} qdf_packed tSirMacQoSParams; /* ts info direction field can take any of these values */ #define SIR_MAC_DIRECTION_UPLINK 0 @@ -1195,7 +1195,7 @@ typedef struct sSirMacTSInfoTfc { uint16_t userPrio:3; uint16_t ackPolicy:2; #endif -} cdf_packed tSirMacTSInfoTfc; +} qdf_packed tSirMacTSInfoTfc; typedef struct sSirMacTSInfoSch { #ifndef ANI_LITTLE_BIT_ENDIAN @@ -1205,12 +1205,12 @@ typedef struct sSirMacTSInfoSch { uint8_t schedule:1; uint8_t rsvd:7; #endif -} cdf_packed tSirMacTSInfoSch; +} qdf_packed tSirMacTSInfoSch; typedef struct sSirMacTSInfo { tSirMacTSInfoTfc traffic; tSirMacTSInfoSch schedule; -} cdf_packed tSirMacTSInfo; +} qdf_packed tSirMacTSInfo; typedef struct sSirMacTspecIE { uint8_t type; @@ -1231,7 +1231,7 @@ typedef struct sSirMacTspecIE { uint32_t minPhyRate; uint16_t surplusBw; uint16_t mediumTime; -} cdf_packed tSirMacTspecIE; +} qdf_packed tSirMacTspecIE; /* frame classifier types */ #define SIR_MAC_TCLASTYPE_ETHERNET 0 @@ -1243,7 +1243,7 @@ typedef struct sSirMacTclasParamEthernet { tSirMacAddr srcAddr; tSirMacAddr dstAddr; uint16_t type; -} cdf_packed tSirMacTclasParamEthernet; +} qdf_packed tSirMacTclasParamEthernet; typedef struct sSirMacTclasParamIPv4 { uint8_t version; @@ -1254,7 +1254,7 @@ typedef struct sSirMacTclasParamIPv4 { uint8_t dscp; uint8_t protocol; uint8_t rsvd; -} cdf_packed tSirMacTclasParamIPv4; +} qdf_packed tSirMacTclasParamIPv4; #define SIR_MAC_TCLAS_IPV4 4 #define SIR_MAC_TCLAS_IPV6 6 @@ -1266,11 +1266,11 @@ typedef struct sSirMacTclasParamIPv6 { uint16_t srcPort; uint16_t dstPort; uint8_t flowLabel[3]; -} cdf_packed tSirMacTclasParamIPv6; +} qdf_packed tSirMacTclasParamIPv6; typedef struct sSirMacTclasParam8021dq { uint16_t tag; -} cdf_packed tSirMacTclasParam8021dq; +} qdf_packed tSirMacTclasParam8021dq; typedef struct sSirMacTclasIE { uint8_t type; @@ -1278,13 +1278,13 @@ typedef struct sSirMacTclasIE { uint8_t userPrio; uint8_t classifierType; uint8_t classifierMask; -} cdf_packed tSirMacTclasIE; +} qdf_packed tSirMacTclasIE; typedef struct sSirMacTsDelayIE { uint8_t type; uint8_t length; uint32_t delay; -} cdf_packed tSirMacTsDelayIE; +} qdf_packed tSirMacTsDelayIE; typedef struct sSirMacScheduleInfo { #ifndef ANI_LITTLE_BIT_ENDIAN @@ -1298,7 +1298,7 @@ typedef struct sSirMacScheduleInfo { uint16_t direction:2; uint16_t rsvd:9; #endif -} cdf_packed tSirMacScheduleInfo; +} qdf_packed tSirMacScheduleInfo; typedef struct sSirMacScheduleIE { uint8_t type; @@ -1308,19 +1308,19 @@ typedef struct sSirMacScheduleIE { uint32_t svcInterval; uint16_t maxSvcDuration; uint16_t specInterval; -} cdf_packed tSirMacScheduleIE; +} qdf_packed tSirMacScheduleIE; typedef struct sSirMacQosCapabilityIE { uint8_t type; uint8_t length; tSirMacQosInfo qosInfo; -} cdf_packed tSirMacQosCapabilityIE; +} qdf_packed tSirMacQosCapabilityIE; typedef struct sSirMacQosCapabilityStaIE { uint8_t type; uint8_t length; tSirMacQosInfoStation qosInfo; -} cdf_packed tSirMacQosCapabilityStaIE; +} qdf_packed tSirMacQosCapabilityStaIE; typedef uint32_t tSirMacTimeStamp[2]; @@ -1334,36 +1334,36 @@ typedef uint8_t tSirMacChanNum; typedef struct sSirMacSSidIE { uint8_t type; tSirMacSSid ssId; -} cdf_packed tSirMacSSidIE; +} qdf_packed tSirMacSSidIE; typedef struct sSirMacRateSetIE { uint8_t type; tSirMacRateSet supportedRateSet; -} cdf_packed tSirMacRateSetIE; +} qdf_packed tSirMacRateSetIE; typedef struct sSirMacDsParamSetIE { uint8_t type; uint8_t length; tSirMacChanNum channelNumber; -} cdf_packed tSirMacDsParamSetIE; +} qdf_packed tSirMacDsParamSetIE; typedef struct sSirMacCfParamSetIE { uint8_t type; uint8_t length; tSirMacCfParamSet cfParams; -} cdf_packed tSirMacCfParamSetIE; +} qdf_packed tSirMacCfParamSetIE; typedef struct sSirMacChanInfo { tSirMacChanNum firstChanNum; uint8_t numChannels; int8_t maxTxPower; -} cdf_packed tSirMacChanInfo; +} qdf_packed tSirMacChanInfo; typedef struct sSirMacNonErpPresentIE { uint8_t type; uint8_t length; uint8_t erp; -} cdf_packed tSirMacNonErpPresentIE; +} qdf_packed tSirMacNonErpPresentIE; typedef struct sSirMacPowerCapabilityIE { uint8_t type; @@ -1444,7 +1444,7 @@ typedef struct sSirMacVHTCapabilityInfo { uint32_t txAntPattern:1; uint32_t reserved1:2; #endif -} cdf_packed tSirMacVHTCapabilityInfo; +} qdf_packed tSirMacVHTCapabilityInfo; typedef struct sSirMacVHTTxSupDataRateInfo { #ifndef ANI_LITTLE_BIT_ENDIAN @@ -1454,7 +1454,7 @@ typedef struct sSirMacVHTTxSupDataRateInfo { uint16_t txSupDataRate:13; uint16_t reserved:3; #endif -} cdf_packed tSirMacVHTTxSupDataRateInfo; +} qdf_packed tSirMacVHTTxSupDataRateInfo; typedef struct sSirMacVHTRxSupDataRateInfo { #ifndef ANI_LITTLE_BIT_ENDIAN @@ -1464,7 +1464,7 @@ typedef struct sSirMacVHTRxSupDataRateInfo { uint16_t rxSupDataRate:13; uint16_t reserved:3; #endif -} cdf_packed tSirMacVHTRxSupDataRateInfo; +} qdf_packed tSirMacVHTRxSupDataRateInfo; /** * struct sSirVhtMcsInfo - VHT MCS information @@ -1604,7 +1604,7 @@ typedef struct sHtCaps { uint8_t txSoundingPPDUs:1; uint8_t reserved5:1; -} cdf_packed tHtCaps; +} qdf_packed tHtCaps; /* During 11h channel switch, the AP can indicate if the * STA needs to stop the transmission or continue until the @@ -1636,7 +1636,7 @@ typedef struct _BarControl { #endif -} cdf_packed barCtrlType; +} qdf_packed barCtrlType; typedef struct _BARFrmStruct { tSirMacFrameCtl fc; @@ -1645,7 +1645,7 @@ typedef struct _BARFrmStruct { tSirMacAddr txAddr; barCtrlType barControl; tSirMacSeqCtl ssnCtrl; -} cdf_packed BARFrmType; +} qdf_packed BARFrmType; /* Supported MCS set */ #define SIZE_OF_SUPPORTED_MCS_SET 16 @@ -1727,7 +1727,7 @@ typedef struct sSirMacHTCapabilityInfo { uint16_t stbcControlFrame:1; uint16_t lsigTXOPProtection:1; #endif -} cdf_packed tSirMacHTCapabilityInfo; +} qdf_packed tSirMacHTCapabilityInfo; /* HT Parameters Info */ typedef struct sSirMacHTParametersInfo { @@ -1740,7 +1740,7 @@ typedef struct sSirMacHTParametersInfo { uint8_t mpduDensity:3; uint8_t reserved:3; #endif -} cdf_packed tSirMacHTParametersInfo; +} qdf_packed tSirMacHTParametersInfo; /* Extended HT Capabilities Info */ typedef struct sSirMacExtendedHTCapabilityInfo { @@ -1757,7 +1757,7 @@ typedef struct sSirMacExtendedHTCapabilityInfo { uint16_t mcsFeedback:2; uint16_t reserved2:6; #endif -} cdf_packed tSirMacExtendedHTCapabilityInfo; +} qdf_packed tSirMacExtendedHTCapabilityInfo; /* IEEE 802.11n/D7.0 - 7.3.2.57.4 */ /* Part of the "supported MCS set field" */ @@ -1769,7 +1769,7 @@ typedef struct sSirMacRxHighestSupportRate { uint16_t rate:10; uint16_t reserved:6; #endif -} cdf_packed tSirMacRxHighestSupportRate, *tpSirMacRxHighestSupportRate; +} qdf_packed tSirMacRxHighestSupportRate, *tpSirMacRxHighestSupportRate; /* Transmit Beam Forming Capabilities Info */ typedef struct sSirMacTxBFCapabilityInfo { @@ -1811,7 +1811,7 @@ typedef struct sSirMacTxBFCapabilityInfo { uint32_t compressedSteeringMatrixBFAntennae:2; uint32_t reserved:7; #endif -} cdf_packed tSirMacTxBFCapabilityInfo; +} qdf_packed tSirMacTxBFCapabilityInfo; /* Antenna Selection Capability Info */ typedef struct sSirMacASCapabilityInfo { @@ -1834,7 +1834,7 @@ typedef struct sSirMacASCapabilityInfo { uint8_t txSoundingPPDUs:1; uint8_t reserved2:1; #endif -} cdf_packed tSirMacASCapabilityInfo; +} qdf_packed tSirMacASCapabilityInfo; /* Additional HT IE Field1 */ typedef struct sSirMacHTInfoField1 { @@ -1851,7 +1851,7 @@ typedef struct sSirMacHTInfoField1 { uint8_t controlledAccessOnly:1; uint8_t serviceIntervalGranularity:3; #endif -} cdf_packed tSirMacHTInfoField1; +} qdf_packed tSirMacHTInfoField1; /* Additional HT IE Field2 */ typedef struct sSirMacHTInfoField2 { @@ -1868,7 +1868,7 @@ typedef struct sSirMacHTInfoField2 { uint16_t obssNonHTStaPresent:1; /*added for Obss */ uint16_t reserved:11; #endif -} cdf_packed tSirMacHTInfoField2; +} qdf_packed tSirMacHTInfoField2; /* Additional HT IE Field3 */ typedef struct sSirMacHTInfoField3 { @@ -1889,13 +1889,13 @@ typedef struct sSirMacHTInfoField3 { uint16_t pcoPhase:1; uint16_t reserved:4; #endif -} cdf_packed tSirMacHTInfoField3; +} qdf_packed tSirMacHTInfoField3; typedef struct sSirMacProbeReqFrame { tSirMacSSidIE ssIdIE; tSirMacRateSetIE rateSetIE; tSirMacRateSetIE extendedRateSetIE; -} cdf_packed tSirMacProbeReqFrame, *tpSirMacProbeReqFrame; +} qdf_packed tSirMacProbeReqFrame, *tpSirMacProbeReqFrame; typedef struct sSirMacProbeRspFrame { tSirMacTimeStamp ts; @@ -1907,7 +1907,7 @@ typedef struct sSirMacProbeRspFrame { tSirMacNonErpPresentIE nonErpPresent; tSirMacDsParamSetIE dsParamsIE; tSirMacCfParamSetIE cfParamsIE; -} cdf_packed tSirMacProbeRspFrame, *tpSirMacProbeRspFrame; +} qdf_packed tSirMacProbeRspFrame, *tpSirMacProbeRspFrame; typedef struct sSirMacAuthFrameBody { uint16_t authAlgoNumber; @@ -1916,11 +1916,11 @@ typedef struct sSirMacAuthFrameBody { uint8_t type; /* = SIR_MAC_CHALLENGE_TEXT_EID */ uint8_t length; /* = SIR_MAC_AUTH_CHALLENGE_LENGTH */ uint8_t challengeText[SIR_MAC_AUTH_CHALLENGE_LENGTH]; -} cdf_packed tSirMacAuthFrameBody, *tpSirMacAuthFrameBody; +} qdf_packed tSirMacAuthFrameBody, *tpSirMacAuthFrameBody; typedef struct sSirMacAuthenticationFrame { tSirMacAuthFrameBody authFrameBody; -} cdf_packed tSirMacAuthFrame, *tpSirMacAuthFrame; +} qdf_packed tSirMacAuthFrame, *tpSirMacAuthFrame; typedef struct sSirMacAssocReqFrame { tSirMacCapabilityInfo capabilityInfo; @@ -1928,7 +1928,7 @@ typedef struct sSirMacAssocReqFrame { tSirMacSSidIE ssIdIE; tSirMacRateSetIE rateSetIE; tSirMacRateSetIE extendedRateSetIE; -} cdf_packed tSirMacAssocReqFrame, *tpSirMacAssocReqFrame; +} qdf_packed tSirMacAssocReqFrame, *tpSirMacAssocReqFrame; typedef struct sSirMacAssocRspFrame { tSirMacCapabilityInfo capabilityInfo; @@ -1936,26 +1936,26 @@ typedef struct sSirMacAssocRspFrame { uint16_t aid; tSirMacRateSetIE supportedRates; tSirMacRateSetIE extendedRateSetIE; -} cdf_packed tSirMacAssocRspFrame, *tpSirMacAssocRspFrame; +} qdf_packed tSirMacAssocRspFrame, *tpSirMacAssocRspFrame; typedef struct sSirMacDisassocFrame { uint16_t reasonCode; -} cdf_packed tSirMacDisassocFrame, *tpSirMacDisassocFrame; +} qdf_packed tSirMacDisassocFrame, *tpSirMacDisassocFrame; typedef struct sDSirMacDeauthFrame { uint16_t reasonCode; -} cdf_packed tSirMacDeauthFrame, *tpSirMacDeauthFrame; +} qdf_packed tSirMacDeauthFrame, *tpSirMacDeauthFrame; /* / Common header for all action frames */ typedef struct sSirMacActionFrameHdr { uint8_t category; uint8_t actionID; -} cdf_packed tSirMacActionFrameHdr, *tpSirMacActionFrameHdr; +} qdf_packed tSirMacActionFrameHdr, *tpSirMacActionFrameHdr; typedef struct sSirMacVendorSpecificFrameHdr { uint8_t category; uint8_t Oui[4]; -} cdf_packed tSirMacVendorSpecificFrameHdr, +} qdf_packed tSirMacVendorSpecificFrameHdr, *tpSirMacVendorSpecificFrameHdr; typedef struct sSirMacVendorSpecificPublicActionFrameHdr { @@ -1964,7 +1964,7 @@ typedef struct sSirMacVendorSpecificPublicActionFrameHdr { uint8_t Oui[4]; uint8_t OuiSubType; uint8_t dialogToken; -} cdf_packed tSirMacVendorSpecificPublicActionFrameHdr, +} qdf_packed tSirMacVendorSpecificPublicActionFrameHdr, *tpSirMacVendorSpecificPublicActionFrameHdr; typedef struct sSirMacP2PActionFrameHdr { @@ -1972,7 +1972,7 @@ typedef struct sSirMacP2PActionFrameHdr { uint8_t Oui[4]; uint8_t OuiSubType; uint8_t dialogToken; -} cdf_packed tSirMacP2PActionFrameHdr, *tpSirMacP2PActionFrameHdr; +} qdf_packed tSirMacP2PActionFrameHdr, *tpSirMacP2PActionFrameHdr; typedef struct sSirMacMeasActionFrameHdr { uint8_t category; diff --git a/core/mac/inc/sir_types.h b/core/mac/inc/sir_types.h index 84032abae6..9580745ebb 100644 --- a/core/mac/inc/sir_types.h +++ b/core/mac/inc/sir_types.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. * @@ -36,7 +36,7 @@ #ifndef __SIR_TYPES_H #define __SIR_TYPES_H -#include "cdf_types.h" +#include /** ------------------------------------------------------------------------ * diff --git a/core/mac/src/cfg/cfg_proc_msg.c b/core/mac/src/cfg/cfg_proc_msg.c index 97ee82f9fc..ebc8506be4 100644 --- a/core/mac/src/cfg/cfg_proc_msg.c +++ b/core/mac/src/cfg/cfg_proc_msg.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. * @@ -1821,7 +1821,7 @@ void cfg_process_mb_msg(tpAniSirGlobal pMac, tSirMbMsg *pMsg) /* Use type[7:0] as index to function table */ index = CFG_GET_FUNC_INDX(pMsg->type); - if (index >= CDF_ARRAY_SIZE(g_cfg_func)) { + if (index >= QDF_ARRAY_SIZE(g_cfg_func)) { cdf_mem_free(pMsg); return; } @@ -2490,7 +2490,7 @@ process_cfg_download_req(tpAniSirGlobal pMac) uint32_t index; uint8_t *pDstTest, *pSrcTest; uint8_t len; - cfgstatic_string *pStrCfg; + cfgstatic_string * pStrCfg; uint32_t bufStart, bufEnd; uint32_t logLevel, retVal; uint32_t iCount = 0; @@ -2499,7 +2499,7 @@ process_cfg_download_req(tpAniSirGlobal pMac) for (i = 0; i < CFG_PARAM_MAX_NUM ; i++) { if ((cfg_static[i].control & CFG_CTL_VALID) != 0) { if (!(cfg_static[i].control & CFG_CTL_INT)) { - pStrCfg = (cfgstatic_string *)cfg_static[i]. + pStrCfg = (cfgstatic_string*)cfg_static[i]. pStrData; if (pStrCfg == NULL) { PELOGE(cfg_log(pMac, LOGE, @@ -2552,7 +2552,7 @@ process_cfg_download_req(tpAniSirGlobal pMac) continue; pDstTest = &pMac->cfg.gCfgSBuf[index]; - pStrCfg = (cfgstatic_string *)cfg_static[i].pStrData; + pStrCfg = (cfgstatic_string*)cfg_static[i].pStrData; pSrcTest = pStrCfg->data; if ((pDstTest == NULL) || (pStrCfg == NULL) || (pSrcTest == NULL)) diff --git a/core/mac/src/include/cfg_api.h b/core/mac/src/include/cfg_api.h index b6ed90796e..2240dd4822 100644 --- a/core/mac/src/include/cfg_api.h +++ b/core/mac/src/include/cfg_api.h @@ -57,7 +57,7 @@ typedef enum eCfgStatusTypes { /* WEP key mapping table row structure */ typedef struct { - uint8_t keyMappingAddr[CDF_MAC_ADDR_SIZE]; + uint8_t keyMappingAddr[QDF_MAC_ADDR_SIZE]; uint32_t wepOn; uint8_t key[SIR_MAC_KEY_LENGTH]; uint32_t status; diff --git a/core/mac/src/include/dph_global.h b/core/mac/src/include/dph_global.h index 30a8e2903b..f10e6cba9b 100644 --- a/core/mac/src/include/dph_global.h +++ b/core/mac/src/include/dph_global.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. * @@ -224,9 +224,9 @@ typedef struct sDphHashNode { uint16_t pmfSaQueryCurrentTransId; uint16_t pmfSaQueryStartTransId; TX_TIMER pmfSaQueryTimer; - v_TIME_t last_unprot_deauth_disassoc; + unsigned long last_unprot_deauth_disassoc; uint8_t proct_deauh_disassoc_cnt; - v_TIME_t last_assoc_received_time; + unsigned long last_assoc_received_time; #endif uint8_t htLdpcCapable; uint8_t vhtLdpcCapable; diff --git a/core/mac/src/pe/include/lim_ft_defs.h b/core/mac/src/pe/include/lim_ft_defs.h index 09ed064abb..95dfa3730d 100644 --- a/core/mac/src/pe/include/lim_ft_defs.h +++ b/core/mac/src/pe/include/lim_ft_defs.h @@ -93,7 +93,7 @@ typedef struct sSirFTUpdateKeyInfo { uint16_t messageType; uint16_t length; uint32_t smeSessionId; - struct cdf_mac_addr bssid; + struct qdf_mac_addr bssid; tSirKeyMaterial keyMaterial; } tSirFTUpdateKeyInfo, *tpSirFTUpdateKeyInfo; diff --git a/core/mac/src/pe/include/lim_global.h b/core/mac/src/pe/include/lim_global.h index 8ee02bc3c7..657518f808 100644 --- a/core/mac/src/pe/include/lim_global.h +++ b/core/mac/src/pe/include/lim_global.h @@ -300,7 +300,7 @@ struct tLimScanResultNode { /* OEM Data related structure definitions */ typedef struct sLimMlmOemDataReq { - struct cdf_mac_addr selfMacAddr; + struct qdf_mac_addr selfMacAddr; uint8_t data_len; uint8_t *data; } tLimMlmOemDataReq, *tpLimMlmOemDataReq; @@ -325,7 +325,7 @@ typedef struct tLimPreAuthNode { uint8_t rsvd:5; TX_TIMER timer; uint16_t seq_num; - v_TIME_t timestamp; + unsigned long timestamp; } tLimPreAuthNode, *tpLimPreAuthNode; /* Pre-authentication table definition */ @@ -570,7 +570,7 @@ typedef struct sLimTspecInfo { uint8_t tclasProc; /* tclassProc is valid only if this is set to 1. */ uint8_t tclasProcPresent:1; -} cdf_packed tLimTspecInfo, *tpLimTspecInfo; +} qdf_packed tLimTspecInfo, *tpLimTspecInfo; typedef struct sLimAdmitPolicyInfo { /* admit control policy type */ diff --git a/core/mac/src/pe/include/lim_session.h b/core/mac/src/pe/include/lim_session.h index a38f2f9239..ba0332f93b 100644 --- a/core/mac/src/pe/include/lim_session.h +++ b/core/mac/src/pe/include/lim_session.h @@ -275,7 +275,7 @@ typedef struct sPESession /* Added to Support BT-AMP */ uint32_t lim11hEnable; int8_t maxTxPower; /* MIN (Regulatory and local power constraint) */ - enum tCDF_ADAPTER_MODE pePersona; + enum tQDF_ADAPTER_MODE pePersona; #if defined WLAN_FEATURE_VOWIFI int8_t txMgmtPower; diff --git a/core/mac/src/pe/lim/lim_api.c b/core/mac/src/pe/lim/lim_api.c index fc694a5eea..cd5689c243 100644 --- a/core/mac/src/pe/lim/lim_api.c +++ b/core/mac/src/pe/lim/lim_api.c @@ -68,7 +68,7 @@ #endif #include -#include "cdf_types.h" +#include "qdf_types.h" #include "cds_packet.h" #include "cds_utils.h" #include "sys_startup.h" @@ -655,13 +655,13 @@ void lim_cleanup(tpAniSirGlobal pMac) struct mgmt_frm_reg_info *pLimMgmtRegistration = NULL; - if (CDF_GLOBAL_FTM_MODE != cds_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE != cds_get_conparam()) { cdf_mutex_acquire(&pMac->lim.lim_frame_register_lock); while (qdf_list_remove_front( &pMac->lim.gLimMgmtFrameRegistratinQueue, (qdf_list_node_t **) &pLimMgmtRegistration) == QDF_STATUS_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, FL("Fixing leak! Deallocating pLimMgmtRegistration node")); cdf_mem_free(pLimMgmtRegistration); } @@ -1001,7 +1001,7 @@ QDF_STATUS pe_handle_mgmt_frame(void *p_cds_gctx, void *cds_buff) return QDF_STATUS_E_FAILURE; } - pMac = cds_get_context(CDF_MODULE_ID_PE); + pMac = cds_get_context(QDF_MODULE_ID_PE); if (NULL == pMac) { /* cannot log a failure without a valid pMac */ cds_pkt_return_packet(pVosPkt); @@ -1601,7 +1601,7 @@ lim_detect_change_in_ap_capabilities(tpAniSirGlobal pMac, pBeacon->ssId.length + 1; cdf_mem_copy(apNewCaps.bssId.bytes, - psessionEntry->bssId, CDF_MAC_ADDR_SIZE); + psessionEntry->bssId, QDF_MAC_ADDR_SIZE); if (newChannel != psessionEntry->currentOperChannel) { PELOGE(lim_log (pMac, LOGE, @@ -1857,16 +1857,16 @@ QDF_STATUS lim_roam_fill_bss_descr(tpAniSirGlobal pMac, if (roam_offload_synch_ind_ptr->beaconProbeRespLength <= SIR_MAC_HDR_LEN_3A) { - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, "%s: very" + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, "%s: very" "few bytes in synchInd beacon / probe resp frame! length=%d", __func__, roam_offload_synch_ind_ptr->beaconProbeRespLength); cdf_mem_free(parsed_frm_ptr); return QDF_STATUS_E_FAILURE; } - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, "LFR3:Beacon/Prb Rsp:%d", roam_offload_synch_ind_ptr->isBeacon); - CDF_TRACE_HEX_DUMP(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, + CDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, bcn_proberesp_ptr, roam_offload_synch_ind_ptr->beaconProbeRespLength); if (roam_offload_synch_ind_ptr->isBeacon) { if (sir_parse_beacon_ie(pMac, parsed_frm_ptr, @@ -1875,7 +1875,7 @@ QDF_STATUS lim_roam_fill_bss_descr(tpAniSirGlobal pMac, roam_offload_synch_ind_ptr->beaconProbeRespLength - SIR_MAC_HDR_LEN_3A) != eSIR_SUCCESS || !parsed_frm_ptr->ssidPresent) { - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, "Parse error Beacon, length=%d", roam_offload_synch_ind_ptr->beaconProbeRespLength); cdf_mem_free(parsed_frm_ptr); @@ -1887,7 +1887,7 @@ QDF_STATUS lim_roam_fill_bss_descr(tpAniSirGlobal pMac, roam_offload_synch_ind_ptr->beaconProbeRespLength - SIR_MAC_HDR_LEN_3A, parsed_frm_ptr) != eSIR_SUCCESS || !parsed_frm_ptr->ssidPresent) { - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, "Parse error ProbeResponse, length=%d", roam_offload_synch_ind_ptr->beaconProbeRespLength); cdf_mem_free(parsed_frm_ptr); @@ -1969,11 +1969,11 @@ QDF_STATUS lim_roam_fill_bss_descr(tpAniSirGlobal pMac, (uint8_t *)parsed_frm_ptr->mdie, SIR_MDIE_SIZE); } - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG, "LFR3:%s:BssDescr Info:", __func__); - CDF_TRACE_HEX_DUMP(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG, bss_desc_ptr->bssId, sizeof(tSirMacAddr)); - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG, "chan=%d, rssi=%d", bss_desc_ptr->channelId, bss_desc_ptr->rssi); if (ie_len) { @@ -2104,7 +2104,7 @@ QDF_STATUS pe_roam_synch_callback(tpAniSirGlobal mac_ctx, mac_ctx->roam.reassocRespLen); lim_log(mac_ctx, LOG1, FL("LFR3:the reassoc resp frame data:")); - CDF_TRACE_HEX_DUMP(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE_HEX_DUMP(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, mac_ctx->roam.pReassocResp, mac_ctx->roam.reassocRespLen); ft_session_ptr->bRoamSynchInProgress = true; diff --git a/core/mac/src/pe/lim/lim_assoc_utils.c b/core/mac/src/pe/lim/lim_assoc_utils.c index e9cdcd7c15..d8dae1f1b8 100644 --- a/core/mac/src/pe/lim/lim_assoc_utils.c +++ b/core/mac/src/pe/lim/lim_assoc_utils.c @@ -60,7 +60,7 @@ #endif #include "lim_session.h" -#include "cdf_types.h" +#include "qdf_types.h" #include "wma_types.h" #include "lim_types.h" @@ -681,7 +681,7 @@ lim_cleanup_rx_path(tpAniSirGlobal pMac, tpDphHashNode pStaDs, * Return: None */ void -lim_send_del_sta_cnf(tpAniSirGlobal pMac, struct cdf_mac_addr sta_dsaddr, +lim_send_del_sta_cnf(tpAniSirGlobal pMac, struct qdf_mac_addr sta_dsaddr, uint16_t staDsAssocId, tLimMlmStaContext mlmStaContext, tSirResultCodes statusCode, tpPESession psessionEntry) { @@ -735,7 +735,7 @@ lim_send_del_sta_cnf(tpAniSirGlobal pMac, struct cdf_mac_addr sta_dsaddr, mlmStaContext.cleanupTrigger); cdf_mem_copy((uint8_t *) &mlmDisassocCnf.peerMacAddr, - (uint8_t *) sta_dsaddr.bytes, CDF_MAC_ADDR_SIZE); + (uint8_t *) sta_dsaddr.bytes, QDF_MAC_ADDR_SIZE); mlmDisassocCnf.resultCode = statusCode; mlmDisassocCnf.disassocTrigger = mlmStaContext.cleanupTrigger; /* Update PE session Id */ @@ -775,7 +775,7 @@ lim_send_del_sta_cnf(tpAniSirGlobal pMac, struct cdf_mac_addr sta_dsaddr, FL("Lim Posting PURGE_STA_IND to Sme. Trigger: %d"), mlmStaContext.cleanupTrigger); cdf_mem_copy((uint8_t *) &mlmPurgeStaInd.peerMacAddr, - (uint8_t *) sta_dsaddr.bytes, CDF_MAC_ADDR_SIZE); + (uint8_t *) sta_dsaddr.bytes, QDF_MAC_ADDR_SIZE); mlmPurgeStaInd.reasonCode = (uint8_t) mlmStaContext.disassocReason; mlmPurgeStaInd.aid = staDsAssocId; @@ -1547,10 +1547,10 @@ tSirRetStatus lim_populate_vht_mcs_set(tpAniSirGlobal mac_ctx, return eSIR_SUCCESS; rates->vhtTxHighestDataRate = - CDF_MIN(rates->vhtTxHighestDataRate, + QDF_MIN(rates->vhtTxHighestDataRate, peer_vht_caps->txSupDataRate); rates->vhtRxHighestDataRate = - CDF_MIN(rates->vhtRxHighestDataRate, + QDF_MIN(rates->vhtRxHighestDataRate, peer_vht_caps->rxHighSupDataRate); if (mac_ctx->roam.configParam.enable2x2) { @@ -2816,7 +2816,7 @@ tSirRetStatus lim_add_ft_sta_self(tpAniSirGlobal mac_ctx, uint16_t assoc_id, msg_q.bodyptr = add_sta_params; msg_q.bodyval = 0; - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG, "Sending WMA_ADD_STA_REQ (aid %d)", add_sta_params->assocId); MTRACE(mac_trace_msg_tx(mac_ctx, session_entry->peSessionId, @@ -3090,7 +3090,7 @@ lim_add_sta_self(tpAniSirGlobal pMac, uint16_t staIdx, uint8_t updateSta, lim_log(pMac, LOGP, FL("Couldn't get LISTEN_INTERVAL")); pAddStaParams->listenInterval = (uint16_t) listenInterval; - if (CDF_P2P_CLIENT_MODE == psessionEntry->pePersona) { + if (QDF_P2P_CLIENT_MODE == psessionEntry->pePersona) { pAddStaParams->p2pCapableSta = 1; } @@ -3393,7 +3393,7 @@ lim_check_and_announce_join_success(tpAniSirGlobal mac_ctx, lim_deactivate_and_change_timer(mac_ctx, eLIM_PERIODIC_JOIN_PROBE_REQ_TIMER); - if (CDF_P2P_CLIENT_MODE == session_entry->pePersona && + if (QDF_P2P_CLIENT_MODE == session_entry->pePersona && beacon_probe_rsp->P2PProbeRes.NoticeOfAbsence.present) { noa_duration_from_beacon = (uint32_t *) @@ -4218,7 +4218,7 @@ tSirRetStatus lim_sta_send_add_bss(tpAniSirGlobal pMac, tpSirAssocRsp pAssocRsp, /* update persona */ pAddBssParams->halPersona = (uint8_t) psessionEntry->pePersona; - if (CDF_P2P_CLIENT_MODE == psessionEntry->pePersona) + if (QDF_P2P_CLIENT_MODE == psessionEntry->pePersona) pAddBssParams->staContext.p2pCapableSta = 1; pAddBssParams->bSpectrumMgtEnabled = psessionEntry->spectrumMgtEnabled; @@ -4841,7 +4841,7 @@ lim_prepare_and_send_del_sta_cnf(tpAniSirGlobal pMac, tpDphHashNode pStaDs, tpPESession psessionEntry) { uint16_t staDsAssocId = 0; - struct cdf_mac_addr sta_dsaddr; + struct qdf_mac_addr sta_dsaddr; tLimMlmStaContext mlmStaContext; if (pStaDs == NULL) { @@ -4850,7 +4850,7 @@ lim_prepare_and_send_del_sta_cnf(tpAniSirGlobal pMac, tpDphHashNode pStaDs, } staDsAssocId = pStaDs->assocId; cdf_mem_copy((uint8_t *) sta_dsaddr.bytes, - pStaDs->staAddr, CDF_MAC_ADDR_SIZE); + pStaDs->staAddr, QDF_MAC_ADDR_SIZE); mlmStaContext = pStaDs->mlmStaContext; if (LIM_IS_AP_ROLE(psessionEntry) || diff --git a/core/mac/src/pe/lim/lim_assoc_utils.h b/core/mac/src/pe/lim/lim_assoc_utils.h index fe9a393759..8b6df1cf5d 100644 --- a/core/mac/src/pe/lim/lim_assoc_utils.h +++ b/core/mac/src/pe/lim/lim_assoc_utils.h @@ -68,7 +68,7 @@ tSirRetStatus lim_populate_peer_rate_set(tpAniSirGlobal pMac, uint8_t *pSupportedMCSSet, uint8_t basicOnly, tpPESession psessionEntry, - tDot11fIEVHTCaps *pVHTCaps); + tDot11fIEVHTCaps * pVHTCaps); #else tSirRetStatus lim_populate_peer_rate_set(tpAniSirGlobal pMac, tpSirSupportedRates pRates, @@ -83,7 +83,7 @@ tSirRetStatus lim_populate_own_rate_set(tpAniSirGlobal pMac, uint8_t *pSupportedMCSSet, uint8_t basicOnly, tpPESession psessionEntry, - tDot11fIEVHTCaps *pVHTCaps); + tDot11fIEVHTCaps * pVHTCaps); #else tSirRetStatus lim_populate_own_rate_set(tpAniSirGlobal pMac, @@ -101,7 +101,7 @@ lim_populate_matching_rate_set(tpAniSirGlobal pMac, tSirMacRateSet *pExtRateSet, uint8_t *pSupportedMCSSet, tpPESession psessionEntry, - tDot11fIEVHTCaps *pVHTCaps); + tDot11fIEVHTCaps * pVHTCaps); #else tSirRetStatus lim_populate_matching_rate_set(tpAniSirGlobal, tpDphHashNode, @@ -134,7 +134,7 @@ void lim_post_reassoc_failure(tpAniSirGlobal, tSirResultCodes, uint16_t, tpPESession); bool lim_is_reassoc_in_progress(tpAniSirGlobal, tpPESession); void -lim_send_del_sta_cnf(tpAniSirGlobal pMac, struct cdf_mac_addr sta_dsaddr, +lim_send_del_sta_cnf(tpAniSirGlobal pMac, struct qdf_mac_addr sta_dsaddr, uint16_t staDsAssocId, tLimMlmStaContext mlmStaContext, tSirResultCodes statusCode, tpPESession psessionEntry); diff --git a/core/mac/src/pe/lim/lim_ft.c b/core/mac/src/pe/lim/lim_ft.c index 8941504ba4..b0c042ce03 100644 --- a/core/mac/src/pe/lim/lim_ft.c +++ b/core/mac/src/pe/lim/lim_ft.c @@ -125,7 +125,7 @@ void lim_ft_cleanup_pre_auth_info(tpAniSirGlobal pMac, tpPESession psessionEntry if (pReAssocSessionEntry->valid && pReAssocSessionEntry->limSmeState == eLIM_SME_WT_REASSOC_STATE) { - CDF_TRACE(CDF_MODULE_ID_PE, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG, FL("Deleting Preauth session(%d)"), pReAssocSessionEntry->peSessionId); @@ -941,7 +941,7 @@ void lim_fill_ft_session(tpAniSirGlobal pMac, lim_get_max_tx_power(regMax, localPowerConstraint, pMac->roam.configParam.nTxPowerCap); #else - pftSessionEntry->maxTxPower = CDF_MIN(regMax, (localPowerConstraint)); + pftSessionEntry->maxTxPower = QDF_MIN(regMax, (localPowerConstraint)); #endif lim_log(pMac, LOG1, diff --git a/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c b/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c index 4d674fd8c5..9a4a436db4 100644 --- a/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c +++ b/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c @@ -1179,7 +1179,7 @@ void lim_ibss_add_bss_rsp_when_coalescing(tpAniSirGlobal pMac, void *msg, sizeof(uint8_t) + pBeacon->ssId.length + 1; cdf_mem_set((void *)&newBssInfo, sizeof(newBssInfo), 0); - cdf_mem_copy(newBssInfo.bssId.bytes, pHdr->bssId, CDF_MAC_ADDR_SIZE); + cdf_mem_copy(newBssInfo.bssId.bytes, pHdr->bssId, QDF_MAC_ADDR_SIZE); newBssInfo.channelNumber = (tSirMacChanNum) pAddBss->currentOperChannel; cdf_mem_copy((uint8_t *) &newBssInfo.ssId, (uint8_t *) &pBeacon->ssId, pBeacon->ssId.length + 1); @@ -1354,7 +1354,7 @@ __lim_ibss_search_and_delete_peer(tpAniSirGlobal pMac, * we set IBSS state to inactive. */ if (0 == pMac->lim.gLimNumIbssPeers) { - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, "Last STA from IBSS walked out"); psessionEntry->limIbssActive = false; } diff --git a/core/mac/src/pe/lim/lim_process_action_frame.c b/core/mac/src/pe/lim/lim_process_action_frame.c index f7ed04f272..8ef95ccd3c 100644 --- a/core/mac/src/pe/lim/lim_process_action_frame.c +++ b/core/mac/src/pe/lim/lim_process_action_frame.c @@ -70,7 +70,7 @@ /**----------------------------------------------------------------- \fn lim_stop_tx_and_switch_channel \brief Stops the transmission if channel switch mode is silent and - starts the channel switch timer. + starts the channel switch timer. \param pMac \return NONE @@ -124,8 +124,8 @@ void lim_stop_tx_and_switch_channel(tpAniSirGlobal pMac, uint8_t sessionId) /**------------------------------------------------------------ \fn lim_start_channel_switch \brief Switches the channel if switch count == 0, otherwise - starts the timer for channel switch and stops BG scan - and heartbeat timer tempororily. + starts the timer for channel switch and stops BG scan + and heartbeat timer tempororily. \param pMac \param psessionEntry @@ -1141,10 +1141,9 @@ __lim_process_basic_meas_req(tpAniSirGlobal pMac, tpSirMacMeasReqActionFrame pMeasReqFrame, tSirMacAddr peerMacAddr, tpPESession psessionEntry) { - if (lim_send_meas_report_frame(pMac, - pMeasReqFrame, - peerMacAddr, psessionEntry) != eSIR_SUCCESS) - { + if (lim_send_meas_report_frame(pMac, pMeasReqFrame, + peerMacAddr, psessionEntry) != + eSIR_SUCCESS) { PELOGE(lim_log (pMac, LOGE, FL("fail to send Basic Meas report ")); ) @@ -1156,10 +1155,9 @@ __lim_process_cca_meas_req(tpAniSirGlobal pMac, tpSirMacMeasReqActionFrame pMeasReqFrame, tSirMacAddr peerMacAddr, tpPESession psessionEntry) { - if (lim_send_meas_report_frame(pMac, - pMeasReqFrame, - peerMacAddr, psessionEntry) != eSIR_SUCCESS) - { + if (lim_send_meas_report_frame(pMac, pMeasReqFrame, + peerMacAddr, psessionEntry) != + eSIR_SUCCESS) { PELOGE(lim_log(pMac, LOGE, FL("fail to send CCA Meas report "));) return; } @@ -1169,10 +1167,9 @@ __lim_process_rpi_meas_req(tpAniSirGlobal pMac, tpSirMacMeasReqActionFrame pMeasReqFrame, tSirMacAddr peerMacAddr, tpPESession psessionEntry) { - if (lim_send_meas_report_frame(pMac, - pMeasReqFrame, - peerMacAddr, psessionEntry) != eSIR_SUCCESS) - { + if (lim_send_meas_report_frame(pMac, pMeasReqFrame, + peerMacAddr, psessionEntry) != + eSIR_SUCCESS) { PELOGE(lim_log(pMac, LOGE, FL("fail to send RPI Meas report "));) return; } @@ -1607,7 +1604,7 @@ static void __lim_process_sa_query_response_action_frame(tpAniSirGlobal pMac, pHdr = WMA_GET_RX_MAC_HEADER(pRxPacketInfo); frameLen = WMA_GET_RX_PAYLOAD_LEN(pRxPacketInfo); pBody = WMA_GET_RX_MPDU_DATA(pRxPacketInfo); - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, ("SA Query Response received...")); /* When a station, supplicant handles SA Query Response. @@ -2053,7 +2050,7 @@ void lim_process_action_frame(tpAniSirGlobal mac_ctx, mac_hdr = WMA_GET_RX_MAC_HEADER(rx_pkt_info); frame_len = WMA_GET_RX_PAYLOAD_LEN(rx_pkt_info); rssi = WMA_GET_RX_RSSI_NORMALIZED(rx_pkt_info); - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, ("Public Action TDLS Discovery RSP ..")); lim_send_sme_mgmt_frame_ind(mac_ctx, mac_hdr->fc.subType, (uint8_t *) mac_hdr, diff --git a/core/mac/src/pe/lim/lim_process_assoc_req_frame.c b/core/mac/src/pe/lim/lim_process_assoc_req_frame.c index aa7cf8db34..aa5b4eb739 100644 --- a/core/mac/src/pe/lim/lim_process_assoc_req_frame.c +++ b/core/mac/src/pe/lim/lim_process_assoc_req_frame.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. * @@ -54,7 +54,7 @@ #include "cds_packet.h" #include "lim_session_utils.h" -#include "cdf_types.h" +#include "qdf_types.h" #include "cds_utils.h" /** @@ -167,7 +167,7 @@ void lim_check_sta_in_pe_entries(tpAniSirGlobal pMac, tpSirMacMgmtHdr pHdr) for (i = 0; i < pMac->lim.maxBssId; i++) { if ((&pMac->lim.gpSession[i] != NULL) && (pMac->lim.gpSession[i].valid) && - (pMac->lim.gpSession[i].pePersona == CDF_SAP_MODE)) { + (pMac->lim.gpSession[i].pePersona == QDF_SAP_MODE)) { psessionEntry = &pMac->lim.gpSession[i]; pStaDs = dph_lookup_hash_entry(pMac, pHdr->sa, &assocId, @@ -394,10 +394,9 @@ lim_process_assoc_req_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo, } lim_copy_u16((uint8_t *) &localCapabilities, temp); - if (lim_compare_capabilities(pMac, - pAssocReq, - &localCapabilities, psessionEntry) == false) - { + if (lim_compare_capabilities(pMac, pAssocReq, + &localCapabilities, psessionEntry) == + false) { lim_log(pMac, LOGE, FL("local caps mismatch received caps")); lim_log(pMac, LOGE, FL("Received %s Req with unsupported " "capabilities from" MAC_ADDRESS_STR), @@ -482,8 +481,7 @@ lim_process_assoc_req_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo, if (LIM_IS_AP_ROLE(psessionEntry) && (psessionEntry->dot11mode == WNI_CFG_DOT11_MODE_11G_ONLY) && - (pAssocReq->HTCaps.present)) - { + (pAssocReq->HTCaps.present)) { lim_log(pMac, LOGE, FL("SOFTAP was in 11G only mode, rejecting legacy " "STA : " MAC_ADDRESS_STR), MAC_ADDR_ARRAY(pHdr->sa)); @@ -721,16 +719,13 @@ lim_process_assoc_req_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo, if (SIR_MAC_OUI_VERSION_1 == Dot11fIERSN.version) { /* check the groupwise and pairwise cipher suites */ - if (eSIR_SUCCESS != - (status = - lim_check_rx_rsn_ie_match(pMac, - Dot11fIERSN, - psessionEntry, - pAssocReq-> - HTCaps. - present, - &pmfConnection))) - { + status = lim_check_rx_rsn_ie_match(pMac, + Dot11fIERSN, + psessionEntry, + pAssocReq-> + HTCaps.present, + &pmfConnection); + if (eSIR_SUCCESS != status) { lim_log(pMac, LOGE, FL("RSN Mismatch." "Rejecting Re/Assoc req from " @@ -795,14 +790,13 @@ lim_process_assoc_req_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo, pAssocReq->wpa.length, &Dot11fIEWPA); /* check the groupwise and pairwise cipher suites */ - if (eSIR_SUCCESS != - (status = - lim_check_rx_wpa_ie_match(pMac, - Dot11fIEWPA, - psessionEntry, - pAssocReq-> - HTCaps. - present))) { + status = lim_check_rx_wpa_ie_match(pMac, + Dot11fIEWPA, + psessionEntry, + pAssocReq-> + HTCaps. + present); + if (eSIR_SUCCESS != status) { lim_log(pMac, LOGW, FL("WPA IE mismatch" "Rejecting Re/Assoc req from " diff --git a/core/mac/src/pe/lim/lim_process_auth_frame.c b/core/mac/src/pe/lim/lim_process_auth_frame.c index 1723a7b9d4..fadc5edd82 100644 --- a/core/mac/src/pe/lim/lim_process_auth_frame.c +++ b/core/mac/src/pe/lim/lim_process_auth_frame.c @@ -292,7 +292,7 @@ static void lim_process_auth_frame_type1(tpAniSirGlobal mac_ctx, if (pMlmDisassocReq && cdf_mem_compare((uint8_t *) mac_hdr->sa, (uint8_t *) &pMlmDisassocReq->peer_macaddr.bytes, - CDF_MAC_ADDR_SIZE)) { + QDF_MAC_ADDR_SIZE)) { lim_log(mac_ctx, LOGE, FL("TODO:Ack for disassoc frame is pending Issue delsta for " MAC_ADDRESS_STR), @@ -306,7 +306,7 @@ static void lim_process_auth_frame_type1(tpAniSirGlobal mac_ctx, if (pMlmDeauthReq && cdf_mem_compare((uint8_t *) mac_hdr->sa, (uint8_t *) &pMlmDeauthReq->peer_macaddr.bytes, - CDF_MAC_ADDR_SIZE)) { + QDF_MAC_ADDR_SIZE)) { lim_log(mac_ctx, LOGE, FL("TODO:Ack for deauth frame is pending Issue delsta for " MAC_ADDRESS_STR), @@ -1104,7 +1104,7 @@ lim_process_auth_frame(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info, body_ptr = WMA_GET_RX_MPDU_DATA(rx_pkt_info); /* Restore default failure timeout */ - if (CDF_P2P_CLIENT_MODE == pe_session->pePersona && + if (QDF_P2P_CLIENT_MODE == pe_session->pePersona && pe_session->defaultAuthFailureTimeout) { lim_log(mac_ctx, LOG1, FL("Restore default failure timeout")); cfg_set_int(mac_ctx, WNI_CFG_AUTHENTICATE_FAILURE_TIMEOUT, diff --git a/core/mac/src/pe/lim/lim_process_message_queue.c b/core/mac/src/pe/lim/lim_process_message_queue.c index aa8f16ceab..70e16b1c2a 100644 --- a/core/mac/src/pe/lim/lim_process_message_queue.c +++ b/core/mac/src/pe/lim/lim_process_message_queue.c @@ -65,7 +65,7 @@ #include "lim_ft.h" #endif -#include "cdf_types.h" +#include "qdf_types.h" #include "cds_packet.h" #include "cdf_memory.h" @@ -261,7 +261,7 @@ uint8_t static def_msg_decision(tpAniSirGlobal pMac, tpSirMsgQ limMsg) if (pMac->lim.gLimSmeState == eLIM_SME_OFFLINE_STATE) { /* Defer processsing this message */ if (lim_defer_msg(pMac, limMsg) != TX_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_PE, LOGE, + CDF_TRACE(QDF_MODULE_ID_PE, LOGE, FL("Unable to Defer Msg")); lim_log_session_states(pMac); lim_handle_defer_msg_error(pMac, limMsg); @@ -316,7 +316,7 @@ uint8_t static def_msg_decision(tpAniSirGlobal pMac, tpSirMsgQ limMsg) ) /* Defer processsing this message */ if (lim_defer_msg(pMac, limMsg) != TX_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_PE, LOGE, + CDF_TRACE(QDF_MODULE_ID_PE, LOGE, FL("Unable to Defer Msg")); lim_log_session_states(pMac); lim_handle_defer_msg_error(pMac, limMsg); @@ -426,7 +426,7 @@ __lim_ext_scan_forward_bcn_probe_rsp(tpAniSirGlobal pmac, uint8_t *rx_pkt_info, result->ap.ssid[frame->ssId.length] = '\0'; cdf_mem_copy((uint8_t *) &result->ap.bssid.bytes, (uint8_t *) hdr->bssId, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); /* Copy IE fields */ cdf_mem_copy((uint8_t *) &result->ap.ieData, body + SIR_MAC_B_PR_SSID_OFFSET, ie_len); @@ -598,12 +598,12 @@ static void lim_handle_unknown_a2_index_frames(tpAniSirGlobal mac_ctx, mac_hdr = WMA_GET_RX_MPDUHEADER3A(rx_pkt_buffer); if (lim_is_group_addr(mac_hdr->addr2)) { - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO_HIGH, FL("Ignoring A2 Invalid Packet received for MC/BC:")); lim_print_mac_addr(mac_ctx, mac_hdr->addr2, LOG2); return; } - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, FL("type=0x%x, subtype=0x%x"), mac_hdr->fc.type, mac_hdr->fc.subType); /* Currently only following type and subtype are handled. @@ -663,7 +663,7 @@ lim_check_mgmt_registered_frames(tpAniSirGlobal mac_ctx, uint8_t *buff_desc, if ((type == SIR_MAC_MGMT_FRAME) && (fc.type == SIR_MAC_MGMT_FRAME) && (sub_type == SIR_MAC_MGMT_RESERVED15)) { - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO_HIGH, FL ("rcvd frm match for SIR_MAC_MGMT_RESERVED15")); match = true; @@ -695,7 +695,7 @@ lim_check_mgmt_registered_frames(tpAniSirGlobal mac_ctx, uint8_t *buff_desc, } if (match) { - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, FL("rcvd frame match with registered frame params")); /* Indicate this to SME */ lim_send_sme_mgmt_frame_ind(mac_ctx, hdr->fc.subType, @@ -761,7 +761,7 @@ lim_handle80211_frames(tpAniSirGlobal pMac, tpSirMsgQ limMsg, uint8_t *pDeferMsg FL("ProtVersion %d, Type %d, Subtype %d rateIndex=%d"), fc.protVer, fc.type, fc.subType, WMA_GET_RX_MAC_RATE_IDX(pRxPacketInfo)); - CDF_TRACE_HEX_DUMP(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, pHdr, + CDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, pHdr, WMA_GET_RX_MPDU_HEADER_LEN(pRxPacketInfo)); #endif if (pMac->fEnableDebugLog & 0x1) { @@ -1218,7 +1218,7 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) */ if (lim_defer_msg(mac_ctx, msg) != TX_SUCCESS) { if (!(mac_ctx->lim.deferredMsgCnt & 0xF)) - CDF_TRACE(CDF_MODULE_ID_PE, LOGE, + CDF_TRACE(QDF_MODULE_ID_PE, LOGE, FL("Unable to Defer Msg")); lim_log_session_states(mac_ctx); lim_print_msg_name(mac_ctx, LOGE, msg->type); @@ -1280,10 +1280,10 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) lim_handle80211_frames(mac_ctx, &new_msg, &defer_msg); if (defer_msg == true) { - CDF_TRACE(CDF_MODULE_ID_PE, LOG1, + CDF_TRACE(QDF_MODULE_ID_PE, LOG1, FL("Defer Msg type=%x"), msg->type); if (lim_defer_msg(mac_ctx, msg) != TX_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_PE, LOGE, + CDF_TRACE(QDF_MODULE_ID_PE, LOGE, FL("Unable to Defer Msg")); lim_log_session_states(mac_ctx); cds_pkt_return_packet(body_ptr); @@ -1402,7 +1402,7 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) for (i = 0; i < mac_ctx->lim.maxBssId; i++) { session_entry = &mac_ctx->lim.gpSession[i]; if ((session_entry != NULL) && (session_entry->valid) && - (session_entry->pePersona == CDF_P2P_GO_MODE)) { + (session_entry->pePersona == QDF_P2P_GO_MODE)) { /* Save P2P NOA start attribute for Go persona*/ p2p_go_exists = 1; cdf_mem_copy(&session_entry->p2pGoPsNoaStartInd, @@ -1410,7 +1410,7 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) qdf_status = session_entry->p2pGoPsNoaStartInd.status; if (qdf_status != QDF_STATUS_SUCCESS) - CDF_TRACE(CDF_MODULE_ID_PE, LOGW, + CDF_TRACE(QDF_MODULE_ID_PE, LOGW, FL( "GO NOA start status %d by FW"), qdf_status); @@ -1419,7 +1419,7 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) } if (p2p_go_exists == 0) - CDF_TRACE(CDF_MODULE_ID_PE, LOGW, + CDF_TRACE(QDF_MODULE_ID_PE, LOGW, FL( "GO is removed by the time NOA start recvd")); @@ -1470,7 +1470,7 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) session_entry = &mac_ctx->lim.gpSession[i]; if ((session_entry != NULL) && (session_entry->valid) && (session_entry->pePersona == - CDF_P2P_GO_MODE)) { /* Save P2P attr for Go */ + QDF_P2P_GO_MODE)) { /* Save P2P attr for Go */ cdf_mem_copy( &session_entry->p2pGoPsUpdate, msg->bodyptr, @@ -1600,7 +1600,7 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) case SIR_HAL_TDLS_SHOULD_DISCOVER: case SIR_HAL_TDLS_SHOULD_TEARDOWN: case SIR_HAL_TDLS_PEER_DISCONNECTED: - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, ("%s received tdls event: 0x%x"), __func__, msg->type); lim_send_sme_tdls_event_notify(mac_ctx, msg->type, (void *)msg->bodyptr); @@ -2080,10 +2080,10 @@ void lim_log_session_states(tpAniSirGlobal mac_ctx) for (i = 0; i < mac_ctx->lim.maxBssId; i++) { if (mac_ctx->lim.gpSession[i].valid) { - CDF_TRACE(CDF_MODULE_ID_PE, LOG1, + CDF_TRACE(QDF_MODULE_ID_PE, LOG1, FL("sysRole(%d) Session (%d)"), mac_ctx->lim.gLimSystemRole, i); - CDF_TRACE(CDF_MODULE_ID_PE, LOG1, + CDF_TRACE(QDF_MODULE_ID_PE, LOG1, FL("SME: Curr %s,Prev %s,MLM: Curr %s,Prev %s"), lim_sme_state_str( mac_ctx->lim.gpSession[i].limSmeState), diff --git a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c index 649402b4ae..8bc3232a26 100644 --- a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c +++ b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c @@ -571,7 +571,7 @@ static void mlm_add_sta(tpAniSirGlobal mac_ctx, tpAddStaParams sta_param, sta_param->lsigTxopProtection, sta_param->fDsssCckMode40Mhz, sta_param->fShortGI20Mhz, sta_param->fShortGI40Mhz); - if (CDF_P2P_GO_MODE == session_entry->pePersona) + if (QDF_P2P_GO_MODE == session_entry->pePersona) sta_param->p2pCapableSta = 1; } @@ -1581,7 +1581,7 @@ lim_process_mlm_disassoc_req_ntf(tpAniSirGlobal mac_ctx, QDF_STATUS suspend_status, uint32_t *msg) { uint16_t aid; - struct cdf_mac_addr curr_bssid; + struct qdf_mac_addr curr_bssid; tpDphHashNode stads; tLimMlmDisassocReq *mlm_disassocreq; tLimMlmDisassocCnf mlm_disassoccnf; @@ -1613,7 +1613,7 @@ lim_process_mlm_disassoc_req_ntf(tpAniSirGlobal mac_ctx, session->limMlmState, MAC_ADDR_ARRAY(mlm_disassocreq->peer_macaddr.bytes)); - cdf_mem_copy(curr_bssid.bytes, session->bssId, CDF_MAC_ADDR_SIZE); + cdf_mem_copy(curr_bssid.bytes, session->bssId, QDF_MAC_ADDR_SIZE); switch (GET_LIM_SYSTEM_ROLE(session)) { case eLIM_STA_ROLE: @@ -1759,7 +1759,7 @@ lim_process_mlm_disassoc_req_ntf(tpAniSirGlobal mac_ctx, end: cdf_mem_copy((uint8_t *) &mlm_disassoccnf.peerMacAddr, (uint8_t *) mlm_disassocreq->peer_macaddr.bytes, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); mlm_disassoccnf.aid = mlm_disassocreq->aid; mlm_disassoccnf.disassocTrigger = mlm_disassocreq->disassocTrigger; @@ -1794,10 +1794,10 @@ bool lim_check_disassoc_deauth_ack_pending(tpAniSirGlobal mac_ctx, deauth_req = mac_ctx->lim.limDisassocDeauthCnfReq.pMlmDeauthReq; if ((disassoc_req && (cdf_mem_compare((uint8_t *) sta_mac, (uint8_t *) &disassoc_req->peer_macaddr.bytes, - CDF_MAC_ADDR_SIZE))) || + QDF_MAC_ADDR_SIZE))) || (deauth_req && (cdf_mem_compare((uint8_t *) sta_mac, (uint8_t *) &deauth_req->peer_macaddr.bytes, - CDF_MAC_ADDR_SIZE)))) { + QDF_MAC_ADDR_SIZE)))) { PELOG1(lim_log(mac_ctx, LOG1, FL("Disassoc/Deauth ack pending"));) return true; @@ -1828,7 +1828,7 @@ void lim_clean_up_disassoc_deauth_req(tpAniSirGlobal mac_ctx, if (mlm_disassoc_req && (cdf_mem_compare((uint8_t *) sta_mac, (uint8_t *) &mlm_disassoc_req->peer_macaddr.bytes, - CDF_MAC_ADDR_SIZE))) { + QDF_MAC_ADDR_SIZE))) { if (clean_rx_path) { lim_process_disassoc_ack_timeout(mac_ctx); } else { @@ -1847,7 +1847,7 @@ void lim_clean_up_disassoc_deauth_req(tpAniSirGlobal mac_ctx, if (mlm_deauth_req && (cdf_mem_compare((uint8_t *) sta_mac, (uint8_t *) &mlm_deauth_req->peer_macaddr.bytes, - CDF_MAC_ADDR_SIZE))) { + QDF_MAC_ADDR_SIZE))) { if (clean_rx_path) { lim_process_deauth_ack_timeout(mac_ctx); } else { @@ -1973,7 +1973,7 @@ lim_process_mlm_deauth_req_ntf(tpAniSirGlobal mac_ctx, case eLIM_MLM_WT_ASSOC_RSP_STATE: case eLIM_MLM_LINK_ESTABLISHED_STATE: if (!cdf_mem_compare(mlm_deauth_req->peer_macaddr.bytes, - curr_bssId, CDF_MAC_ADDR_SIZE)) { + curr_bssId, QDF_MAC_ADDR_SIZE)) { lim_log(mac_ctx, LOGE, FL("received MLM_DEAUTH_REQ with invalid BSS id " "Peer MAC: "MAC_ADDRESS_STR @@ -2011,7 +2011,7 @@ lim_process_mlm_deauth_req_ntf(tpAniSirGlobal mac_ctx, cdf_mem_copy(sme_deauth_rsp->peer_macaddr.bytes, mlm_deauth_req->peer_macaddr.bytes, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); msg_buf = (uint32_t *)sme_deauth_rsp; @@ -2233,7 +2233,7 @@ lim_process_mlm_set_keys_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) uint16_t aid; uint16_t sta_idx = 0; uint32_t default_key_id = 0; - struct cdf_mac_addr curr_bssid; + struct qdf_mac_addr curr_bssid; tpDphHashNode sta_ds; tLimMlmSetKeysReq *mlm_set_keys_req; tLimMlmSetKeysCnf mlm_set_keys_cnf; @@ -2261,7 +2261,7 @@ lim_process_mlm_set_keys_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) mlm_set_keys_req->aid, mlm_set_keys_req->edType, mlm_set_keys_req->numKeys); lim_print_mac_addr(mac_ctx, mlm_set_keys_req->peer_macaddr.bytes, LOGW); - cdf_mem_copy(curr_bssid.bytes, session->bssId, CDF_MAC_ADDR_SIZE); + cdf_mem_copy(curr_bssid.bytes, session->bssId, QDF_MAC_ADDR_SIZE); switch (GET_LIM_SYSTEM_ROLE(session)) { case eLIM_STA_ROLE: @@ -2647,7 +2647,7 @@ static void lim_process_auth_failure_timeout(tpAniSirGlobal mac_ctx) * Failure timeout. Issue MLM auth confirm with timeout reason * code. Restore default failure timeout */ - if (CDF_P2P_CLIENT_MODE == session->pePersona + if (QDF_P2P_CLIENT_MODE == session->pePersona && session->defaultAuthFailureTimeout) cfg_set_int(mac_ctx, WNI_CFG_AUTHENTICATE_FAILURE_TIMEOUT, diff --git a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c index 03c3c60123..ea57afd432 100644 --- a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c +++ b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c @@ -302,7 +302,7 @@ void lim_process_mlm_start_cnf(tpAniSirGlobal pMac, uint32_t *pMsgBuf) (cds_get_channel_state(channelId) != CHANNEL_STATE_DFS))) { /* Configure beacon and send beacons to HAL */ - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, FL("Start Beacon with ssid %s Ch %d"), psessionEntry->ssId.ssId, psessionEntry->currentOperChannel); @@ -840,7 +840,7 @@ void lim_process_mlm_reassoc_cnf(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) #ifdef WLAN_FEATURE_ROAM_OFFLOAD if (session->bRoamSynchInProgress) { - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG, FL("LFR3:Re-set the LIM Ctxt Roam Synch In Progress")); session->bRoamSynchInProgress = false; } @@ -850,7 +850,7 @@ void lim_process_mlm_reassoc_cnf(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) lim_mlm_reassoc_cnf->resultCode); if (lim_mlm_reassoc_cnf->resultCode == eSIR_SME_SUCCESS) { /* Successful Reassociation */ - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG, FL("*** Reassociated with new BSS ***")); session->limSmeState = eLIM_SME_LINK_EST_STATE; @@ -2752,7 +2752,7 @@ lim_process_sta_mlm_add_bss_rsp_ft(tpAniSirGlobal pMac, tpSirMsgQ limMsgQ, psessionEntry); #ifdef WLAN_FEATURE_ROAM_OFFLOAD } else { - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG, "LFR3:Do not activate timer and dont send the reassoc req"); } #endif @@ -2876,7 +2876,7 @@ lim_process_sta_mlm_add_bss_rsp_ft(tpAniSirGlobal pMac, tpSirMsgQ limMsgQ, } #ifdef WLAN_FEATURE_ROAM_OFFLOAD if (psessionEntry->bRoamSynchInProgress) { - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG, "LFR3:Prepare and save pAddStaReq in pMac for post-assoc-rsp"); lim_process_assoc_rsp_frame(pMac, pMac->roam.pReassocResp, LIM_REASSOC, psessionEntry); @@ -2976,7 +2976,7 @@ lim_process_sta_mlm_add_bss_rsp(tpAniSirGlobal mac_ctx, goto end; #ifdef WLAN_FEATURE_ROAM_OFFLOAD if (session_entry->bRoamSynchInProgress) - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG, "LFR3:lim_process_sta_mlm_add_bss_rsp"); #endif @@ -3572,7 +3572,7 @@ static void lim_process_switch_channel_join_req( session_entry->pLimJoinReq->addIEScan.length, session_entry->pLimJoinReq->addIEScan.addIEdata); - if (session_entry->pePersona == CDF_P2P_CLIENT_MODE) { + if (session_entry->pePersona == QDF_P2P_CLIENT_MODE) { /* Activate Join Periodic Probe Req timer */ if (tx_timer_activate (&mac_ctx->lim.limTimers.gLimPeriodicJoinProbeReqTimer) @@ -4096,7 +4096,7 @@ void lim_send_beacon_ind(tpAniSirGlobal pMac, tpPESession psessionEntry) } cdf_mem_set(pBeaconGenParams, sizeof(*pBeaconGenParams), 0); cdf_mem_copy((void *)pBeaconGenParams->bssId, - (void *)psessionEntry->bssId, CDF_MAC_ADDR_SIZE); + (void *)psessionEntry->bssId, QDF_MAC_ADDR_SIZE); limMsg.bodyptr = pBeaconGenParams; sch_process_pre_beacon_ind(pMac, &limMsg); return; @@ -4131,8 +4131,8 @@ void lim_send_sme_scan_cache_updated_ind(uint8_t sessionId) msg.bodyval = sessionId; if (!QDF_IS_STATUS_SUCCESS - (cds_mq_post_message(CDF_MODULE_ID_WMA, &msg))) - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + (cds_mq_post_message(QDF_MODULE_ID_WMA, &msg))) + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to post WMA_SME_SCAN_CACHE_UPDATED message to WMA", __func__); } @@ -4154,7 +4154,7 @@ void lim_process_rx_scan_event(tpAniSirGlobal pMac, void *buf) { tSirScanOffloadEvent *pScanEvent = (tSirScanOffloadEvent *) buf; - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, "scan_id = %u, scan_requestor_id 0x%x", pScanEvent->scanId, pScanEvent->requestor); switch (pScanEvent->event) { @@ -4212,7 +4212,7 @@ void lim_process_rx_scan_event(tpAniSirGlobal pMac, void *buf) case SCAN_EVENT_DEQUEUED: case SCAN_EVENT_PREEMPTED: default: - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG, "Received unhandled scan event %u", pScanEvent->event); } diff --git a/core/mac/src/pe/lim/lim_process_probe_req_frame.c b/core/mac/src/pe/lim/lim_process_probe_req_frame.c index 6e45cd5405..2812253e6f 100644 --- a/core/mac/src/pe/lim/lim_process_probe_req_frame.c +++ b/core/mac/src/pe/lim/lim_process_probe_req_frame.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. * @@ -71,7 +71,7 @@ lim_send_sme_probe_req_ind(tpAniSirGlobal pMac, * @return None */ -void lim_get_wpspbc_sessions(tpAniSirGlobal mac_ctx, struct cdf_mac_addr addr, +void lim_get_wpspbc_sessions(tpAniSirGlobal mac_ctx, struct qdf_mac_addr addr, uint8_t *uuid_e, eWPSPBCOverlap *overlap, tpPESession session) { @@ -80,7 +80,7 @@ void lim_get_wpspbc_sessions(tpAniSirGlobal mac_ctx, struct cdf_mac_addr addr, uint32_t cur_time; cur_time = (uint32_t) (cdf_mc_timer_get_system_ticks() / - CDF_TICKS_PER_SECOND); + QDF_TICKS_PER_SECOND); cdf_zero_macaddr(&addr); cdf_mem_set((uint8_t *) uuid_e, SIR_WPS_UUID_LEN, 0); for (pbc = session->pAPWPSPBCSession; pbc; pbc = pbc->next) { @@ -105,7 +105,7 @@ void lim_get_wpspbc_sessions(tpAniSirGlobal mac_ctx, struct cdf_mac_addr addr, lim_log(mac_ctx, LOGE, FL("overlap = %d"), *overlap); sir_dump_buf(mac_ctx, SIR_LIM_MODULE_ID, LOGE, addr.bytes, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); sir_dump_buf(mac_ctx, SIR_LIM_MODULE_ID, LOGE, uuid_e, SIR_WPS_UUID_LEN); return; @@ -152,7 +152,7 @@ static void lim_remove_timeout_pbc_sessions(tpAniSirGlobal pMac, * * Return: none */ -void lim_remove_pbc_sessions(tpAniSirGlobal mac, struct cdf_mac_addr remove_mac, +void lim_remove_pbc_sessions(tpAniSirGlobal mac, struct qdf_mac_addr remove_mac, tpPESession session_entry) { tSirWPSPBCSession *pbc, *prev = NULL; @@ -205,7 +205,7 @@ static void lim_update_pbc_session_entry(tpAniSirGlobal pMac, curTime = (uint32_t) (cdf_mc_timer_get_system_ticks() / - CDF_TICKS_PER_SECOND); + QDF_TICKS_PER_SECOND); PELOG4(lim_log (pMac, LOG4, FL("Receive WPS probe reques curTime=%d"), curTime); @@ -222,7 +222,7 @@ static void lim_update_pbc_session_entry(tpAniSirGlobal pMac, while (pbc) { if (cdf_mem_compare ((uint8_t *) pbc->addr.bytes, (uint8_t *) addr, - CDF_MAC_ADDR_SIZE) + QDF_MAC_ADDR_SIZE) && cdf_mem_compare((uint8_t *) pbc->uuid_e, (uint8_t *) uuid_e, SIR_WPS_UUID_LEN)) { if (prev) @@ -244,7 +244,7 @@ static void lim_update_pbc_session_entry(tpAniSirGlobal pMac, return; } cdf_mem_copy((uint8_t *) pbc->addr.bytes, (uint8_t *) addr, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); if (uuid_e) cdf_mem_copy((uint8_t *) pbc->uuid_e, @@ -366,7 +366,7 @@ lim_process_probe_req_frame(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info, * Don't send probe response if P2P go is scanning till scan * come to idle state. */ - if ((session->pePersona == CDF_P2P_GO_MODE) && + if ((session->pePersona == QDF_P2P_GO_MODE) && ((mac_ctx->lim.gpLimRemainOnChanReq) || (mac_ctx->lim.gLimHalScanState != eLIM_HAL_IDLE_SCAN_STATE))) { lim_log(mac_ctx, LOG3, @@ -398,7 +398,7 @@ lim_process_probe_req_frame(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info, mac_ctx->sys.probeError++; return; } - if (session->pePersona == CDF_P2P_GO_MODE) { + if (session->pePersona == QDF_P2P_GO_MODE) { uint8_t i = 0, rate_11b = 0, other_rates = 0; /* Check 11b rates in supported rates */ for (i = 0; i < probe_req.supportedRates.numRates; @@ -473,7 +473,7 @@ lim_process_probe_req_frame(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info, probe_req.p2pIePresent); return; } else if (session->pePersona == - CDF_P2P_GO_MODE) { + QDF_P2P_GO_MODE) { uint8_t direct_ssid[7] = "DIRECT-"; uint8_t direct_ssid_len = 7; if (cdf_mem_compare((uint8_t *) &direct_ssid, @@ -669,9 +669,9 @@ lim_send_sme_probe_req_ind(tpAniSirGlobal pMac, pSirSmeProbeReqInd->sessionId = psessionEntry->smeSessionId; cdf_mem_copy(pSirSmeProbeReqInd->bssid.bytes, psessionEntry->bssId, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); cdf_mem_copy(pSirSmeProbeReqInd->WPSPBCProbeReq.peer_macaddr.bytes, - peerMacAddr, CDF_MAC_ADDR_SIZE); + peerMacAddr, QDF_MAC_ADDR_SIZE); MTRACE(mac_trace_msg_tx(pMac, psessionEntry->peSessionId, msgQ.type)); pSirSmeProbeReqInd->WPSPBCProbeReq.probeReqIELen = diff --git a/core/mac/src/pe/lim/lim_process_probe_rsp_frame.c b/core/mac/src/pe/lim/lim_process_probe_rsp_frame.c index 16b960cf5e..911b59fd9b 100644 --- a/core/mac/src/pe/lim/lim_process_probe_rsp_frame.c +++ b/core/mac/src/pe/lim/lim_process_probe_rsp_frame.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. * @@ -125,7 +125,7 @@ lim_process_probe_rsp_frame(tpAniSirGlobal mac_ctx, uint8_t *rx_Packet_info, } frame_len = WMA_GET_RX_PAYLOAD_LEN(rx_Packet_info); - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, FL("Probe Resp Frame Received: BSSID " MAC_ADDRESS_STR " (RSSI %d)"), MAC_ADDR_ARRAY(header->bssId), @@ -345,7 +345,7 @@ lim_process_probe_rsp_frame_no_session(tpAniSirGlobal mac_ctx, } frame_len = WMA_GET_RX_PAYLOAD_LEN(rx_packet_info); - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, FL("Probe Resp Frame Received: BSSID " MAC_ADDRESS_STR " (RSSI %d)"), MAC_ADDR_ARRAY(header->bssId), diff --git a/core/mac/src/pe/lim/lim_process_sme_req_messages.c b/core/mac/src/pe/lim/lim_process_sme_req_messages.c index 060eea4cae..47b4b71baa 100644 --- a/core/mac/src/pe/lim/lim_process_sme_req_messages.c +++ b/core/mac/src/pe/lim/lim_process_sme_req_messages.c @@ -316,7 +316,7 @@ __lim_fresh_scan_reqd(tpAniSirGlobal mac_ctx, uint8_t return_fresh_results) ((((mac_ctx->lim.gpSession[i].bssType == eSIR_INFRA_AP_MODE) && (mac_ctx->lim.gpSession[i].pePersona == - CDF_P2P_GO_MODE)) || + QDF_P2P_GO_MODE)) || (mac_ctx->lim.gpSession[i].limSystemRole == eLIM_AP_ROLE)) && (mac_ctx->lim.gpSession[i].limSmeState == @@ -521,7 +521,7 @@ lim_configure_ap_start_bss_session(tpAniSirGlobal mac_ctx, tpPESession session, session->dtimPeriod = (uint8_t) sme_start_bss_req->dtimPeriod; /* Enable/disable UAPSD */ session->apUapsdEnable = sme_start_bss_req->apUapsdEnable; - if (session->pePersona == CDF_P2P_GO_MODE) { + if (session->pePersona == QDF_P2P_GO_MODE) { session->proxyProbeRspEn = 0; } else { /* @@ -694,7 +694,7 @@ __lim_handle_sme_start_bss_request(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) /* Store Persona */ session->pePersona = sme_start_bss_req->bssPersona; - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, FL("PE PERSONA=%d"), session->pePersona); /* Update the phymode */ @@ -713,7 +713,7 @@ __lim_handle_sme_start_bss_request(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) IS_DOT11_MODE_HT(session->dot11mode); session->vhtCapability = IS_DOT11_MODE_VHT(session->dot11mode); - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, FL("*****session->vhtCapability = %d"), session->vhtCapability); session->txLdpcIniFeatureEnabled = @@ -740,7 +740,7 @@ __lim_handle_sme_start_bss_request(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) case eSIR_INFRA_AP_MODE: lim_configure_ap_start_bss_session(mac_ctx, session, sme_start_bss_req); - if (session->pePersona == CDF_SAP_MODE) { + if (session->pePersona == QDF_SAP_MODE) { session->txBFIniFeatureEnabled = sme_start_bss_req->txbf_ini_enabled; session->txbf_csn_value = @@ -820,7 +820,7 @@ __lim_handle_sme_start_bss_request(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) sme_start_bss_req->sec_ch_offset; session->htRecommendedTxWidthSet = (session->htSecondaryChannelOffset) ? 1 : 0; - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, FL("cbMode %u"), sme_start_bss_req->cbMode); if (session->vhtCapability || session->htCapability) { chanwidth = sme_start_bss_req->vht_channel_width; @@ -1692,7 +1692,7 @@ __lim_process_sme_join_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) /*Store Persona */ session->pePersona = sme_join_req->staPersona; - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, FL("PE PERSONA=%d cbMode %u"), session->pePersona, sme_join_req->cbMode); if (mac_ctx->roam.configParam.enable2x2) @@ -1702,11 +1702,11 @@ __lim_process_sme_join_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) #ifdef WLAN_FEATURE_11AC session->vhtCapability = IS_DOT11_MODE_VHT(session->dot11mode); - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO_MED, "***__lim_process_sme_join_req: vhtCapability=%d****", session->vhtCapability); if (session->vhtCapability) { - if (session->pePersona == CDF_STA_MODE) { + if (session->pePersona == QDF_STA_MODE) { session->txBFIniFeatureEnabled = sme_join_req->txBFIniFeatureEnabled; } else { @@ -1718,7 +1718,7 @@ __lim_process_sme_join_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) session->enableVhtGid = sme_join_req->enableVhtGid; - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO_MED, FL("***txBFIniFeatureEnabled=%d***"), session->txBFIniFeatureEnabled); if (wlan_cfg_get_int(mac_ctx, @@ -1743,7 +1743,7 @@ __lim_process_sme_join_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) ret_code = eSIR_LOGP_EXCEPTION; goto end; } - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO_MED, "%s: txBFCsnValue=%d", __func__, sme_join_req->txBFCsnValue); session->txbf_csn_value = sme_join_req->txBFCsnValue; @@ -1908,7 +1908,7 @@ __lim_process_sme_join_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) mac_ctx->roam.configParam.nTxPowerCap); #else session->maxTxPower = - CDF_MIN(reg_max, (local_power_constraint)); + QDF_MIN(reg_max, (local_power_constraint)); #endif #if defined WLAN_VOWIFI_DEBUG lim_log(mac_ctx, LOGE, @@ -2026,8 +2026,8 @@ uint8_t lim_get_max_tx_power(int8_t regMax, int8_t apTxPower, uint8_t iniTxPower) { uint8_t maxTxPower = 0; - uint8_t txPower = CDF_MIN(regMax, (apTxPower)); - txPower = CDF_MIN(txPower, iniTxPower); + uint8_t txPower = QDF_MIN(regMax, (apTxPower)); + txPower = QDF_MIN(txPower, iniTxPower); if ((txPower >= MIN_TX_PWR_CAP) && (txPower <= MAX_TX_PWR_CAP)) maxTxPower = txPower; else if (txPower < MIN_TX_PWR_CAP) @@ -2188,7 +2188,7 @@ static void __lim_process_sme_reassoc_req(tpAniSirGlobal mac_ctx, &session_entry->limReassocBssPropCap, &session_entry->gLimCurrentBssUapsd, &local_pwr_constraint, session_entry); - session_entry->maxTxPower = CDF_MIN(reg_max, (local_pwr_constraint)); + session_entry->maxTxPower = QDF_MIN(reg_max, (local_pwr_constraint)); #if defined WLAN_VOWIFI_DEBUG lim_log(mac_ctx, LOGE, "Regulatory max = %d, local pwr constraint = %d, max tx = %d", @@ -3114,7 +3114,7 @@ void lim_process_sme_get_assoc_sta_info(tpAniSirGlobal mac_ctx, if (sta_ds->valid) { cdf_mem_copy((uint8_t *) &assoc_sta_tmp->staMac, (uint8_t *) &sta_ds->staAddr, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); assoc_sta_tmp->assocId = (uint8_t) sta_ds->assocId; assoc_sta_tmp->staId = (uint8_t) sta_ds->staIndex; @@ -3146,7 +3146,7 @@ lim_assoc_sta_end: if (sap_event_cb != NULL) { sap_event.sapHddEventCode = eSAP_ASSOC_STA_CALLBACK_EVENT; sap_event.sapevt.sapAssocStaListEvent.module = - CDF_MODULE_ID_PE; + QDF_MODULE_ID_PE; sap_event.sapevt.sapAssocStaListEvent.noOfAssocSta = sta_cnt; sap_event.sapevt.sapAssocStaListEvent.pAssocStas = (tpSap_AssocMacAddr)get_assoc_stas_req.pAssocStasArray; @@ -3209,7 +3209,7 @@ void lim_process_sme_get_wpspbc_sessions(tpAniSirGlobal mac_ctx, * WPS PBC overlap information */ sap_event.sapHddEventCode = eSAP_GET_WPSPBC_SESSION_EVENT; - sap_get_wpspbc_event->module = CDF_MODULE_ID_PE; + sap_get_wpspbc_event->module = QDF_MODULE_ID_PE; if (cdf_is_macaddr_zero(&get_wps_pbc_sessions_req.remove_mac)) { lim_get_wpspbc_sessions(mac_ctx, @@ -3554,7 +3554,7 @@ void __lim_process_sme_assoc_cnf_new(tpAniSirGlobal mac_ctx, uint32_t msg_type, } if (!cdf_mem_compare((uint8_t *)sta_ds->staAddr, (uint8_t *) assoc_cnf.peer_macaddr.bytes, - CDF_MAC_ADDR_SIZE)) { + QDF_MAC_ADDR_SIZE)) { lim_log(mac_ctx, LOG1, FL( "peerMacAddr mismatched for aid %d, peer "), assoc_cnf.aid); @@ -4351,7 +4351,7 @@ static void __lim_process_sme_set_ht2040_mode(tpAniSirGlobal pMac, msg.reserved = 0; msg.bodyptr = pHtOpMode; if (!QDF_IS_STATUS_SUCCESS - (cds_mq_post_message(CDF_MODULE_ID_WMA, &msg))) { + (cds_mq_post_message(QDF_MODULE_ID_WMA, &msg))) { lim_log(pMac, LOGE, FL ("%s: Not able to post WMA_UPDATE_OP_MODE message to WMA"), @@ -4456,10 +4456,10 @@ lim_send_set_max_tx_power_req(tpAniSirGlobal pMac, int8_t txPower, } pMaxTxParams->power = txPower; cdf_mem_copy(pMaxTxParams->bssId.bytes, pSessionEntry->bssId, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); cdf_mem_copy(pMaxTxParams->selfStaMacAddr.bytes, pSessionEntry->selfMacAddr, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); msgQ.type = WMA_SET_MAX_TX_POWER_REQ; msgQ.bodyptr = pMaxTxParams; @@ -4998,7 +4998,7 @@ static void lim_process_sme_start_beacon_req(tpAniSirGlobal pMac, uint32_t *pMsg * Tx right after the WMA_ADD_BSS_RSP. */ lim_apply_configuration(pMac, psessionEntry); - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, FL("Start Beacon with ssid %s Ch %d"), psessionEntry->ssId.ssId, psessionEntry->currentOperChannel); @@ -5263,7 +5263,7 @@ static void lim_process_modify_add_ies(tpAniSirGlobal mac_ctx, case eUPDATE_IE_ASSOC_RESP: /* assoc resp IE */ if (add_ie_params->assocRespDataLen == 0) { - CDF_TRACE(CDF_MODULE_ID_PE, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, FL( "assoc resp add ie not present %d"), add_ie_params->assocRespDataLen); diff --git a/core/mac/src/pe/lim/lim_process_tdls.c b/core/mac/src/pe/lim/lim_process_tdls.c index 498ab623f0..d373967f78 100644 --- a/core/mac/src/pe/lim/lim_process_tdls.c +++ b/core/mac/src/pe/lim/lim_process_tdls.c @@ -92,7 +92,7 @@ static tSirRetStatus lim_tdls_setup_add_sta(tpAniSirGlobal pMac, tSirTdlsAddStaReq * pAddStaReq, tpPESession psessionEntry); void populate_dot11f_link_iden(tpAniSirGlobal pMac, tpPESession psessionEntry, tDot11fIELinkIdentifier *linkIden, - struct cdf_mac_addr peer_mac, uint8_t reqType); + struct qdf_mac_addr peer_mac, uint8_t reqType); void populate_dot11f_tdls_ext_capability(tpAniSirGlobal pMac, tpPESession psessionEntry, tDot11fIEExtCap *extCapability); @@ -344,7 +344,7 @@ QDF_STATUS lim_mgmt_tx_complete(tpAniSirGlobal pMac, uint32_t txCompleteSuccess) * We are not differentiating it here, it will all depnds on peer MAC address, */ tSirRetStatus lim_send_tdls_dis_req_frame(tpAniSirGlobal pMac, - struct cdf_mac_addr peer_mac, + struct qdf_mac_addr peer_mac, uint8_t dialog, tpPESession psessionEntry) { @@ -593,7 +593,7 @@ static void populate_dot11f_tdls_ht_vht_cap(tpAniSirGlobal pMac, */ static tSirRetStatus lim_send_tdls_dis_rsp_frame(tpAniSirGlobal pMac, - struct cdf_mac_addr peer_mac, + struct qdf_mac_addr peer_mac, uint8_t dialog, tpPESession psessionEntry, uint8_t *addIe, @@ -814,7 +814,7 @@ static tSirRetStatus lim_send_tdls_dis_rsp_frame(tpAniSirGlobal pMac, * lim_send_tdls_setup_rsp_frame to populate the AID if device is 11ac capable. */ static void populate_dotf_tdls_vht_aid(tpAniSirGlobal pMac, uint32_t selfDot11Mode, - struct cdf_mac_addr peerMac, + struct qdf_mac_addr peerMac, tDot11fIEAID *Aid, tpPESession psessionEntry) { @@ -853,7 +853,7 @@ static void populate_dotf_tdls_vht_aid(tpAniSirGlobal pMac, uint32_t selfDot11Mo */ tSirRetStatus lim_send_tdls_link_setup_req_frame(tpAniSirGlobal pMac, - struct cdf_mac_addr peer_mac, + struct qdf_mac_addr peer_mac, uint8_t dialog, tpPESession psessionEntry, uint8_t *addIe, @@ -1135,7 +1135,7 @@ tSirRetStatus lim_send_tdls_link_setup_req_frame(tpAniSirGlobal pMac, */ tSirRetStatus lim_send_tdls_teardown_frame(tpAniSirGlobal pMac, - struct cdf_mac_addr peer_mac, + struct qdf_mac_addr peer_mac, uint16_t reason, uint8_t responder, tpPESession psessionEntry, @@ -1335,7 +1335,7 @@ tSirRetStatus lim_send_tdls_teardown_frame(tpAniSirGlobal pMac, * Send Setup RSP frame on AP link. */ static tSirRetStatus lim_send_tdls_setup_rsp_frame(tpAniSirGlobal pMac, - struct cdf_mac_addr peer_mac, + struct qdf_mac_addr peer_mac, uint8_t dialog, tpPESession psessionEntry, etdlsLinkSetupStatus setupStatus, @@ -1614,7 +1614,7 @@ static tSirRetStatus lim_send_tdls_setup_rsp_frame(tpAniSirGlobal pMac, */ tSirRetStatus lim_send_tdls_link_setup_cnf_frame(tpAniSirGlobal pMac, - struct cdf_mac_addr peer_mac, + struct qdf_mac_addr peer_mac, uint8_t dialog, uint32_t peerCapability, tpPESession psessionEntry, @@ -2442,7 +2442,7 @@ static tSirRetStatus lim_tdls_setup_add_sta(tpAniSirGlobal pMac, * Del STA, after Link is teardown or discovery response sent on direct link */ static tpDphHashNode lim_tdls_del_sta(tpAniSirGlobal pMac, - struct cdf_mac_addr peerMac, + struct qdf_mac_addr peerMac, tpPESession psessionEntry) { tSirRetStatus status = eSIR_SUCCESS; @@ -2495,7 +2495,7 @@ static QDF_STATUS lim_send_sme_tdls_add_sta_rsp(tpAniSirGlobal pMac, } if (peerMac) { cdf_mem_copy(addStaRsp->peermac.bytes, - (uint8_t *) peerMac, CDF_MAC_ADDR_SIZE); + (uint8_t *) peerMac, QDF_MAC_ADDR_SIZE); } if (updateSta) addStaRsp->tdlsAddOper = TDLS_OPER_UPDATE; @@ -2668,7 +2668,7 @@ void populate_dot11f_tdls_offchannel_params(tpAniSirGlobal pMac, void populate_dot11f_link_iden(tpAniSirGlobal pMac, tpPESession psessionEntry, tDot11fIELinkIdentifier *linkIden, - struct cdf_mac_addr peer_mac, uint8_t reqType) + struct qdf_mac_addr peer_mac, uint8_t reqType) { uint8_t *initStaAddr = NULL; uint8_t *respStaAddr = NULL; @@ -2678,13 +2678,13 @@ void populate_dot11f_link_iden(tpAniSirGlobal pMac, tpPESession psessionEntry, : ((respStaAddr = linkIden->InitStaAddr), (initStaAddr = linkIden->RespStaAddr)); cdf_mem_copy((uint8_t *) linkIden->bssid, - (uint8_t *) psessionEntry->bssId, CDF_MAC_ADDR_SIZE); + (uint8_t *) psessionEntry->bssId, QDF_MAC_ADDR_SIZE); cdf_mem_copy((uint8_t *) initStaAddr, - psessionEntry->selfMacAddr, CDF_MAC_ADDR_SIZE); + psessionEntry->selfMacAddr, QDF_MAC_ADDR_SIZE); cdf_mem_copy((uint8_t *) respStaAddr, (uint8_t *) peer_mac.bytes, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); linkIden->present = 1; return; @@ -2754,7 +2754,7 @@ tSirRetStatus lim_process_sme_tdls_mgmt_send_req(tpAniSirGlobal mac_ctx, /* check if we are in proper state to work as TDLS client */ if (!LIM_IS_STA_ROLE(session_entry)) { - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, FL("send mgmt received in wrong system Role %d"), GET_LIM_SYSTEM_ROLE(session_entry)); goto lim_tdls_send_mgmt_error; @@ -2847,7 +2847,7 @@ lim_tdls_send_mgmt_error: */ void lim_send_sme_tdls_link_establish_req_rsp(tpAniSirGlobal pMac, uint8_t sessionId, - struct cdf_mac_addr *peermac, + struct qdf_mac_addr *peermac, tDphHashNode *pStaDs, uint8_t status) { tSirMsgQ mmhMsg = { 0 }; @@ -2878,7 +2878,7 @@ void lim_send_sme_tdls_link_establish_req_rsp(tpAniSirGlobal pMac, */ static QDF_STATUS lim_send_sme_tdls_del_sta_rsp(tpAniSirGlobal pMac, uint8_t sessionId, - struct cdf_mac_addr peerMac, + struct qdf_mac_addr peerMac, tDphHashNode *pStaDs, uint8_t status) { tSirMsgQ mmhMsg = { 0 }; @@ -2937,7 +2937,7 @@ tSirRetStatus lim_process_sme_tdls_add_sta_req(tpAniSirGlobal pMac, /* check if we are in proper state to work as TDLS client */ if (!LIM_IS_STA_ROLE(psessionEntry)) { - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, "send mgmt received in wrong system Role %d", GET_LIM_SYSTEM_ROLE(psessionEntry)); goto lim_tdls_add_sta_error; @@ -3005,7 +3005,7 @@ tSirRetStatus lim_process_sme_tdls_del_sta_req(tpAniSirGlobal pMac, /* check if we are in proper state to work as TDLS client */ if (!LIM_IS_STA_ROLE(psessionEntry)) { - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, "Del sta received in wrong system Role %d", GET_LIM_SYSTEM_ROLE(psessionEntry)); goto lim_tdls_del_sta_error; @@ -3103,13 +3103,13 @@ tSirRetStatus lim_process_sme_tdls_link_establish_req(tpAniSirGlobal mac_ctx, uint32_t self_num_chan = WNI_CFG_VALID_CHANNEL_LIST_LEN; uint8_t self_supp_chan[WNI_CFG_VALID_CHANNEL_LIST_LEN]; - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, FL("Send Mgmt Recieved")); session_entry = pe_find_session_by_bssid(mac_ctx, tdls_req->bssid.bytes, &session_id); if (NULL == session_entry) { - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, FL("PE Session does not exist for sme session_id %d"), tdls_req->sessionId); lim_send_sme_tdls_link_establish_req_rsp(mac_ctx, @@ -3120,7 +3120,7 @@ tSirRetStatus lim_process_sme_tdls_link_establish_req(tpAniSirGlobal mac_ctx, /* check if we are in proper state to work as TDLS client */ if (!LIM_IS_STA_ROLE(session_entry)) { - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, FL("TDLS Link Establish Request received in wrong system Role %d"), GET_LIM_SYSTEM_ROLE(session_entry)); goto lim_tdls_link_establish_error; diff --git a/core/mac/src/pe/lim/lim_prop_exts_utils.c b/core/mac/src/pe/lim/lim_prop_exts_utils.c index 2ec7b318a1..5fcf9bac0f 100644 --- a/core/mac/src/pe/lim/lim_prop_exts_utils.c +++ b/core/mac/src/pe/lim/lim_prop_exts_utils.c @@ -117,11 +117,11 @@ lim_extract_ap_capability(tpAniSirGlobal mac_ctx, uint8_t *p_ie, mac_ctx->lim.htCapabilityPresentInBeacon = 0; #ifdef WLAN_FEATURE_11AC - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO_MED, "beacon.VHTCaps.present = %d BSS_VHT_Capable:%d", beacon_struct->VHTCaps.present, IS_BSS_VHT_CAPABLE(beacon_struct->VHTCaps)); - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO_MED, "***beacon.SU Beamformer Capable*****=%d", beacon_struct->VHTCaps.suBeamFormerCap); @@ -165,7 +165,7 @@ lim_extract_ap_capability(tpAniSirGlobal mac_ctx, uint8_t *p_ie, beacon_struct->VHTOperation.chanWidth) { /* If VHT is supported min 80 MHz support is must */ uint32_t fw_vht_ch_wd = wma_get_vht_ch_width(); - uint32_t vht_ch_wd = CDF_MIN(fw_vht_ch_wd, + uint32_t vht_ch_wd = QDF_MIN(fw_vht_ch_wd, beacon_struct->VHTOperation.chanWidth); if (vht_ch_wd == beacon_struct->VHTOperation.chanWidth || vht_ch_wd >= WNI_CFG_VHT_CHANNEL_WIDTH_160MHZ) { diff --git a/core/mac/src/pe/lim/lim_send_management_frames.c b/core/mac/src/pe/lim/lim_send_management_frames.c index b04183adb7..44eb433567 100644 --- a/core/mac/src/pe/lim/lim_send_management_frames.c +++ b/core/mac/src/pe/lim/lim_send_management_frames.c @@ -56,7 +56,7 @@ #include "lim_ft_defs.h" #endif #include "lim_session.h" -#include "cdf_types.h" +#include "qdf_types.h" #include "cdf_trace.h" #include "cds_utils.h" #include "sme_trace.h" @@ -271,7 +271,7 @@ lim_send_probe_req_mgmt_frame(tpAniSirGlobal mac_ctx, (((mac_ctx->lim.gpLimMlmScanReq != NULL) && mac_ctx->lim.gpLimMlmScanReq->p2pSearch) || ((pesession != NULL) && - (CDF_P2P_CLIENT_MODE == pesession->pePersona)) + (QDF_P2P_CLIENT_MODE == pesession->pePersona)) ) ) { /* @@ -417,7 +417,7 @@ lim_send_probe_req_mgmt_frame(tpAniSirGlobal mac_ctx, * is pePersona is P2P_CLIENT or not */ || ((pesession != NULL) && - (CDF_P2P_CLIENT_MODE == pesession->pePersona)) + (QDF_P2P_CLIENT_MODE == pesession->pePersona)) ) { txflag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME; } @@ -553,10 +553,10 @@ lim_send_probe_rsp_mgmt_frame(tpAniSirGlobal mac_ctx, * In case when cac timer is running for this SAP session then * avoid sending probe rsp out. It is violation of dfs specification. */ - if (((pe_session->pePersona == CDF_SAP_MODE) || - (pe_session->pePersona == CDF_P2P_GO_MODE)) && + if (((pe_session->pePersona == QDF_SAP_MODE) || + (pe_session->pePersona == QDF_P2P_GO_MODE)) && (true == mac_ctx->sap.SapDfsInfo.is_dfs_cac_timer_running)) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, FL("CAC timer is running, probe response dropped")); return; } @@ -835,8 +835,8 @@ lim_send_probe_rsp_mgmt_frame(tpAniSirGlobal mac_ctx, } if ((SIR_BAND_5_GHZ == lim_get_rf_band(pe_session->currentOperChannel)) - || (pe_session->pePersona == CDF_P2P_CLIENT_MODE) || - (pe_session->pePersona == CDF_P2P_GO_MODE) + || (pe_session->pePersona == QDF_P2P_CLIENT_MODE) || + (pe_session->pePersona == QDF_P2P_GO_MODE) ) tx_flag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME; @@ -1059,13 +1059,13 @@ lim_send_addts_req_action_frame(tpAniSirGlobal pMac, if ((SIR_BAND_5_GHZ == lim_get_rf_band(psessionEntry->currentOperChannel)) - || (psessionEntry->pePersona == CDF_P2P_CLIENT_MODE) - || (psessionEntry->pePersona == CDF_P2P_GO_MODE) + || (psessionEntry->pePersona == QDF_P2P_CLIENT_MODE) + || (psessionEntry->pePersona == QDF_P2P_GO_MODE) ) { txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME; } - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, psessionEntry->peSessionId, pMacHdr->fc.subType)); /* Queue Addts Response frame in high priority WQ */ @@ -1074,7 +1074,7 @@ lim_send_addts_req_action_frame(tpAniSirGlobal pMac, ANI_TXDIR_TODS, 7, lim_tx_complete, pFrame, txFlag, smeSessionId, 0); - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, psessionEntry->peSessionId, qdf_status)); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { @@ -1384,11 +1384,11 @@ lim_send_assoc_rsp_mgmt_frame(tpAniSirGlobal mac_ctx, if ((SIR_BAND_5_GHZ == lim_get_rf_band(pe_session->currentOperChannel)) || - (pe_session->pePersona == CDF_P2P_CLIENT_MODE) || - (pe_session->pePersona == CDF_P2P_GO_MODE)) + (pe_session->pePersona == QDF_P2P_CLIENT_MODE) || + (pe_session->pePersona == QDF_P2P_GO_MODE)) tx_flag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME; - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, pe_session->peSessionId, mac_hdr->fc.subType)); /* Queue Association Response frame in high priority WQ */ qdf_status = wma_tx_frame(mac_ctx, packet, (uint16_t) bytes, @@ -1396,7 +1396,7 @@ lim_send_assoc_rsp_mgmt_frame(tpAniSirGlobal mac_ctx, ANI_TXDIR_TODS, 7, lim_tx_complete, frame, tx_flag, sme_session, 0); - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, pe_session->peSessionId, qdf_status)); /* Pkt will be freed up by the callback */ @@ -1546,20 +1546,20 @@ lim_send_delts_req_action_frame(tpAniSirGlobal pMac, if ((SIR_BAND_5_GHZ == lim_get_rf_band(psessionEntry->currentOperChannel)) - || (psessionEntry->pePersona == CDF_P2P_CLIENT_MODE) - || (psessionEntry->pePersona == CDF_P2P_GO_MODE) + || (psessionEntry->pePersona == QDF_P2P_CLIENT_MODE) + || (psessionEntry->pePersona == QDF_P2P_GO_MODE) ) { txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME; } - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, psessionEntry->peSessionId, pMacHdr->fc.subType)); qdf_status = wma_tx_frame(pMac, pPacket, (uint16_t) nBytes, TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7, lim_tx_complete, pFrame, txFlag, smeSessionId, 0); - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, psessionEntry->peSessionId, qdf_status)); /* Pkt will be freed up by the callback */ if (!QDF_IS_STATUS_SUCCESS(qdf_status)) @@ -1867,7 +1867,7 @@ lim_send_assoc_req_mgmt_frame(tpAniSirGlobal mac_ctx, bytes); pe_session->limMlmState = pe_session->limPrevMlmState; - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_MLM_STATE, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_MLM_STATE, pe_session->peSessionId, pe_session->limMlmState)); @@ -1936,13 +1936,13 @@ lim_send_assoc_req_mgmt_frame(tpAniSirGlobal mac_ctx, } if ((SIR_BAND_5_GHZ == lim_get_rf_band(pe_session->currentOperChannel)) - || (pe_session->pePersona == CDF_P2P_CLIENT_MODE) - || (pe_session->pePersona == CDF_P2P_GO_MODE) + || (pe_session->pePersona == QDF_P2P_CLIENT_MODE) + || (pe_session->pePersona == QDF_P2P_GO_MODE) ) tx_flag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME; - if (pe_session->pePersona == CDF_P2P_CLIENT_MODE || - pe_session->pePersona == CDF_STA_MODE) + if (pe_session->pePersona == QDF_P2P_CLIENT_MODE || + pe_session->pePersona == QDF_STA_MODE) tx_flag |= HAL_USE_PEER_STA_REQUESTED_MASK; #ifdef FEATURE_WLAN_DIAG_SUPPORT @@ -1950,7 +1950,7 @@ lim_send_assoc_req_mgmt_frame(tpAniSirGlobal mac_ctx, pe_session, eSIR_SUCCESS, eSIR_SUCCESS); #endif mac_hdr = (tpSirMacMgmtHdr) frame; - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, pe_session->peSessionId, mac_hdr->fc.subType)); qdf_status = wma_tx_frame(mac_ctx, packet, @@ -1958,7 +1958,7 @@ lim_send_assoc_req_mgmt_frame(tpAniSirGlobal mac_ctx, TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7, lim_tx_complete, frame, tx_flag, sme_sessionid, 0); MTRACE(cdf_trace - (CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, + (QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, pe_session->peSessionId, qdf_status)); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { lim_log(mac_ctx, LOGE, @@ -2279,7 +2279,7 @@ lim_send_reassoc_req_with_ft_ies_mgmt_frame(tpAniSirGlobal mac_ctx, (void **)&frame, (void **)&packet); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { pe_session->limMlmState = pe_session->limPrevMlmState; - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_MLM_STATE, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_MLM_STATE, pe_session->peSessionId, pe_session->limMlmState)); lim_log(mac_ctx, LOGP, FL("Failed to alloc memory %d"), bytes); @@ -2350,8 +2350,8 @@ lim_send_reassoc_req_with_ft_ies_mgmt_frame(tpAniSirGlobal mac_ctx, (uint8_t *) frame, (bytes + ft_ies_length)); if ((SIR_BAND_5_GHZ == lim_get_rf_band(pe_session->currentOperChannel)) || - (pe_session->pePersona == CDF_P2P_CLIENT_MODE) || - (pe_session->pePersona == CDF_P2P_GO_MODE)) { + (pe_session->pePersona == QDF_P2P_CLIENT_MODE) || + (pe_session->pePersona == QDF_P2P_GO_MODE)) { tx_flag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME; } @@ -2384,14 +2384,14 @@ lim_send_reassoc_req_with_ft_ies_mgmt_frame(tpAniSirGlobal mac_ctx, lim_diag_event_report(mac_ctx, WLAN_PE_DIAG_REASSOC_START_EVENT, pe_session, eSIR_SUCCESS, eSIR_SUCCESS); #endif - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, pe_session->peSessionId, mac_hdr->fc.subType)); qdf_status = wma_tx_frame(mac_ctx, packet, (uint16_t) (bytes + ft_ies_length), TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7, lim_tx_complete, frame, tx_flag, sme_sessionid, 0); - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, pe_session->peSessionId, qdf_status)); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { lim_log(mac_ctx, LOGE, @@ -2425,7 +2425,7 @@ void lim_send_retry_reassoc_req_frame(tpAniSirGlobal pMac, pMac->lim.limTimers.gLimReassocFailureTimer.sessionId = psessionEntry->peSessionId; /* Start reassociation failure timer */ - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TIMER_ACTIVATE, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TIMER_ACTIVATE, psessionEntry->peSessionId, eLIM_REASSOC_FAIL_TIMER)); if (tx_timer_activate(&pMac->lim.limTimers.gLimReassocFailureTimer) != TX_SUCCESS) { @@ -2645,7 +2645,7 @@ lim_send_reassoc_req_mgmt_frame(tpAniSirGlobal pMac, (void **)&pPacket); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { psessionEntry->limMlmState = psessionEntry->limPrevMlmState; - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_MLM_STATE, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_MLM_STATE, psessionEntry->peSessionId, psessionEntry->limMlmState)); lim_log(pMac, LOGP, @@ -2706,21 +2706,21 @@ lim_send_reassoc_req_mgmt_frame(tpAniSirGlobal pMac, } if ((SIR_BAND_5_GHZ == lim_get_rf_band(psessionEntry->currentOperChannel)) - || (psessionEntry->pePersona == CDF_P2P_CLIENT_MODE) || - (psessionEntry->pePersona == CDF_P2P_GO_MODE) + || (psessionEntry->pePersona == QDF_P2P_CLIENT_MODE) || + (psessionEntry->pePersona == QDF_P2P_GO_MODE) ) { txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME; } - if (psessionEntry->pePersona == CDF_P2P_CLIENT_MODE || - psessionEntry->pePersona == CDF_STA_MODE) + if (psessionEntry->pePersona == QDF_P2P_CLIENT_MODE || + psessionEntry->pePersona == QDF_STA_MODE) txFlag |= HAL_USE_PEER_STA_REQUESTED_MASK; #ifdef FEATURE_WLAN_DIAG_SUPPORT lim_diag_event_report(pMac, WLAN_PE_DIAG_REASSOC_START_EVENT, psessionEntry, eSIR_SUCCESS, eSIR_SUCCESS); #endif - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, psessionEntry->peSessionId, pMacHdr->fc.subType)); qdf_status = wma_tx_frame(pMac, pPacket, @@ -2728,7 +2728,7 @@ lim_send_reassoc_req_mgmt_frame(tpAniSirGlobal pMac, TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7, lim_tx_complete, pFrame, txFlag, smeSessionId, 0); MTRACE(cdf_trace - (CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, + (QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, psessionEntry->peSessionId, qdf_status)); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { lim_log(pMac, LOGE, @@ -3003,8 +3003,8 @@ lim_send_auth_mgmt_frame(tpAniSirGlobal mac_ctx, sir_dump_buf(mac_ctx, SIR_LIM_MODULE_ID, LOG2, frame, frame_len); if ((SIR_BAND_5_GHZ == lim_get_rf_band(session->currentOperChannel)) - || (session->pePersona == CDF_P2P_CLIENT_MODE) - || (session->pePersona == CDF_P2P_GO_MODE) + || (session->pePersona == QDF_P2P_CLIENT_MODE) + || (session->pePersona == QDF_P2P_GO_MODE) || ((NULL != session->ftPEContext.pFTPreAuthReq) && (SIR_BAND_5_GHZ == lim_get_rf_band(session->ftPEContext.pFTPreAuthReq-> @@ -3012,18 +3012,18 @@ lim_send_auth_mgmt_frame(tpAniSirGlobal mac_ctx, tx_flag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME; - if (session->pePersona == CDF_P2P_CLIENT_MODE || - session->pePersona == CDF_STA_MODE) + if (session->pePersona == QDF_P2P_CLIENT_MODE || + session->pePersona == QDF_STA_MODE) tx_flag |= HAL_USE_PEER_STA_REQUESTED_MASK; - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, session->peSessionId, mac_hdr->fc.subType)); /* Queue Authentication frame in high priority WQ */ qdf_status = wma_tx_frame(mac_ctx, packet, (uint16_t) frame_len, TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7, lim_tx_complete, frame, tx_flag, sme_sessionid, 0); - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, session->peSessionId, qdf_status)); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) lim_log(mac_ctx, LOGE, @@ -3222,7 +3222,7 @@ QDF_STATUS lim_send_disassoc_cnf(tpAniSirGlobal mac_ctx) end: cdf_mem_copy((uint8_t *) &disassoc_cnf.peerMacAddr, (uint8_t *) disassoc_req->peer_macaddr.bytes, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); disassoc_cnf.aid = disassoc_req->aid; disassoc_cnf.disassocTrigger = disassoc_req->disassocTrigger; @@ -3290,10 +3290,10 @@ lim_send_disassoc_mgmt_frame(tpAniSirGlobal pMac, * In case when cac timer is running for this SAP session then * avoid sending disassoc out. It is violation of dfs specification. */ - if (((psessionEntry->pePersona == CDF_SAP_MODE) || - (psessionEntry->pePersona == CDF_P2P_GO_MODE)) && + if (((psessionEntry->pePersona == QDF_SAP_MODE) || + (psessionEntry->pePersona == QDF_P2P_GO_MODE)) && (true == pMac->sap.SapDfsInfo.is_dfs_cac_timer_running)) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, FL ("CAC timer is running, drop disassoc from going out")); return; @@ -3363,8 +3363,8 @@ lim_send_disassoc_mgmt_frame(tpAniSirGlobal pMac, MAC_ADDR_ARRAY(psessionEntry->selfMacAddr)); if ((SIR_BAND_5_GHZ == lim_get_rf_band(psessionEntry->currentOperChannel)) - || (psessionEntry->pePersona == CDF_P2P_CLIENT_MODE) || - (psessionEntry->pePersona == CDF_P2P_GO_MODE) + || (psessionEntry->pePersona == QDF_P2P_CLIENT_MODE) || + (psessionEntry->pePersona == QDF_P2P_GO_MODE) ) { txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME; } @@ -3372,7 +3372,7 @@ lim_send_disassoc_mgmt_frame(tpAniSirGlobal pMac, txFlag |= HAL_USE_PEER_STA_REQUESTED_MASK; if (waitForAck) { - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, psessionEntry->peSessionId, pMacHdr->fc.subType)); /* Queue Disassociation frame in high priority WQ */ @@ -3384,7 +3384,7 @@ lim_send_disassoc_mgmt_frame(tpAniSirGlobal pMac, pFrame, lim_disassoc_tx_complete_cnf, txFlag, smeSessionId, false, 0); MTRACE(cdf_trace - (CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, + (QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, psessionEntry->peSessionId, qdf_status)); val = SYS_MS_TO_TICKS(LIM_DISASSOC_DEAUTH_ACK_TIMEOUT); @@ -3405,7 +3405,7 @@ lim_send_disassoc_mgmt_frame(tpAniSirGlobal pMac, return; } } else { - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, psessionEntry->peSessionId, pMacHdr->fc.subType)); /* Queue Disassociation frame in high priority WQ */ @@ -3416,7 +3416,7 @@ lim_send_disassoc_mgmt_frame(tpAniSirGlobal pMac, lim_tx_complete, pFrame, txFlag, smeSessionId, 0); MTRACE(cdf_trace - (CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, + (QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, psessionEntry->peSessionId, qdf_status)); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { lim_log(pMac, LOGE, @@ -3469,10 +3469,10 @@ lim_send_deauth_mgmt_frame(tpAniSirGlobal pMac, * In case when cac timer is running for this SAP session then * avoid deauth frame out. It is violation of dfs specification. */ - if (((psessionEntry->pePersona == CDF_SAP_MODE) || - (psessionEntry->pePersona == CDF_P2P_GO_MODE)) && + if (((psessionEntry->pePersona == QDF_SAP_MODE) || + (psessionEntry->pePersona == QDF_P2P_GO_MODE)) && (true == pMac->sap.SapDfsInfo.is_dfs_cac_timer_running)) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, FL ("CAC timer is running, drop the deauth from going out")); return; @@ -3540,8 +3540,8 @@ lim_send_deauth_mgmt_frame(tpAniSirGlobal pMac, MAC_ADDR_ARRAY(psessionEntry->selfMacAddr)); if ((SIR_BAND_5_GHZ == lim_get_rf_band(psessionEntry->currentOperChannel)) - || (psessionEntry->pePersona == CDF_P2P_CLIENT_MODE) || - (psessionEntry->pePersona == CDF_P2P_GO_MODE) + || (psessionEntry->pePersona == QDF_P2P_CLIENT_MODE) || + (psessionEntry->pePersona == QDF_P2P_GO_MODE) ) { txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME; } @@ -3554,7 +3554,7 @@ lim_send_deauth_mgmt_frame(tpAniSirGlobal pMac, #endif if (waitForAck) { - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, psessionEntry->peSessionId, pMacHdr->fc.subType)); /* Queue Disassociation frame in high priority WQ */ @@ -3565,7 +3565,7 @@ lim_send_deauth_mgmt_frame(tpAniSirGlobal pMac, pFrame, lim_deauth_tx_complete_cnf, txFlag, smeSessionId, false, 0); MTRACE(cdf_trace - (CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, + (QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, psessionEntry->peSessionId, qdf_status)); /* Pkt will be freed up by the callback lim_tx_complete */ if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { @@ -3598,7 +3598,7 @@ lim_send_deauth_mgmt_frame(tpAniSirGlobal pMac, return; } } else { - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, psessionEntry->peSessionId, pMacHdr->fc.subType)); #ifdef FEATURE_WLAN_TDLS @@ -3621,7 +3621,7 @@ lim_send_deauth_mgmt_frame(tpAniSirGlobal pMac, #ifdef FEATURE_WLAN_TDLS } #endif - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, psessionEntry->peSessionId, qdf_status)); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { lim_log(pMac, LOGE, @@ -3745,7 +3745,7 @@ lim_send_meas_report_frame(tpAniSirGlobal pMac, "easurement Report (0x%08x)."), nStatus); } - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, ((psessionEntry) ? psessionEntry-> peSessionId : NO_SESSION), pMacHdr->fc.subType)); qdf_status = @@ -3753,7 +3753,7 @@ lim_send_meas_report_frame(tpAniSirGlobal pMac, TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7, lim_tx_complete, pFrame, 0, 0); MTRACE(cdf_trace - (CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, + (QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, ((psessionEntry) ? psessionEntry->peSessionId : NO_SESSION), qdf_status)); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { @@ -3848,7 +3848,7 @@ lim_send_tpc_request_frame(tpAniSirGlobal pMac, "PC Request (0x%08x)."), nStatus); } - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, ((psessionEntry) ? psessionEntry-> peSessionId : NO_SESSION), pMacHdr->fc.subType)); qdf_status = @@ -3856,7 +3856,7 @@ lim_send_tpc_request_frame(tpAniSirGlobal pMac, TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7, lim_tx_complete, pFrame, 0, 0); MTRACE(cdf_trace - (CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, + (QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, ((psessionEntry) ? psessionEntry->peSessionId : NO_SESSION), qdf_status)); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { @@ -3955,7 +3955,7 @@ lim_send_tpc_report_frame(tpAniSirGlobal pMac, "PC Report (0x%08x)."), nStatus); } - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, ((psessionEntry) ? psessionEntry-> peSessionId : NO_SESSION), pMacHdr->fc.subType)); qdf_status = @@ -3963,7 +3963,7 @@ lim_send_tpc_report_frame(tpAniSirGlobal pMac, TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7, lim_tx_complete, pFrame, 0, 0); MTRACE(cdf_trace - (CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, + (QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, ((psessionEntry) ? psessionEntry->peSessionId : NO_SESSION), qdf_status)); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { @@ -4083,20 +4083,20 @@ lim_send_channel_switch_mgmt_frame(tpAniSirGlobal pMac, } if ((SIR_BAND_5_GHZ == lim_get_rf_band(psessionEntry->currentOperChannel)) - || (psessionEntry->pePersona == CDF_P2P_CLIENT_MODE) || - (psessionEntry->pePersona == CDF_P2P_GO_MODE) + || (psessionEntry->pePersona == QDF_P2P_CLIENT_MODE) || + (psessionEntry->pePersona == QDF_P2P_GO_MODE) ) { txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME; } - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, psessionEntry->peSessionId, pMacHdr->fc.subType)); qdf_status = wma_tx_frame(pMac, pPacket, (uint16_t) nBytes, TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7, lim_tx_complete, pFrame, txFlag, smeSessionId, 0); - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, psessionEntry->peSessionId, qdf_status)); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { lim_log(pMac, LOGE, @@ -4210,8 +4210,8 @@ lim_send_extended_chan_switch_action_frame(tpAniSirGlobal mac_ctx, if ((SIR_BAND_5_GHZ == lim_get_rf_band(session_entry->currentOperChannel)) || - (session_entry->pePersona == CDF_P2P_CLIENT_MODE) || - (session_entry->pePersona == CDF_P2P_GO_MODE)) { + (session_entry->pePersona == QDF_P2P_CLIENT_MODE) || + (session_entry->pePersona == QDF_P2P_GO_MODE)) { txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME; } @@ -4223,7 +4223,7 @@ lim_send_extended_chan_switch_action_frame(tpAniSirGlobal mac_ctx, frm.ext_chan_switch_ann_action.new_channel, frm.ext_chan_switch_ann_action.op_class); - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, session_entry->peSessionId, mac_hdr->fc.subType)); qdf_status = wma_tx_frame(mac_ctx, packet, (uint16_t) num_bytes, TXRX_FRM_802_11_MGMT, @@ -4231,7 +4231,7 @@ lim_send_extended_chan_switch_action_frame(tpAniSirGlobal mac_ctx, 7, lim_tx_complete, frame, txFlag, sme_session_id, 0); - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, session_entry->peSessionId, qdf_status)); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { lim_log(mac_ctx, LOGE, @@ -4300,7 +4300,7 @@ lim_send_vht_opmode_notification_frame(tpAniSirGlobal pMac, cdf_mem_set(pFrame, nBytes, 0); /* Next, we fill out the buffer descriptor: */ - if (psessionEntry->pePersona == CDF_SAP_MODE) + if (psessionEntry->pePersona == QDF_SAP_MODE) lim_populate_mac_header(pMac, pFrame, SIR_MAC_MGMT_FRAME, SIR_MAC_MGMT_ACTION, peer, psessionEntry->selfMacAddr); @@ -4326,20 +4326,20 @@ lim_send_vht_opmode_notification_frame(tpAniSirGlobal pMac, " (0x%08x)."), nStatus); } if ((SIR_BAND_5_GHZ == lim_get_rf_band(psessionEntry->currentOperChannel)) - || (psessionEntry->pePersona == CDF_P2P_CLIENT_MODE) || - (psessionEntry->pePersona == CDF_P2P_GO_MODE) + || (psessionEntry->pePersona == QDF_P2P_CLIENT_MODE) || + (psessionEntry->pePersona == QDF_P2P_GO_MODE) ) { txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME; } - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, psessionEntry->peSessionId, pMacHdr->fc.subType)); qdf_status = wma_tx_frame(pMac, pPacket, (uint16_t) nBytes, TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7, lim_tx_complete, pFrame, txFlag, smeSessionId, 0); - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, psessionEntry->peSessionId, qdf_status)); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { lim_log(pMac, LOGE, @@ -4470,13 +4470,13 @@ lim_send_neighbor_report_request_frame(tpAniSirGlobal pMac, lim_print_mac_addr(pMac, peer, LOGW); if ((SIR_BAND_5_GHZ == lim_get_rf_band(psessionEntry->currentOperChannel)) - || (psessionEntry->pePersona == CDF_P2P_CLIENT_MODE) || - (psessionEntry->pePersona == CDF_P2P_GO_MODE) + || (psessionEntry->pePersona == QDF_P2P_CLIENT_MODE) || + (psessionEntry->pePersona == QDF_P2P_GO_MODE) ) { txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME; } - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, psessionEntry->peSessionId, pMacHdr->fc.subType)); qdf_status = wma_tx_frame(pMac, pPacket, @@ -4485,7 +4485,7 @@ lim_send_neighbor_report_request_frame(tpAniSirGlobal pMac, ANI_TXDIR_TODS, 7, lim_tx_complete, pFrame, txFlag, smeSessionId, 0); - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, psessionEntry->peSessionId, qdf_status)); if (QDF_STATUS_SUCCESS != qdf_status) { PELOGE(lim_log @@ -4628,12 +4628,12 @@ lim_send_link_report_action_frame(tpAniSirGlobal pMac, lim_print_mac_addr(pMac, peer, LOGW); if ((SIR_BAND_5_GHZ == lim_get_rf_band(psessionEntry->currentOperChannel)) - || (psessionEntry->pePersona == CDF_P2P_CLIENT_MODE) || - (psessionEntry->pePersona == CDF_P2P_GO_MODE)) { + || (psessionEntry->pePersona == QDF_P2P_CLIENT_MODE) || + (psessionEntry->pePersona == QDF_P2P_GO_MODE)) { txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME; } - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, psessionEntry->peSessionId, pMacHdr->fc.subType)); qdf_status = wma_tx_frame(pMac, pPacket, @@ -4642,7 +4642,7 @@ lim_send_link_report_action_frame(tpAniSirGlobal pMac, ANI_TXDIR_TODS, 7, lim_tx_complete, pFrame, txFlag, smeSessionId, 0); - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, psessionEntry->peSessionId, qdf_status)); if (QDF_STATUS_SUCCESS != qdf_status) { PELOGE(lim_log @@ -4822,13 +4822,13 @@ lim_send_radio_measure_report_action_frame(tpAniSirGlobal pMac, lim_print_mac_addr(pMac, peer, LOGW); if ((SIR_BAND_5_GHZ == lim_get_rf_band(psessionEntry->currentOperChannel)) - || (psessionEntry->pePersona == CDF_P2P_CLIENT_MODE) || - (psessionEntry->pePersona == CDF_P2P_GO_MODE) + || (psessionEntry->pePersona == QDF_P2P_CLIENT_MODE) || + (psessionEntry->pePersona == QDF_P2P_GO_MODE) ) { txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME; } - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, psessionEntry->peSessionId, pMacHdr->fc.subType)); qdf_status = wma_tx_frame(pMac, pPacket, @@ -4837,7 +4837,7 @@ lim_send_radio_measure_report_action_frame(tpAniSirGlobal pMac, ANI_TXDIR_TODS, 7, lim_tx_complete, pFrame, txFlag, smeSessionId, 0); - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, psessionEntry->peSessionId, qdf_status)); if (QDF_STATUS_SUCCESS != qdf_status) { PELOGE(lim_log @@ -4969,8 +4969,8 @@ tSirRetStatus lim_send_sa_query_request_frame(tpAniSirGlobal pMac, uint8_t *tran if ((SIR_BAND_5_GHZ == lim_get_rf_band(psessionEntry->currentOperChannel)) #ifdef WLAN_FEATURE_P2P - || (psessionEntry->pePersona == CDF_P2P_CLIENT_MODE) || - (psessionEntry->pePersona == CDF_P2P_GO_MODE) + || (psessionEntry->pePersona == QDF_P2P_CLIENT_MODE) || + (psessionEntry->pePersona == QDF_P2P_GO_MODE) #endif ) { txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME; @@ -5109,14 +5109,14 @@ tSirRetStatus lim_send_sa_query_response_frame(tpAniSirGlobal pMac, if ((SIR_BAND_5_GHZ == lim_get_rf_band(psessionEntry->currentOperChannel)) #ifdef WLAN_FEATURE_P2P - || (psessionEntry->pePersona == CDF_P2P_CLIENT_MODE) || - (psessionEntry->pePersona == CDF_P2P_GO_MODE) + || (psessionEntry->pePersona == QDF_P2P_CLIENT_MODE) || + (psessionEntry->pePersona == QDF_P2P_GO_MODE) #endif ) { txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME; } - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, psessionEntry->peSessionId, pMacHdr->fc.subType)); qdf_status = wma_tx_frame(pMac, pPacket, @@ -5125,7 +5125,7 @@ tSirRetStatus lim_send_sa_query_response_frame(tpAniSirGlobal pMac, ANI_TXDIR_TODS, 7, lim_tx_complete, pFrame, txFlag, smeSessionId, 0); - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, psessionEntry->peSessionId, qdf_status)); if (QDF_STATUS_SUCCESS != qdf_status) { PELOGE(lim_log diff --git a/core/mac/src/pe/lim/lim_send_messages.c b/core/mac/src/pe/lim/lim_send_messages.c index 264cf02c80..05ad92f3aa 100644 --- a/core/mac/src/pe/lim/lim_send_messages.c +++ b/core/mac/src/pe/lim/lim_send_messages.c @@ -834,7 +834,7 @@ tSirRetStatus lim_send_exclude_unencrypt_ind(tpAniSirGlobal pMac, pExcludeUnencryptParam->excludeUnencrypt = excludeUnenc; cdf_mem_copy(pExcludeUnencryptParam->bssid.bytes, psessionEntry->bssId, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); msgQ.type = WMA_EXCLUDE_UNENCRYPTED_IND; msgQ.reserved = 0; diff --git a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c index 13f86dacf7..54dcee72e7 100644 --- a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c +++ b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c @@ -36,7 +36,7 @@ * -------------------------------------------------------------------- */ -#include "cdf_types.h" +#include "qdf_types.h" #include "wni_api.h" #include "sir_common.h" #include "ani_global.h" @@ -91,7 +91,7 @@ lim_send_sme_rsp(tpAniSirGlobal mac_ctx, uint16_t msg_type, sme_rsp = cdf_mem_malloc(sizeof(tSirSmeRsp)); if (NULL == sme_rsp) { /* Buffer not available. Log error */ - CDF_TRACE(CDF_MODULE_ID_PE, LOGP, + CDF_TRACE(QDF_MODULE_ID_PE, LOGP, FL("call to AllocateMemory failed for eWNI_SME_*_RSP")); return; } @@ -149,7 +149,7 @@ lim_send_sme_roc_rsp(tpAniSirGlobal mac_ctx, uint16_t msg_type, sme_rsp = cdf_mem_malloc(sizeof(struct sir_roc_rsp)); if (NULL == sme_rsp) { - CDF_TRACE(CDF_MODULE_ID_PE, LOGP, + CDF_TRACE(QDF_MODULE_ID_PE, LOGP, FL("call to AllocateMemory failed for eWNI_SME_*_RSP")); return; } @@ -1058,10 +1058,10 @@ lim_send_sme_disassoc_ind(tpAniSirGlobal pMac, tpDphHashNode pStaDs, pSirSmeDisassocInd->reasonCode = pStaDs->mlmStaContext.disassocReason; cdf_mem_copy(pSirSmeDisassocInd->bssid.bytes, psessionEntry->bssId, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); cdf_mem_copy(pSirSmeDisassocInd->peer_macaddr.bytes, pStaDs->staAddr, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); pSirSmeDisassocInd->staId = pStaDs->staIndex; @@ -1120,10 +1120,10 @@ lim_send_sme_deauth_ind(tpAniSirGlobal pMac, tpDphHashNode pStaDs, } /* BSSID */ cdf_mem_copy(pSirSmeDeauthInd->bssid.bytes, psessionEntry->bssId, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); /* peerMacAddr */ cdf_mem_copy(pSirSmeDeauthInd->peer_macaddr.bytes, pStaDs->staAddr, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); pSirSmeDeauthInd->reasonCode = pStaDs->mlmStaContext.disassocReason; pSirSmeDeauthInd->staId = pStaDs->staIndex; @@ -1188,7 +1188,7 @@ lim_send_sme_tdls_del_sta_ind(tpAniSirGlobal pMac, tpDphHashNode pStaDs, /* peerMacAddr */ cdf_mem_copy(pSirTdlsDelStaInd->peermac.bytes, pStaDs->staAddr, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); /* staId */ lim_copy_u16((uint8_t *) (&pSirTdlsDelStaInd->staId), @@ -1446,7 +1446,7 @@ lim_send_sme_deauth_ntf(tpAniSirGlobal pMac, tSirMacAddr peerMacAddr, /* peerMacAddr */ cdf_mem_copy(pSirSmeDeauthInd->peer_macaddr.bytes, peerMacAddr, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); #ifdef FEATURE_WLAN_DIAG_SUPPORT_LIM /* FEATURE_WLAN_DIAG_SUPPORT */ lim_diag_event_report(pMac, WLAN_PE_DIAG_DEAUTH_IND_EVENT, @@ -1559,7 +1559,7 @@ lim_send_sme_wm_status_change_ntf(tpAniSirGlobal mac_ctx, */ void lim_send_sme_set_context_rsp(tpAniSirGlobal pMac, - struct cdf_mac_addr peer_macaddr, uint16_t aid, + struct qdf_mac_addr peer_macaddr, uint16_t aid, tSirResultCodes resultCode, tpPESession psessionEntry, uint8_t smesessionId, uint16_t smetransactionId) @@ -1974,7 +1974,7 @@ lim_send_sme_ibss_peer_ind(tpAniSirGlobal pMac, 0); cdf_mem_copy((uint8_t *) pNewPeerInd->peer_addr.bytes, - peerMacAddr, CDF_MAC_ADDR_SIZE); + peerMacAddr, QDF_MAC_ADDR_SIZE); pNewPeerInd->staId = staIndex; pNewPeerInd->ucastSig = ucastIdx; pNewPeerInd->bcastSig = bcastIdx; @@ -2192,7 +2192,7 @@ void lim_handle_csa_offload_msg(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) csa_offload_ind->mesgType = eWNI_SME_CSA_OFFLOAD_EVENT; csa_offload_ind->mesgLen = sizeof(tSmeCsaOffloadInd); cdf_mem_copy(csa_offload_ind->bssid.bytes, session_entry->bssId, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); mmh_msg.type = eWNI_SME_CSA_OFFLOAD_EVENT; mmh_msg.bodyptr = csa_offload_ind; mmh_msg.bodyval = 0; @@ -2285,7 +2285,7 @@ void lim_send_sme_max_assoc_exceeded_ntf(tpAniSirGlobal pMac, tSirMacAddr peerMa } cdf_mem_set((void *)pSmeMaxAssocInd, sizeof(tSmeMaxAssocInd), 0); cdf_mem_copy((uint8_t *) pSmeMaxAssocInd->peer_mac.bytes, - (uint8_t *) peerMacAddr, CDF_MAC_ADDR_SIZE); + (uint8_t *) peerMacAddr, QDF_MAC_ADDR_SIZE); pSmeMaxAssocInd->mesgType = eWNI_SME_MAX_ASSOC_EXCEEDED; pSmeMaxAssocInd->mesgLen = sizeof(tSmeMaxAssocInd); pSmeMaxAssocInd->sessionId = smesessionId; diff --git a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.h b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.h index e4ec6ea2a7..81049bcbfb 100644 --- a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.h +++ b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.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. * @@ -67,7 +67,7 @@ void lim_send_sme_deauth_ind(tpAniSirGlobal, tpDphHashNode, tpPESession psessionEntry); void lim_send_sme_wm_status_change_ntf(tpAniSirGlobal, tSirSmeStatusChangeCode, uint32_t *, uint16_t, uint8_t); -void lim_send_sme_set_context_rsp(tpAniSirGlobal, struct cdf_mac_addr, uint16_t, +void lim_send_sme_set_context_rsp(tpAniSirGlobal, struct qdf_mac_addr, uint16_t, tSirResultCodes, tpPESession, uint8_t, uint16_t); void lim_send_sme_neighbor_bss_ind(tpAniSirGlobal, tLimScanResultNode *); void lim_handle_delete_bss_rsp(tpAniSirGlobal pMac, tpSirMsgQ MsgQ); @@ -109,7 +109,7 @@ void lim_send_sme_max_assoc_exceeded_ntf(tpAniSirGlobal pMac, tSirMacAddr peerMa uint8_t smesessionId); #ifdef FEATURE_WLAN_TDLS void lim_send_sme_tdls_link_establish_req_rsp(tpAniSirGlobal pMac, uint8_t sessionId, - struct cdf_mac_addr *peermac, + struct qdf_mac_addr *peermac, tDphHashNode *pStaDs, uint8_t status); void lim_send_sme_tdls_event_notify(tpAniSirGlobal pMac, uint16_t msgType, void *events); diff --git a/core/mac/src/pe/lim/lim_session.c b/core/mac/src/pe/lim/lim_session.c index 4885b60066..810565200d 100644 --- a/core/mac/src/pe/lim/lim_session.c +++ b/core/mac/src/pe/lim/lim_session.c @@ -114,7 +114,7 @@ void pe_reset_protection_callback(void *ptr) bool bcn_prms_changed = false; if (pe_session_entry->valid == false) { - CDF_TRACE(CDF_MODULE_ID_PE, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, FL("session already deleted. exiting timer callback")); return; @@ -127,7 +127,7 @@ void pe_reset_protection_callback(void *ptr) pe_session_entry->gLimOverlapNonGfParams.protectionEnabled << 3 | pe_session_entry->gLimOlbcParams.protectionEnabled << 4; - CDF_TRACE(CDF_MODULE_ID_PE, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, FL("old protection state: 0x%04X, new protection state: 0x%04X\n"), pe_session_entry->old_protection_state, @@ -177,7 +177,7 @@ void pe_reset_protection_callback(void *ptr) if ((current_protection_state != pe_session_entry->old_protection_state) && (false == mac_ctx->sap.SapDfsInfo.is_dfs_cac_timer_running)) { - CDF_TRACE(CDF_MODULE_ID_PE, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, FL("protection changed, update beacon template\n")); /* update beacon fix params and send update to FW */ @@ -217,7 +217,7 @@ void pe_reset_protection_callback(void *ptr) protection_fields_reset_timer, SCH_PROTECTION_RESET_TIME) != QDF_STATUS_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_PE, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, FL("cannot create or start protectionFieldsResetTimer\n")); } @@ -326,7 +326,7 @@ pe_create_session(tpAniSirGlobal pMac, uint8_t *bssid, uint8_t *sessionId, session_ptr->fWaitForProbeRsp = 0; session_ptr->fIgnoreCapsChange = 0; - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG, FL("Create a new PE session(%d), BSSID: "MAC_ADDRESS_STR" Max No. of STA %d"), session_ptr->peSessionId, MAC_ADDR_ARRAY(bssid), numSta); @@ -368,7 +368,7 @@ pe_create_session(tpAniSirGlobal pMac, uint8_t *bssid, uint8_t *sessionId, session_ptr->mac_ctx = (void *)pMac; status = cdf_mc_timer_init( &session_ptr->protection_fields_reset_timer, - CDF_TIMER_TYPE_SW, pe_reset_protection_callback, + QDF_TIMER_TYPE_SW, pe_reset_protection_callback, (void *)&pMac->lim.gpSession[i]); if (status == QDF_STATUS_SUCCESS) { status = cdf_mc_timer_start( @@ -376,14 +376,14 @@ pe_create_session(tpAniSirGlobal pMac, uint8_t *bssid, uint8_t *sessionId, SCH_PROTECTION_RESET_TIME); } if (status != QDF_STATUS_SUCCESS) - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, FL("cannot create or start protectionFieldsResetTimer\n")); } session_ptr->pmfComebackTimerInfo.pMac = pMac; session_ptr->pmfComebackTimerInfo.sessionID = *sessionId; status = cdf_mc_timer_init(&session_ptr->pmfComebackTimer, - CDF_TIMER_TYPE_SW, lim_pmf_comeback_timer_callback, + QDF_TIMER_TYPE_SW, lim_pmf_comeback_timer_callback, (void *)&session_ptr->pmfComebackTimerInfo); if (!QDF_IS_STATUS_SUCCESS(status)) lim_log(pMac, LOGE, FL("cannot init pmf comeback timer.")); @@ -532,12 +532,12 @@ void pe_delete_session(tpAniSirGlobal mac_ctx, tpPESession session) TX_TIMER *timer_ptr; if (!session || (session && !session->valid)) { - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG, FL("session is not valid")); return; } - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG, FL("Trying to delete PE session %d Opmode %d BssIdx %d BSSID: "MAC_ADDRESS_STR), session->peSessionId, session->operMode, session->bssIdx, diff --git a/core/mac/src/pe/lim/lim_trace.c b/core/mac/src/pe/lim/lim_trace.c index 35f23a80ae..a5c76fa11e 100644 --- a/core/mac/src/pe/lim/lim_trace.c +++ b/core/mac/src/pe/lim/lim_trace.c @@ -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. * @@ -82,7 +82,7 @@ static uint8_t *__lim_trace_get_timer_string(uint16_t timerId) CASE_RETURN_STRING(eLIM_INSERT_SINGLESHOT_NOA_TIMER); CASE_RETURN_STRING(eLIM_CONVERT_ACTIVE_CHANNEL_TO_PASSIVE); default: - return ("UNKNOWN"); + return "UNKNOWN"; break; } } @@ -99,14 +99,14 @@ static uint8_t *__lim_trace_get_mgmt_drop_reason_string(uint16_t dropReason) CASE_RETURN_STRING(eMGMT_DROP_SCAN_MODE_FRAME); default: - return ("UNKNOWN"); + return "UNKNOWN"; break; } } void lim_trace_init(tpAniSirGlobal pMac) { - cdf_trace_register(CDF_MODULE_ID_PE, (tp_cdf_trace_cb) & lim_trace_dump); + cdf_trace_register(QDF_MODULE_ID_PE, (tp_cdf_trace_cb) &lim_trace_dump); } void lim_trace_dump(tpAniSirGlobal pMac, tp_cdf_trace_record pRecord, @@ -440,7 +440,7 @@ uint8_t *lim_trace_get_mlm_state_string(uint32_t mlmState) CASE_RETURN_STRING(eLIM_MLM_WT_SET_STA_BCASTKEY_STATE); CASE_RETURN_STRING(eLIM_MLM_WT_SET_MIMOPS_STATE); default: - return ("UNKNOWN"); + return "UNKNOWN"; break; } } @@ -472,7 +472,7 @@ uint8_t *lim_trace_get_sme_state_string(uint32_t smeState) CASE_RETURN_STRING(eLIM_SME_CHANNEL_SCAN_STATE); CASE_RETURN_STRING(eLIM_SME_NORMAL_CHANNEL_SCAN_STATE); default: - return ("UNKNOWN"); + return "UNKNOWN"; break; } } diff --git a/core/mac/src/pe/lim/lim_types.h b/core/mac/src/pe/lim/lim_types.h index 3a3161fcd2..40e91cf1ec 100644 --- a/core/mac/src/pe/lim/lim_types.h +++ b/core/mac/src/pe/lim/lim_types.h @@ -309,7 +309,7 @@ typedef struct sLimMlmAuthCnf { } tLimMlmAuthCnf, *tpLimMlmAuthCnf; typedef struct sLimMlmDeauthReq { - struct cdf_mac_addr peer_macaddr; + struct qdf_mac_addr peer_macaddr; uint16_t reasonCode; uint16_t deauthTrigger; uint16_t aid; @@ -318,7 +318,7 @@ typedef struct sLimMlmDeauthReq { } tLimMlmDeauthReq, *tpLimMlmDeauthReq; typedef struct sLimMlmDeauthCnf { - struct cdf_mac_addr peer_macaddr; + struct qdf_mac_addr peer_macaddr; tSirResultCodes resultCode; uint16_t deauthTrigger; uint16_t aid; @@ -333,7 +333,7 @@ typedef struct sLimMlmDeauthInd { } tLimMlmDeauthInd, *tpLimMlmDeauthInd; typedef struct sLimMlmDisassocReq { - struct cdf_mac_addr peer_macaddr; + struct qdf_mac_addr peer_macaddr; uint16_t reasonCode; uint16_t disassocTrigger; uint16_t aid; @@ -371,7 +371,7 @@ typedef struct sLimMlmPurgeStaInd { } tLimMlmPurgeStaInd, *tpLimMlmPurgeStaInd; typedef struct sLimMlmSetKeysCnf { - struct cdf_mac_addr peer_macaddr; + struct qdf_mac_addr peer_macaddr; uint16_t resultCode; uint16_t aid; uint8_t sessionId; @@ -799,13 +799,13 @@ void lim_send_vdev_restart(tpAniSirGlobal pMac, tpPESession psessionEntry, uint8_t sessionId); -void lim_get_wpspbc_sessions(tpAniSirGlobal pMac, struct cdf_mac_addr addr, +void lim_get_wpspbc_sessions(tpAniSirGlobal pMac, struct qdf_mac_addr addr, uint8_t *uuid_e, eWPSPBCOverlap *overlap, tpPESession psessionEntry); void limWPSPBCTimeout(tpAniSirGlobal pMac, tpPESession psessionEntry); void lim_wpspbc_close(tpAniSirGlobal pMac, tpPESession psessionEntry); void lim_remove_pbc_sessions(tpAniSirGlobal pMac, - struct cdf_mac_addr pRemoveMac, + struct qdf_mac_addr pRemoveMac, tpPESession psessionEntry); #define LIM_WPS_OVERLAP_TIMER_MS 10000 diff --git a/core/mac/src/pe/lim/lim_utils.c b/core/mac/src/pe/lim/lim_utils.c index c53efd09af..8d9dac0b15 100644 --- a/core/mac/src/pe/lim/lim_utils.c +++ b/core/mac/src/pe/lim/lim_utils.c @@ -593,7 +593,7 @@ static void lim_deactivate_del_sta(tpAniSirGlobal mac_ctx, uint32_t bss_entry, if (NULL == sta_ds) continue; - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, FL("Deleting pmfSaQueryTimer for staid[%d]"), sta_ds->staIndex); tx_timer_deactivate(&sta_ds->pmfSaQueryTimer); @@ -735,7 +735,7 @@ void lim_cleanup_mlm(tpAniSirGlobal mac_ctx) * the pmfSaQueryTimer for it */ if (cds_is_driver_recovering()) { - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, FL("SSR is detected, proceed to clean up pmfSaQueryTimer")); for (bss_entry = 0; bss_entry < mac_ctx->lim.maxBssId; bss_entry++) { @@ -2684,7 +2684,7 @@ void lim_switch_channel_cback(tpAniSirGlobal pMac, QDF_STATUS status, psessionEntry->gLimChannelSwitch.primaryChannel; pSirSmeSwitchChInd->sessionId = psessionEntry->smeSessionId; cdf_mem_copy(pSirSmeSwitchChInd->bssid.bytes, psessionEntry->bssId, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); mmhMsg.bodyptr = pSirSmeSwitchChInd; mmhMsg.bodyval = 0; @@ -6330,7 +6330,7 @@ uint8_t lim_get_noa_attr_stream(tpAniSirGlobal pMac, uint8_t *pNoaStream, uint8_t *pBody = pNoaStream; if ((psessionEntry != NULL) && (psessionEntry->valid) && - (psessionEntry->pePersona == CDF_P2P_GO_MODE)) { + (psessionEntry->pePersona == QDF_P2P_GO_MODE)) { if ((!(psessionEntry->p2pGoPsUpdate.uNoa1Duration)) && (!(psessionEntry->p2pGoPsUpdate.uNoa2Duration)) && (!psessionEntry->p2pGoPsUpdate.oppPsFlag) @@ -6422,7 +6422,7 @@ bool lim_is_noa_insert_reqd(tpAniSirGlobal pMac) if (pMac->lim.gpSession[i].valid == true) { if ((eLIM_AP_ROLE == pMac->lim.gpSession[i].limSystemRole) - && (CDF_P2P_GO_MODE == + && (QDF_P2P_GO_MODE == pMac->lim.gpSession[i].pePersona) ) { return true; @@ -6577,9 +6577,9 @@ void lim_get_short_slot_from_phy_mode(tpAniSirGlobal pMac, tpPESession psessionE /* only 2.4G band should have short slot enable, rest it should be default */ if (phyMode == WNI_CFG_PHY_MODE_11G) { /* short slot is default in all other modes */ - if ((psessionEntry->pePersona == CDF_SAP_MODE) || - (psessionEntry->pePersona == CDF_IBSS_MODE) || - (psessionEntry->pePersona == CDF_P2P_GO_MODE)) { + if ((psessionEntry->pePersona == QDF_SAP_MODE) || + (psessionEntry->pePersona == QDF_IBSS_MODE) || + (psessionEntry->pePersona == QDF_P2P_GO_MODE)) { val = true; } /* Program Polaris based on AP capability */ @@ -6812,7 +6812,7 @@ bool lim_validate_received_frame_a1_addr(tpAniSirGlobal mac_ctx, tSirMacAddr a1, tpPESession session) { if (mac_ctx == NULL || session == NULL) { - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, "mac or session context is null"); /* let main routine handle it */ return true; @@ -6956,7 +6956,7 @@ QDF_STATUS lim_send_ext_cap_ie(tpAniSirGlobal mac_ctx, msg.reserved = 0; if (QDF_STATUS_SUCCESS != - cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { + cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) { lim_log(mac_ctx, LOGE, FL("Not able to post WMA_SET_IE_INFO to WDA")); cdf_mem_free(vdev_ie); diff --git a/core/mac/src/pe/rrm/rrm_api.c b/core/mac/src/pe/rrm/rrm_api.c index b4f499bc0e..2971942dc8 100644 --- a/core/mac/src/pe/rrm/rrm_api.c +++ b/core/mac/src/pe/rrm/rrm_api.c @@ -58,7 +58,7 @@ rrm_get_min_of_max_tx_power(tpAniSirGlobal pMac, int8_t regMax, int8_t apTxPower) { uint8_t maxTxPower = 0; - uint8_t txPower = CDF_MIN(regMax, (apTxPower)); + uint8_t txPower = QDF_MIN(regMax, (apTxPower)); if ((txPower >= RRM_MIN_TX_PWR_CAP) && (txPower <= RRM_MAX_TX_PWR_CAP)) maxTxPower = txPower; else if (txPower < RRM_MIN_TX_PWR_CAP) @@ -166,10 +166,10 @@ rrm_send_set_max_tx_power_req(tpAniSirGlobal pMac, int8_t txPower, /* Allocated memory for pMaxTxParams...will be freed in other module */ pMaxTxParams->power = txPower; cdf_mem_copy(pMaxTxParams->bssId.bytes, pSessionEntry->bssId, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); cdf_mem_copy(pMaxTxParams->selfStaMacAddr.bytes, pSessionEntry->selfMacAddr, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); msgQ.type = WMA_SET_MAX_TX_POWER_REQ; msgQ.reserved = 0; @@ -181,7 +181,8 @@ rrm_send_set_max_tx_power_req(tpAniSirGlobal pMac, int8_t txPower, txPower); MTRACE(mac_trace_msg_tx(pMac, pSessionEntry->peSessionId, msgQ.type)); - if (eSIR_SUCCESS != (retCode = wma_post_ctrl_msg(pMac, &msgQ))) { + retCode = wma_post_ctrl_msg(pMac, &msgQ); + if (eSIR_SUCCESS != retCode) { lim_log(pMac, LOGP, FL ("Posting WMA_SET_MAX_TX_POWER_REQ to HAL failed, reason=%X"), @@ -224,10 +225,10 @@ tSirRetStatus rrm_set_max_tx_power_rsp(tpAniSirGlobal pMac, tpSirMsgQ limMsgQ) } } } else { - if ((pSessionEntry = - pe_find_session_by_bssid(pMac, - pMaxTxParams->bssId.bytes, - &sessionId)) == NULL) { + pSessionEntry = pe_find_session_by_bssid(pMac, + pMaxTxParams->bssId.bytes, + &sessionId); + if (pSessionEntry == NULL) { PELOGE(lim_log (pMac, LOGE, FL("Unable to find session:")); ) @@ -476,9 +477,9 @@ rrm_process_neighbor_report_req(tpAniSirGlobal pMac, PELOGE(lim_log(pMac, LOGE, "NeighborReq is NULL");) return eSIR_FAILURE; } - if ((pSessionEntry = - pe_find_session_by_bssid(pMac, pNeighborReq->bssId, - &sessionId)) == NULL) { + pSessionEntry = pe_find_session_by_bssid(pMac, pNeighborReq->bssId, + &sessionId); + if (pSessionEntry == NULL) { PELOGE(lim_log (pMac, LOGE, FL("session does not exist for given bssId")); @@ -827,11 +828,10 @@ rrm_process_beacon_report_xmit(tpAniSirGlobal pMac, RRM_BCN_RPT_NO_BSS_INFO) ? RRM_BCN_RPT_MIN_RPT : pBcnReport->numBssDesc; - if (NULL == (pSessionEntry = pe_find_session_by_bssid(pMac, - pBcnReport-> - bssId, - &sessionId))) - { + pSessionEntry = pe_find_session_by_bssid(pMac, + pBcnReport->bssId, + &sessionId); + if (NULL == pSessionEntry) { PELOGE(lim_log (pMac, LOGE, FL("session does not exist for given bssId")); @@ -1140,8 +1140,7 @@ rrm_process_radio_measurement_request(tpAniSirGlobal pMac, case SIR_MAC_RRM_BEACON_TYPE: /* Process beacon request. */ if (pCurrentReq) { - if (pReport == NULL) /* Allocate memory to send reports for any subsequent requests. */ - { + if (pReport == NULL) { /* Allocate memory to send reports for any subsequent requests. */ pReport = cdf_mem_malloc(sizeof (tSirMacRadioMeasureReport) @@ -1222,8 +1221,7 @@ rrm_process_radio_measurement_request(tpAniSirGlobal pMac, break; default: /* Send a report with incapabale bit set. */ - if (pReport == NULL) /* Allocate memory to send reports for any subsequent requests. */ - { + if (pReport == NULL) { /* Allocate memory to send reports for any subsequent requests. */ pReport = cdf_mem_malloc(sizeof (tSirMacRadioMeasureReport) diff --git a/core/mac/src/pe/sch/sch_api.c b/core/mac/src/pe/sch/sch_api.c index 344ac544c3..a717565166 100644 --- a/core/mac/src/pe/sch/sch_api.c +++ b/core/mac/src/pe/sch/sch_api.c @@ -553,7 +553,7 @@ int sch_gen_timing_advert_frame(tpAniSirGlobal mac_ctx, tSirMacAddr self_addr, tDot11fTimingAdvertisementFrame frame; uint32_t payload_size, buf_size; int status; - struct cdf_mac_addr wildcard_bssid = { + struct qdf_mac_addr wildcard_bssid = { {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}, }; diff --git a/core/mac/src/pe/sch/sch_beacon_process.c b/core/mac/src/pe/sch/sch_beacon_process.c index ca769bfc57..93c78d501d 100644 --- a/core/mac/src/pe/sch/sch_beacon_process.c +++ b/core/mac/src/pe/sch/sch_beacon_process.c @@ -135,7 +135,7 @@ ap_beacon_process_24_ghz(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info, return; #ifdef FEATURE_WLAN_ESE if (session->isESEconnection) - CDF_TRACE(CDF_MODULE_ID_PE, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, FL("[INFOLOG]ESE 11g erpPresent=%d useProtection=%d nonErpPresent=%d"), bcn_struct->erpPresent, @@ -162,7 +162,7 @@ ap_beacon_process_24_ghz(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info, if (tmp_exp) { #ifdef FEATURE_WLAN_ESE if (session->isESEconnection) { - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, FL("[INFOLOG]ESE 11g erpPresent=%d useProtection=%d nonErpPresent=%d"), bcn_struct->erpPresent, bcn_struct->erpIEInfo.useProtection, @@ -296,7 +296,8 @@ static void __sch_beacon_process_no_session(tpAniSirGlobal pMac, { tpPESession psessionEntry = NULL; - if ((psessionEntry = lim_is_ibss_session_active(pMac)) != NULL) { + psessionEntry = lim_is_ibss_session_active(pMac); + if (psessionEntry != NULL) { lim_handle_ibss_coalescing(pMac, pBeacon, pRxPacketInfo, psessionEntry); } diff --git a/core/mac/src/pe/sch/sch_debug.c b/core/mac/src/pe/sch/sch_debug.c index 47c0714a83..3f4f987526 100644 --- a/core/mac/src/pe/sch/sch_debug.c +++ b/core/mac/src/pe/sch/sch_debug.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2014 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. * @@ -54,7 +54,7 @@ void sch_log(tpAniSirGlobal pMac, uint32_t loglevel, const char *pString, ...) /* extracting arguments from pstring */ va_start(marker, pString); vsnprintf(logBuffer, LOG_SIZE, pString, marker); - CDF_TRACE(CDF_MODULE_ID_PE, cdf_debug_level, "%s", logBuffer); + CDF_TRACE(QDF_MODULE_ID_PE, cdf_debug_level, "%s", logBuffer); va_end(marker); } diff --git a/core/mac/src/sys/common/inc/wlan_qct_sys.h b/core/mac/src/sys/common/inc/wlan_qct_sys.h index d4521b8fe3..0ebafee064 100644 --- a/core/mac/src/sys/common/inc/wlan_qct_sys.h +++ b/core/mac/src/sys/common/inc/wlan_qct_sys.h @@ -41,7 +41,7 @@ /*--------------------------------------------------------------------------- Include files -------------------------------------------------------------------------*/ -#include +#include #include #include diff --git a/core/mac/src/sys/common/src/wlan_qct_sys.c b/core/mac/src/sys/common/src/wlan_qct_sys.c index 7c950e115a..d1eaad913d 100644 --- a/core/mac/src/sys/common/src/wlan_qct_sys.c +++ b/core/mac/src/sys/common/src/wlan_qct_sys.c @@ -138,7 +138,7 @@ QDF_STATUS sys_mc_process_msg(v_CONTEXT_t p_cds_context, cds_msg_t *pMsg) void *hHal; if (NULL == pMsg) { - CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, "%s: NULL pointer to cds_msg_t", __func__); CDF_ASSERT(0); return QDF_STATUS_E_INVAL; @@ -159,20 +159,20 @@ QDF_STATUS sys_mc_process_msg(v_CONTEXT_t p_cds_context, cds_msg_t *pMsg) * Handling for this message is not needed now so adding * debug print and CDF_ASSERT */ - CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, "Rx SYS_MSG_ID_MC_START msgType= %d [0x%08x]", pMsg->type, pMsg->type); CDF_ASSERT(0); break; case SYS_MSG_ID_MC_STOP: - CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO, "Processing SYS MC STOP"); /* get the HAL context... */ - hHal = cds_get_context(CDF_MODULE_ID_PE); + hHal = cds_get_context(QDF_MODULE_ID_PE); if (NULL == hHal) { - CDF_TRACE(CDF_MODULE_ID_SYS, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, "%s: Invalid hHal", __func__); } else { @@ -195,7 +195,7 @@ QDF_STATUS sys_mc_process_msg(v_CONTEXT_t p_cds_context, cds_msg_t *pMsg) * Process MC thread probe. Just callback to the * function that is in the message. */ - CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, "Rx SYS_MSG_ID_MC_THR_PROBE msgType=%d[0x%08x]", pMsg->type, pMsg->type); break; @@ -207,9 +207,9 @@ QDF_STATUS sys_mc_process_msg(v_CONTEXT_t p_cds_context, cds_msg_t *pMsg) break; case SYS_MSG_ID_FTM_RSP: - hHal = cds_get_context(CDF_MODULE_ID_PE); + hHal = cds_get_context(QDF_MODULE_ID_PE); if (NULL == hHal) { - CDF_TRACE(CDF_MODULE_ID_SYS, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, FL("Invalid hal")); cdf_mem_free(pMsg->bodyptr); @@ -217,14 +217,14 @@ QDF_STATUS sys_mc_process_msg(v_CONTEXT_t p_cds_context, cds_msg_t *pMsg) } mac_ctx = PMAC_STRUCT(hHal); if (NULL == mac_ctx) { - CDF_TRACE(CDF_MODULE_ID_SYS, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, FL("Invalid mac context")); cdf_mem_free(pMsg->bodyptr); break; } if (NULL == mac_ctx->ftm_msg_processor_callback) { - CDF_TRACE(CDF_MODULE_ID_SYS, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, FL("callback pointer is NULL")); cdf_mem_free(pMsg->bodyptr); @@ -236,14 +236,14 @@ QDF_STATUS sys_mc_process_msg(v_CONTEXT_t p_cds_context, cds_msg_t *pMsg) break; default: - CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, "Unknown message type msgType= %d [0x%08x]", pMsg->type, pMsg->type); break; } } else { - CDF_TRACE(CDF_MODULE_ID_SYS, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, "Rx SYS unknown MC msgtype= %d [0x%08X]", pMsg->type, pMsg->type); @@ -275,7 +275,7 @@ void sys_process_mmh_msg(tpAniSirGlobal pMac, tSirMsgQ *pMsg) * It is up to the callee to free it */ if (NULL == pMsg) { - CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, "NULL Message Pointer"); CDF_ASSERT(0); return; @@ -289,7 +289,7 @@ void sys_process_mmh_msg(tpAniSirGlobal pMac, tSirMsgQ *pMsg) case WNI_CFG_DNLD_CNF: /* Forward this message to the SYS module */ targetMQ = CDS_MQ_ID_SYS; - CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, "Handling for the Message ID %d is removed in SYS", pMsg->type); CDF_ASSERT(0); @@ -301,7 +301,7 @@ void sys_process_mmh_msg(tpAniSirGlobal pMac, tSirMsgQ *pMsg) case WNI_CFG_DNLD_RSP: /* Forward this message to the HAL module */ targetMQ = CDS_MQ_ID_WMA; - CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, "Handling for the Message ID %d is removed as no HAL", pMsg->type); @@ -329,7 +329,7 @@ void sys_process_mmh_msg(tpAniSirGlobal pMac, tSirMsgQ *pMsg) break; } - CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, "Message of ID %d is not yet handled by SYS", pMsg->type); CDF_ASSERT(0); diff --git a/core/mac/src/sys/legacy/src/platform/inc/sys_wrapper.h b/core/mac/src/sys/legacy/src/platform/inc/sys_wrapper.h index 8a4a2c0101..03debc17b1 100644 --- a/core/mac/src/sys/legacy/src/platform/inc/sys_wrapper.h +++ b/core/mac/src/sys/legacy/src/platform/inc/sys_wrapper.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. * @@ -48,7 +48,7 @@ extern "C" { #include "sir_params.h" #include "sys_def.h" #include "cdf_mc_timer.h" -#include "cdf_types.h" +#include "qdf_types.h" #include "cdf_trace.h" #include "cdf_memory.h" diff --git a/core/mac/src/sys/legacy/src/platform/src/sys_wrapper.c b/core/mac/src/sys/legacy/src/platform/src/sys_wrapper.c index 10c993efc8..a965a63b0b 100644 --- a/core/mac/src/sys/legacy/src/platform/src/sys_wrapper.c +++ b/core/mac/src/sys/legacy/src/platform/src/sys_wrapper.c @@ -135,23 +135,23 @@ uint32_t tx_timer_activate(TX_TIMER *timer_ptr) /* Check for an uninitialized timer */ CDF_ASSERT(0 != strlen(TIMER_NAME)); - CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO, "Timer %s being activated\n", TIMER_NAME); status = cdf_mc_timer_start(&timer_ptr->cdf_timer, timer_ptr->initScheduleTimeInMsecs); if (QDF_STATUS_SUCCESS == status) { - CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO, "Timer %s now activated\n", TIMER_NAME); return TX_SUCCESS; } else if (QDF_STATUS_E_ALREADY == status) { /* starting timer fails because timer is already started; this is okay */ - CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO, "Timer %s is already running\n", TIMER_NAME); return TX_SUCCESS; } else { - CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, "Timer %s fails to activate\n", TIMER_NAME); return TX_TIMER_ERROR; } @@ -262,7 +262,7 @@ static void tx_main_timer_func(void *functionContext) return; } - CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO, "Timer %s triggered", TIMER_NAME); /* Now call the actual timer function, taking the function pointer, */ @@ -277,7 +277,7 @@ static void tx_main_timer_func(void *functionContext) timer_ptr->rescheduleTimeInMsecs = 0; if (QDF_STATUS_SUCCESS != status) { - CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_WARN, "Unable to reschedule timer %s; status=%d", TIMER_NAME, status); } @@ -298,7 +298,7 @@ uint32_t tx_timer_create_intern_debug(void *pMacGlobal, QDF_STATUS status; if (NULL == expiration_function) { - CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, "NULL timer expiration"); CDF_ASSERT(0); return TX_TIMER_ERROR; @@ -306,7 +306,7 @@ uint32_t tx_timer_create_intern_debug(void *pMacGlobal, if (NULL == name_ptr) { - CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, "NULL name pointer for timer"); CDF_ASSERT(0); return TX_TIMER_ERROR; @@ -335,17 +335,17 @@ uint32_t tx_timer_create_intern_debug(void *pMacGlobal, #endif /* Store the timer name, for Debug build only */ status = - cdf_mc_timer_init_debug(&timer_ptr->cdf_timer, CDF_TIMER_TYPE_SW, + cdf_mc_timer_init_debug(&timer_ptr->cdf_timer, QDF_TIMER_TYPE_SW, tx_main_timer_func, (void *) timer_ptr, fileName, lineNum); if (QDF_STATUS_SUCCESS != status) { - CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, "Cannot create timer for %s\n", TIMER_NAME); return TX_TIMER_ERROR; } if (0 != rescheduleTimeInTicks) { - CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO, "Creating periodic timer for %s\n", TIMER_NAME); } /* Activate this timer if required */ @@ -394,16 +394,16 @@ uint32_t tx_timer_create_intern(void *pMacGlobal, TX_TIMER *timer_ptr, strlcpy(timer_ptr->timerName, name_ptr, sizeof(timer_ptr->timerName)); #endif /* Store the timer name, for Debug build only */ - status = cdf_mc_timer_init(&timer_ptr->cdf_timer, CDF_TIMER_TYPE_SW, + status = cdf_mc_timer_init(&timer_ptr->cdf_timer, QDF_TIMER_TYPE_SW, tx_main_timer_func, (void *) timer_ptr); if (QDF_STATUS_SUCCESS != status) { - CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, "Cannot create timer for %s\n", TIMER_NAME); return TX_TIMER_ERROR; } if (0 != rescheduleTimeInTicks) { - CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO, "Creating periodic timer for %s\n", TIMER_NAME); } /* Activate this timer if required */ @@ -435,7 +435,7 @@ uint32_t tx_timer_create_intern(void *pMacGlobal, TX_TIMER *timer_ptr, uint32_t tx_timer_deactivate(TX_TIMER *timer_ptr) { QDF_STATUS vStatus; - CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO, "tx_timer_deactivate() called for timer %s\n", TIMER_NAME); /* Put a check for the free builds */ @@ -445,7 +445,7 @@ uint32_t tx_timer_deactivate(TX_TIMER *timer_ptr) /* if the timer is not running then we do not need to do anything here */ vStatus = cdf_mc_timer_stop(&timer_ptr->cdf_timer); if (QDF_STATUS_SUCCESS != vStatus) { - CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO_HIGH, "Unable to stop timer %s; status =%d\n", TIMER_NAME, vStatus); } @@ -456,7 +456,7 @@ uint32_t tx_timer_deactivate(TX_TIMER *timer_ptr) uint32_t tx_timer_delete(TX_TIMER *timer_ptr) { - CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO, "tx_timer_delete() called for timer %s\n", TIMER_NAME); /* Put a check for the free builds */ @@ -486,7 +486,7 @@ uint32_t tx_timer_delete(TX_TIMER *timer_ptr) */ bool tx_timer_running(TX_TIMER *timer_ptr) { - CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO, "tx_timer_running() called for timer %s\n", TIMER_NAME); /* Put a check for the free builds */ diff --git a/core/mac/src/sys/legacy/src/system/src/sys_entry_func.c b/core/mac/src/sys/legacy/src/system/src/sys_entry_func.c index a748f85ddb..88bac6af63 100644 --- a/core/mac/src/sys/legacy/src/system/src/sys_entry_func.c +++ b/core/mac/src/sys/legacy/src/system/src/sys_entry_func.c @@ -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. * @@ -54,7 +54,7 @@ tSirRetStatus postPTTMsgApi(tpAniSirGlobal pMac, tSirMsgQ *pMsg); -#include "cdf_types.h" +#include "qdf_types.h" #include "cds_packet.h" #define MAX_DEAUTH_ALLOWED 5 @@ -136,8 +136,8 @@ sys_bbt_process_message_core(tpAniSirGlobal mac_ctx, tpSirMsgQ msg, mac_hdr->bssId, &sessionid); if (pe_session && - (pe_session->pePersona == CDF_SAP_MODE)) { - CDF_TRACE(CDF_MODULE_ID_SYS, + (pe_session->pePersona == QDF_SAP_MODE)) { + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO_HIGH, FL("CAC timer is running, dropping the mgmt frame")); goto fail; @@ -152,7 +152,7 @@ sys_bbt_process_message_core(tpAniSirGlobal mac_ctx, tpSirMsgQ msg, (!lim_is_system_in_scan_state(mac_ctx)) && (GET_LIM_PROCESS_DEFD_MESGS(mac_ctx) != true) && !mac_ctx->lim.gLimSystemInScanLearnMode) { - CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO_HIGH, FL("dropping received beacon in deffered state")); goto fail; } diff --git a/core/mac/src/sys/legacy/src/utils/src/log_api.c b/core/mac/src/sys/legacy/src/utils/src/log_api.c index 8ec7b8c9e8..3b3581b0bc 100644 --- a/core/mac/src/sys/legacy/src/utils/src/log_api.c +++ b/core/mac/src/sys/legacy/src/utils/src/log_api.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. * @@ -154,11 +154,11 @@ CDF_TRACE_LEVEL get_vos_debug_level(uint32_t debugLevel) } } -static inline CDF_MODULE_ID get_vos_module_id(uint8_t modId) +static inline QDF_MODULE_ID get_vos_module_id(uint8_t modId) { switch (modId) { case SIR_HAL_MODULE_ID: - return CDF_MODULE_ID_WMA; + return QDF_MODULE_ID_WMA; case SIR_LIM_MODULE_ID: case SIR_SCH_MODULE_ID: @@ -166,16 +166,16 @@ static inline CDF_MODULE_ID get_vos_module_id(uint8_t modId) case SIR_MNT_MODULE_ID: case SIR_DPH_MODULE_ID: case SIR_DBG_MODULE_ID: - return CDF_MODULE_ID_PE; + return QDF_MODULE_ID_PE; case SIR_SYS_MODULE_ID: - return CDF_MODULE_ID_SYS; + return QDF_MODULE_ID_SYS; case SIR_SMS_MODULE_ID: - return CDF_MODULE_ID_SME; + return QDF_MODULE_ID_SME; default: - return CDF_MODULE_ID_SYS; + return QDF_MODULE_ID_SYS; } } @@ -184,7 +184,7 @@ void log_debug(tpAniSirGlobal pMac, uint8_t modId, uint32_t debugLevel, const char *pStr, va_list marker) { CDF_TRACE_LEVEL cdf_debug_level; - CDF_MODULE_ID cdf_module_id; + QDF_MODULE_ID cdf_module_id; char logBuffer[LOG_SIZE]; cdf_debug_level = get_vos_debug_level(debugLevel); diff --git a/core/mac/src/sys/legacy/src/utils/src/mac_trace.c b/core/mac/src/sys/legacy/src/utils/src/mac_trace.c index 2c5e1026ed..08024a2481 100644 --- a/core/mac/src/sys/legacy/src/utils/src/mac_trace.c +++ b/core/mac/src/sys/legacy/src/utils/src/mac_trace.c @@ -731,7 +731,7 @@ void mac_trace(tpAniSirGlobal mac_ctx, uint8_t code, * Today mac_trace is being invoked by PE only, need to remove this * function once PE is migrated to using new trace API. */ - mac_trace_new(mac_ctx, CDF_MODULE_ID_PE, code, session, data); + mac_trace_new(mac_ctx, QDF_MODULE_ID_PE, code, session, data); } /** diff --git a/core/sap/dfs/inc/dfs.h b/core/sap/dfs/inc/dfs.h index 6516e15aa9..e2354eca65 100644 --- a/core/sap/dfs/inc/dfs.h +++ b/core/sap/dfs/inc/dfs.h @@ -81,7 +81,7 @@ if (((dfs) == NULL) || \ ((dfs) != NULL && \ ((_m) & (dfs)->dfs_debug_mask))) { \ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_DEBUG, \ + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_DEBUG, \ _fmt, __VA_ARGS__); \ } \ } while (0) @@ -231,7 +231,7 @@ struct dfs_pulseparams { uint64_t p_time; /* time for start of pulse in usecs */ uint8_t p_dur; /* Duration of pulse in usecs */ uint8_t p_rssi; /* Duration of pulse in usecs */ -} cdf_packed; +} qdf_packed; #ifdef WIN32 #pragma pack(pop, dfs_pulseparams) #endif @@ -245,7 +245,7 @@ struct dfs_pulseline { uint32_t pl_firstelem; /* Index of the first element */ uint32_t pl_lastelem; /* Index of the last element */ uint32_t pl_numelems; /* Number of elements in the delay line */ -} cdf_packed; +} qdf_packed; #ifdef WIN32 #pragma pack(pop, dfs_pulseline) #endif @@ -287,7 +287,7 @@ struct dfs_event { int sidx; /* Pulse Index as in radar summary report */ int radar_80p80_segid; /* 80p80 segment ID as in radar sum report */ STAILQ_ENTRY(dfs_event) re_list; /* List of radar events */ -} cdf_packed; +} qdf_packed; #ifdef WIN32 #pragma pack(pop, dfs_event) #endif @@ -329,7 +329,7 @@ struct dfs_delayelem { uint8_t de_rssi; /* time stamp for this delay element */ uint64_t de_ts; -} cdf_packed; +} qdf_packed; #ifdef WIN32 #pragma pack(pop, dfs_delayelem) #endif @@ -350,7 +350,7 @@ struct dfs_delayline { uint32_t dl_lastelem; /* Number of elements in the delay line */ uint32_t dl_numelems; -} cdf_packed; +} qdf_packed; #ifdef WIN32 #pragma pack(pop, dfs_delayline) #endif @@ -384,7 +384,7 @@ struct dfs_filter { uint32_t rf_ignore_pri_window; /* Unique ID corresponding to the original filter ID */ uint32_t rf_pulseid; -} cdf_packed; +} qdf_packed; #ifdef WIN32 #pragma pack(pop, dfs_filter) #endif @@ -441,7 +441,7 @@ struct dfs_nolelem { uint32_t nol_timeout_ms; /* NOL timeout value in msec */ os_timer_t nol_timer; /* per element NOL timer */ struct dfs_nolelem *nol_next; /* next element pointer */ -} cdf_packed; +} qdf_packed; #ifdef WIN32 #pragma pack(pop, dfs_nolelem) #endif @@ -484,7 +484,7 @@ struct dfs_info { uint64_t dfs_bin5_chirp_ts; uint8_t dfs_last_bin5_dur; uint8_t dfs_last_bin5_dur_ext_seg; -} cdf_packed; +} qdf_packed; #ifdef WIN32 #pragma pack(pop, dfs_info) #endif diff --git a/core/sap/dfs/src/dfs.c b/core/sap/dfs/src/dfs.c index 22ba6f405b..24b43b1def 100644 --- a/core/sap/dfs/src/dfs.c +++ b/core/sap/dfs/src/dfs.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2002-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -27,7 +27,7 @@ /*=========================================================================== - dfs.c + dfs.c OVERVIEW: @@ -41,7 +41,7 @@ /*=========================================================================== - EDIT HISTORY FOR FILE + EDIT HISTORY FOR FILE This section contains comments describing changes made to the module. Notice that changes are listed in reverse chronological order. @@ -260,10 +260,10 @@ int dfs_attach(struct ieee80211com *ic) dfs_clear_stats(ic); dfs->dfs_event_log_on = 0; OS_INIT_TIMER(NULL, &(dfs->ath_dfs_task_timer), dfs_task, (void *)(ic), - CDF_TIMER_TYPE_SW); + QDF_TIMER_TYPE_SW); #ifndef ATH_DFS_RADAR_DETECTION_ONLY OS_INIT_TIMER(NULL, &(dfs->ath_dfstesttimer), dfs_testtimer_task, - (void *)ic, CDF_TIMER_TYPE_SW); + (void *)ic, QDF_TIMER_TYPE_SW); dfs->ath_dfs_cac_time = ATH_DFS_WAIT_MS; dfs->ath_dfstesttime = ATH_DFS_TEST_RETURN_PERIOD_MS; #endif @@ -314,7 +314,7 @@ int dfs_attach(struct ieee80211com *ic) dfs->events = NULL; OS_FREE(dfs); ic->ic_dfs = NULL; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s[%d]: pulse buffer allocation failed", __func__, __LINE__); return 1; @@ -341,7 +341,7 @@ int dfs_attach(struct ieee80211com *ic) } /* Allocate memory for radar table */ dfs->dfs_radartable = - (int8_t * *) os_malloc(NULL, 256 * sizeof(int8_t *), GFP_ATOMIC); + (int8_t **) os_malloc(NULL, 256 * sizeof(int8_t *), GFP_ATOMIC); if (dfs->dfs_radartable == NULL) { DFS_PRINTK("%s: cannot allocate memory for radar table\n", __func__); @@ -607,7 +607,7 @@ int dfs_radar_enable(struct ieee80211com *ic, * 0 on success. */ if (DFS_STATUS_FAIL == radar_filters_init_status) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s[%d]: DFS Radar Filters Initialization Failed", __func__, __LINE__); return -EIO; diff --git a/core/sap/dfs/src/dfs_init.c b/core/sap/dfs/src/dfs_init.c index 7ab7df12a9..434b016eca 100644 --- a/core/sap/dfs/src/dfs_init.c +++ b/core/sap/dfs/src/dfs_init.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002-2014 The Linux Foundation. All rights reserved. + * Copyright (c) 2002-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -27,7 +27,7 @@ /*=========================================================================== - dfs_init.c + dfs_init.c OVERVIEW: @@ -41,7 +41,7 @@ /*=========================================================================== - EDIT HISTORY FOR FILE + EDIT HISTORY FOR FILE This section contains comments describing changes made to the module. Notice that changes are listed in reverse chronological order. @@ -75,7 +75,7 @@ void dfs_reset_alldelaylines(struct ath_dfs *dfs, int seg_id) int i, j; if (dfs == NULL) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s[%d]: sc_dfs is NULL", __func__, __LINE__); return; } @@ -86,7 +86,7 @@ void dfs_reset_alldelaylines(struct ath_dfs *dfs, int seg_id) pl = dfs->pulses; if (pl == NULL) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s[%d]: pl==NULL, dfs=%p", __func__, __LINE__, dfs); return; } @@ -103,7 +103,7 @@ void dfs_reset_alldelaylines(struct ath_dfs *dfs, int seg_id) } } else { if (dfs->dfs_b5radars == NULL) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s[%d]: pl==NULL, b5radars=%p", __func__, __LINE__, dfs->dfs_b5radars); return; @@ -220,7 +220,7 @@ int dfs_init_radar_filters(struct ieee80211com *ic, uint32_t b5_maxdur; if (dfs == NULL) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s[%d]: dfs is NULL", __func__, __LINE__); return DFS_STATUS_FAIL; } @@ -234,7 +234,7 @@ int dfs_init_radar_filters(struct ieee80211com *ic, * the rest of the radar configuration as suspect. */ if (radar_info == NULL || radar_info->dfsdomain == 0) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s[%d]: Unknown dfs domain %d ", __func__, __LINE__, dfs->dfsdomain); /* Disable radar detection since we don't have a radar domain */ @@ -245,7 +245,7 @@ int dfs_init_radar_filters(struct ieee80211com *ic, return DFS_STATUS_SUCCESS; } - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s[%d]:dfsdomain=%d, numradars=%d, numb5radars=%d", __func__, __LINE__, radar_info->dfsdomain, radar_info->numradars, radar_info->numb5radars); @@ -368,12 +368,12 @@ int dfs_init_radar_filters(struct ieee80211com *ic, rf->rf_threshold = dfs_radars[p].rp_threshold; rf->rf_filterlen = rf->rf_maxpri * rf->rf_numpulses; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s[%d]: minprf = %d maxprf = %d pulsevar = %d thresh=%d", __func__, __LINE__, dfs_radars[p].rp_pulsefreq, dfs_radars[p].rp_max_pulsefreq, dfs_radars[p].rp_pulsevar, rf->rf_threshold); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s[%d]:minpri = %d maxpri = %d filterlen = %d filterID = %d", __func__, __LINE__, rf->rf_minpri, rf->rf_maxpri, rf->rf_filterlen, rf->rf_pulseid); @@ -405,7 +405,7 @@ int dfs_init_radar_filters(struct ieee80211com *ic, sizeof(struct dfs_bin5radars), GFP_KERNEL); if (dfs->dfs_b5radars_ext_seg == NULL) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s:Fail allocate memory for ext bin5 radars", __func__); goto bad4; @@ -456,10 +456,10 @@ int dfs_init_radar_filters(struct ieee80211com *ic, dfs_round((int32_t) ((max_pulsedur * 100 / 80) * 100)); /* relax the max pulse duration a little bit due to inaccuracy caused by chirping. */ dfs->dfs_rinfo.rn_maxpulsedur = dfs->dfs_rinfo.rn_maxpulsedur + 20; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s[%d]: DFS min filter rssiThresh = %d", __func__, __LINE__, min_rssithresh); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s[%d]:DFS max pulse dur = %d ticks", __func__, __LINE__, dfs->dfs_rinfo.rn_maxpulsedur); return DFS_STATUS_SUCCESS; diff --git a/core/sap/dfs/src/dfs_nol.c b/core/sap/dfs/src/dfs_nol.c index 400e5159ea..85810bcd2b 100644 --- a/core/sap/dfs/src/dfs_nol.c +++ b/core/sap/dfs/src/dfs_nol.c @@ -242,7 +242,7 @@ dfs_nol_addchan(struct ath_dfs *dfs, struct dfs_ieee80211_channel *chan, dfs_nol_arg->delchwidth = elem->nol_chwidth; OS_INIT_TIMER(NULL, &elem->nol_timer, dfs_remove_from_nol, - dfs_nol_arg, CDF_TIMER_TYPE_SW); + dfs_nol_arg, QDF_TIMER_TYPE_SW); OS_SET_TIMER(&elem->nol_timer, dfs_nol_timeout * TIME_IN_MS); /* Update the NOL counter */ diff --git a/core/sap/dfs/src/dfs_phyerr_tlv.c b/core/sap/dfs/src/dfs_phyerr_tlv.c index aaf5686362..3ba5a9dcff 100644 --- a/core/sap/dfs/src/dfs_phyerr_tlv.c +++ b/core/sap/dfs/src/dfs_phyerr_tlv.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. * @@ -154,52 +154,52 @@ radar_summary_print(struct ath_dfs *dfs, else is_chip_oversampling = PERE_IS_OVERSAMPLING(dfs); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "\n ############ Radar Summary ############\n"); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s: Radar Summary - pulsedur = %d micro seconds\n", __func__, rsu->pulse_duration); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s: Radar Summary - rssi = %d dbm\n", __func__, rsu->rssi); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s: Radar Summary - ischirp = %d\n", __func__, rsu->is_chirp); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s: Radar Summary - sidx = %d\n", __func__, rsu->sidx); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s: Radar Summary - delta_peak = %d\n", __func__, rsu->delta_peak); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s: Radar Summary - delta_diff = %d\n", __func__, rsu->delta_diff); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s: Radar Summary - raw tsf = %d\n", __func__, rsu->raw_tsf); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s: Radar Summary - tsf_offset = %d micro seconds\n", __func__, rsu->tsf_offset); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s: Radar Summary - cooked tsf = %d\n", __func__, (rsu->raw_tsf - rsu->tsf_offset)); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s: frequency offset = %d.%d MHz (oversampling = %d)\n", __func__, (int) (rsu->freq_offset / 1000), (int) abs(rsu->freq_offset % 1000), is_chip_oversampling); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "\n ###################################\n"); } @@ -223,12 +223,12 @@ radar_summary_parse(struct ath_dfs *dfs, const char *buf, size_t len, */ if ((dfs->ic->dfs_hw_bd_id == DFS_HWBD_QCA6174) && (len < sizeof(rs))) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: DFS-2 radar summary len = (%zu) wrong, expected = (%zu)", __func__, len, sizeof(rs)); } else if ((dfs->ic->dfs_hw_bd_id != DFS_HWBD_QCA6174) && (len < sizeof(dfs3_rs))) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: DFS-3 radar summary len = (%zu) wrong, expected = (%zu)", __func__, len, sizeof(dfs3_rs)); } @@ -859,7 +859,7 @@ dfs_process_phyerr_bb_tlv(struct ath_dfs *dfs, void *buf, uint16_t datalen, * in noisy environments. */ if (!(invalid_phyerr_count & 0xFF)) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_DEBUG, "%s[%d]:parse failed invalid phyerror cnt = %d", __func__, __LINE__, invalid_phyerr_count); } diff --git a/core/sap/dfs/src/dfs_process_phyerr.c b/core/sap/dfs/src/dfs_process_phyerr.c index 0a806b4db8..ba1ba1f9bd 100644 --- a/core/sap/dfs/src/dfs_process_phyerr.c +++ b/core/sap/dfs/src/dfs_process_phyerr.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2002-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -463,7 +463,7 @@ static void dump_phyerr_contents(const char *d, int len) * Print the final line if we didn't print it above. */ if (n != 0) - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s: %s\n", + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s: %s\n", __func__, buf); #endif /* def CONFIG_ENABLE_DUMP_PHYERR_CONTENTS */ } @@ -480,7 +480,7 @@ dfs_process_phyerr(struct ieee80211com *ic, void *buf, uint16_t datalen, int empty; if (dfs == NULL) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: sc_dfs is NULL\n", __func__); return; } @@ -509,7 +509,7 @@ dfs_process_phyerr(struct ieee80211com *ic, void *buf, uint16_t datalen, dump_phyerr_contents(buf, datalen); if (chan == NULL) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: chan is NULL\n", __func__); return; } @@ -588,7 +588,7 @@ dfs_process_phyerr(struct ieee80211com *ic, void *buf, uint16_t datalen, } } - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "\n %s: Frequency at which the phyerror was injected = %d", __func__, e.freq); /* diff --git a/core/sap/dfs/src/dfs_process_radarevent.c b/core/sap/dfs/src/dfs_process_radarevent.c index 3c05d32270..7ea5cecb15 100644 --- a/core/sap/dfs/src/dfs_process_radarevent.c +++ b/core/sap/dfs/src/dfs_process_radarevent.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2002-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -27,7 +27,7 @@ /*=========================================================================== - dfs_radarevent.c + dfs_radarevent.c OVERVIEW: @@ -41,7 +41,7 @@ /*=========================================================================== - EDIT HISTORY FOR FILE + EDIT HISTORY FOR FILE This section contains comments describing changes made to the module. Notice that changes are listed in reverse chronological order. @@ -127,7 +127,7 @@ int dfs_process_radarevent(struct ath_dfs *dfs, uint64_t deltafull_ts = 0, this_ts, deltaT; struct dfs_ieee80211_channel *thischan; struct dfs_pulseline *pl; - static uint32_t diff_ts = 0; + static uint32_t diff_ts; int ext_chan_event_flag = 0; #if 0 int pri_multiplier = 2; @@ -137,7 +137,7 @@ int dfs_process_radarevent(struct ath_dfs *dfs, struct dfs_delayline *dl; if (dfs == NULL) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s[%d]: dfs is NULL", __func__, __LINE__); return 0; } @@ -216,7 +216,7 @@ int dfs_process_radarevent(struct ath_dfs *dfs, if (event == NULL) { empty = 1; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s[%d]: event is NULL ", __func__, __LINE__); break; } @@ -404,7 +404,7 @@ int dfs_process_radarevent(struct ath_dfs *dfs, dfs->radar_log[i].dur = re.re_dur; dfs->dfs_event_log_count++; } - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s[%d]:xxxxx ts =%u re.re_dur=%u re.re_rssi =%u diff =%u pl->pl_lastelem.p_time=%llu xxxxx", __func__, __LINE__, (uint32_t) this_ts, re.re_dur, re.re_rssi, diff_ts, @@ -436,9 +436,9 @@ int dfs_process_radarevent(struct ath_dfs *dfs, (diff_ts > 500 || diff_ts <= 305) && (re.sidx == -4)) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "\n%s: Rejecting on Peak Index = %d,re.re_dur = %d,diff_ts = %d\n", - __func__,re.sidx, re.re_dur, diff_ts); + __func__, re.sidx, re.re_dur, diff_ts); ATH_DFSQ_LOCK(dfs); empty = STAILQ_EMPTY(&(dfs->dfs_radarq)); @@ -465,16 +465,16 @@ int dfs_process_radarevent(struct ath_dfs *dfs, re.re_dur < DFS_TYPE4_WAR_PULSE_DURATION_UPPER_LIMIT) && (diff_ts > DFS_TYPE4_WAR_PRI_LOWER_LIMIT && diff_ts < DFS_TYPE4_WAR_PRI_UPPER_LIMIT)) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s:chan->ic_flags=0x%x, MHz separation=%d\n", __func__, chan->ic_flags, chan->ic_pri_freq_center_freq_mhz_separation); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s: Peak Idx =%d,re.re_dur =%d,diff_ts =%d\n", __func__, re.sidx, re.re_dur, diff_ts); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "\n%s: Modify pulse dur to fit valid range \n", __func__); @@ -502,16 +502,16 @@ int dfs_process_radarevent(struct ath_dfs *dfs, diff_ts < DFS_ETSI_TYPE2_WAR_PRI_UPPER_LIMIT) || (diff_ts > DFS_ETSI_TYPE3_WAR_PRI_LOWER_LIMIT && diff_ts < DFS_ETSI_TYPE3_WAR_PRI_UPPER_LIMIT))) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "\n%s:chan->ic_flags=0x%x,MHz Separation=%d\n", __func__, chan->ic_flags, chan->ic_pri_freq_center_freq_mhz_separation); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s:Peak Index =%d,re.re_dur =%d,diff_ts =%d\n", __func__, re.sidx, re.re_dur, diff_ts); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s:Modify ETSI pulse dur to valid range \n", __func__); @@ -598,7 +598,7 @@ int dfs_process_radarevent(struct ath_dfs *dfs, "%s : Rejecting on rssi rssi=%u thresh=%u", __func__, re.re_rssi, ft->ft_rssithresh); - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s[%d]: Rejecting on rssi rssi=%u thresh=%u", __func__, __LINE__, re.re_rssi, @@ -623,7 +623,7 @@ int dfs_process_radarevent(struct ath_dfs *dfs, __func__, (unsigned long long)deltaT, ft->ft_minpri); - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s[%d]:Rejecting on pri pri=%lld minpri=%u", __func__, __LINE__, @@ -657,7 +657,7 @@ int dfs_process_radarevent(struct ath_dfs *dfs, (unsigned long long) deltaT, rf->rf_minpri); - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s[%d]:filterID= %d::Rejecting on individual filter min PRI deltaT=%lld rf->rf_minpri=%u", __func__, __LINE__, @@ -681,7 +681,7 @@ int dfs_process_radarevent(struct ath_dfs *dfs, rf-> rf_minpri); CDF_TRACE - (CDF_MODULE_ID_SAP, + (QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s[%d]:filterID= %d :: Rejecting on individual filter max PRI deltaT=%lld rf->rf_minpri=%u", __func__, __LINE__, @@ -720,7 +720,7 @@ int dfs_process_radarevent(struct ath_dfs *dfs, rf-> rf_minpri); CDF_TRACE - (CDF_MODULE_ID_SAP, + (QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s[%d]:filterID= %d :: Rejecting on individual filter max PRI deltaT=%lld rf->rf_minpri=%u", __func__, __LINE__, @@ -770,9 +770,9 @@ int dfs_process_radarevent(struct ath_dfs *dfs, "Found on channel minDur = %d, filterId = %d", ft->ft_mindur, rf != NULL ? rf->rf_pulseid : -1); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, - "%s[%d]:### Found on channel minDur = %d,filterId = %d seg_id = %d ###", - __func__,__LINE__,ft->ft_mindur, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + "%s[%d]:### Found on channel minDur = %d, filterId = %d seg_id = %d ###", + __func__, __LINE__, ft->ft_mindur, rf != NULL ? rf->rf_pulseid : -1, seg_id); } @@ -798,7 +798,7 @@ dfsfound: */ dfs->ic->ic_curchan->ic_radar_found_segid = seg_id; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s[%d]:### RADAR FOUND ON CHANNEL %d (%d MHz),seg_id=%d ###", __func__, __LINE__, thischan->ic_ieee, thischan->ic_freq, seg_id); @@ -861,7 +861,7 @@ dfsfound: dfs->dfs_phyerr_freq_max = 0; dfs->dfs_phyerr_w53_counter = 0; } - /* CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "IN FUNC %s[%d]: retval = %d ",__func__,__LINE__,retval); */ + /* CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "IN FUNC %s[%d]: retval = %d ",__func__,__LINE__,retval); */ return retval; /* #endif */ /* return 1; */ diff --git a/core/sap/inc/sap_api.h b/core/sap/inc/sap_api.h index b58fdd9370..9fa88e5d0c 100644 --- a/core/sap/inc/sap_api.h +++ b/core/sap/inc/sap_api.h @@ -42,7 +42,7 @@ * -------------------------------------------------------------------------*/ #include "cds_api.h" #include "cds_packet.h" -#include "cdf_types.h" +#include "qdf_types.h" #include "p2p_api.h" #include "sme_api.h" @@ -249,7 +249,7 @@ typedef struct sap_StopBssCompleteEvent_s { } tSap_StopBssCompleteEvent; typedef struct sap_StationAssocIndication_s { - struct cdf_mac_addr staMac; + struct qdf_mac_addr staMac; uint8_t assoId; uint8_t staId; uint8_t status; @@ -266,7 +266,7 @@ typedef struct sap_StationAssocIndication_s { } tSap_StationAssocIndication; typedef struct sap_StationAssocReassocCompleteEvent_s { - struct cdf_mac_addr staMac; + struct qdf_mac_addr staMac; uint8_t staId; uint8_t status; uint8_t ies[MAX_ASSOC_IND_IE_LEN]; @@ -286,7 +286,7 @@ typedef struct sap_StationAssocReassocCompleteEvent_s { } tSap_StationAssocReassocCompleteEvent; typedef struct sap_StationDisassocCompleteEvent_s { - struct cdf_mac_addr staMac; + struct qdf_mac_addr staMac; uint8_t staId; /* STAID should not be used */ uint8_t status; uint32_t statusCode; @@ -295,14 +295,14 @@ typedef struct sap_StationDisassocCompleteEvent_s { typedef struct sap_StationSetKeyCompleteEvent_s { uint8_t status; - struct cdf_mac_addr peerMacAddr; + struct qdf_mac_addr peerMacAddr; } tSap_StationSetKeyCompleteEvent; /*struct corresponding to SAP_STA_MIC_FAILURE_EVENT */ typedef struct sap_StationMICFailureEvent_s { - struct cdf_mac_addr srcMacAddr; /* address used to compute MIC */ - struct cdf_mac_addr staMac; /* taMacAddr transmitter address */ - struct cdf_mac_addr dstMacAddr; + struct qdf_mac_addr srcMacAddr; /* address used to compute MIC */ + struct qdf_mac_addr staMac; /* taMacAddr transmitter address */ + struct qdf_mac_addr dstMacAddr; eSapBool multicast; uint8_t IV1; /* first byte of IV */ uint8_t keyId; /* second byte of IV */ @@ -311,7 +311,7 @@ typedef struct sap_StationMICFailureEvent_s { } tSap_StationMICFailureEvent; /*Structure to return MAC address of associated stations */ typedef struct sap_AssocMacAddr_s { - struct cdf_mac_addr staMac; /* Associated station's MAC address */ + struct qdf_mac_addr staMac; /* Associated station's MAC address */ uint8_t assocId; /* Associated station's Association ID */ uint8_t staId; /* Allocated station Id */ uint8_t ShortGI40Mhz; @@ -323,7 +323,7 @@ typedef struct sap_AssocMacAddr_s { /*struct corresponding to SAP_ASSOC_STA_CALLBACK_EVENT */ typedef struct sap_AssocStaListEvent_s { - CDF_MODULE_ID module; + QDF_MODULE_ID module; /* module id that was passed in wlansap_get_assoc_stations API */ uint8_t noOfAssocSta; /* Number of associated stations */ tpSap_AssocMacAddr pAssocStas; @@ -336,16 +336,16 @@ typedef struct sap_AssocStaListEvent_s { typedef struct sap_GetWPSPBCSessionEvent_s { uint8_t status; /* module id that was passed in wlansap_get_assoc_stations API */ - CDF_MODULE_ID module; + QDF_MODULE_ID module; uint8_t UUID_E[16]; /* Unique identifier of the AP. */ - struct cdf_mac_addr addr; + struct qdf_mac_addr addr; eWPSPBCOverlap wpsPBCOverlap; } tSap_GetWPSPBCSessionEvent; typedef struct sap_WPSPBCProbeReqEvent_s { uint8_t status; /* module id that was passed in wlansap_get_assoc_stations API */ - CDF_MODULE_ID module; + QDF_MODULE_ID module; tSirWPSPBCProbeReq WPSPBCProbeReq; } tSap_WPSPBCProbeReqEvent; @@ -366,11 +366,11 @@ typedef struct sap_SendActionCnf_s { } tSap_SendActionCnf; typedef struct sap_UnknownSTAJoinEvent_s { - struct cdf_mac_addr macaddr; + struct qdf_mac_addr macaddr; } tSap_UnknownSTAJoinEvent; typedef struct sap_MaxAssocExceededEvent_s { - struct cdf_mac_addr macaddr; + struct qdf_mac_addr macaddr; } tSap_MaxAssocExceededEvent; typedef struct sap_DfsNolInfo_s { @@ -460,13 +460,13 @@ typedef struct sap_Event_s { typedef struct sap_SSID { uint8_t length; uint8_t ssId[MAX_SSID_LEN]; -} cdf_packed tSap_SSID_t; +} qdf_packed tSap_SSID_t; typedef struct sap_SSIDInfo { tSap_SSID_t ssid; /* SSID of the AP */ /* SSID should/shouldn't be bcast in probe RSP & beacon */ uint8_t ssidHidden; -} cdf_packed tSap_SSIDInfo_t; +} qdf_packed tSap_SSIDInfo_t; struct sap_acs_cfg { /* ACS Algo Input */ @@ -498,13 +498,13 @@ typedef struct sap_Config { tSap_SSIDInfo_t SSIDinfo; eCsrPhyMode SapHw_mode; /* Wireless Mode */ eSapMacAddrACL SapMacaddr_acl; - struct cdf_mac_addr accept_mac[MAX_ACL_MAC_ADDRESS]; /* MAC filtering */ + struct qdf_mac_addr accept_mac[MAX_ACL_MAC_ADDRESS]; /* MAC filtering */ bool ieee80211d; /* Specify if 11D is enabled or disabled */ bool protEnabled; /* Specify if protection is enabled or disabled */ /* Specify if OBSS protection is enabled or disabled */ bool obssProtEnabled; - struct cdf_mac_addr deny_mac[MAX_ACL_MAC_ADDRESS]; /* MAC filtering */ - struct cdf_mac_addr self_macaddr; /* self macaddress or BSSID */ + struct qdf_mac_addr deny_mac[MAX_ACL_MAC_ADDRESS]; /* MAC filtering */ + struct qdf_mac_addr self_macaddr; /* self macaddress or BSSID */ uint8_t channel; /* Operation channel */ uint8_t sec_ch; chan_params_t ch_params; @@ -532,7 +532,7 @@ typedef struct sap_Config { uint32_t ap_table_max_size; uint32_t ap_table_expiration_time; uint32_t ht_op_mode_fixed; - enum tCDF_ADAPTER_MODE persona; /* Tells us which persona, GO or AP */ + enum tQDF_ADAPTER_MODE persona; /* Tells us which persona, GO or AP */ uint8_t disableDFSChSwitch; bool enOverLapCh; #ifdef WLAN_FEATURE_11W @@ -663,7 +663,7 @@ typedef struct sSapDfsInfo { typedef struct tagSapCtxList { uint8_t sessionID; void *pSapContext; - enum tCDF_ADAPTER_MODE sapPersona; + enum tQDF_ADAPTER_MODE sapPersona; } tSapCtxList, tpSapCtxList; typedef struct tagSapStruct { @@ -831,18 +831,18 @@ QDF_STATUS wlansap_set_channel_change_with_csa(void *p_cds_gctx, QDF_STATUS wlansap_set_key_sta(void *p_cds_gctx, tCsrRoamSetKey *pSetKeyInfo); QDF_STATUS wlansap_get_assoc_stations(void *p_cds_gctx, - CDF_MODULE_ID module, tpSap_AssocMacAddr pAssocStas); + QDF_MODULE_ID module, tpSap_AssocMacAddr pAssocStas); QDF_STATUS wlansap_remove_wps_session_overlap(void *p_cds_gctx, - struct cdf_mac_addr pRemoveMac); + struct qdf_mac_addr pRemoveMac); QDF_STATUS wlansap_get_wps_session_overlap(void *p_cds_gctx); QDF_STATUS wlansap_set_counter_measure(void *p_cds_gctx, bool bEnable); QDF_STATUS wlan_sap_getstation_ie_information(void *p_cds_gctx, uint32_t *pLen, uint8_t *pBuf); QDF_STATUS wlansap_clear_acl(void *p_cds_gctx); QDF_STATUS wlansap_get_acl_accept_list(void *p_cds_gctx, - struct cdf_mac_addr *pAcceptList, uint8_t *nAcceptList); + struct qdf_mac_addr *pAcceptList, uint8_t *nAcceptList); QDF_STATUS wlansap_get_acl_deny_list(void *pCtx, - struct cdf_mac_addr *pDenyList, uint8_t *nDenyList); + struct qdf_mac_addr *pDenyList, uint8_t *nDenyList); QDF_STATUS wlansap_set_mode(void *p_cds_gctx, uint32_t mode); QDF_STATUS wlansap_get_acl_mode(void *p_cds_gctx, eSapMacAddrACL *mode); QDF_STATUS wlansap_modify_acl(void *p_cds_gctx, diff --git a/core/sap/src/sap_api_link_cntl.c b/core/sap/src/sap_api_link_cntl.c index 32977d9f6b..1273a6bd4d 100644 --- a/core/sap/src/sap_api_link_cntl.c +++ b/core/sap/src/sap_api_link_cntl.c @@ -108,12 +108,12 @@ QDF_STATUS wlansap_scan_callback(tHalHandle hal_handle, #endif if (NULL == hal_handle) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "In %s invalid hHal", __func__); return QDF_STATUS_E_FAILURE; } if (sap_ctx->sapsMachine == eSAP_DISCONNECTED) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_WARN, "In %s BSS already stopped", __func__); return QDF_STATUS_E_FAILURE; } @@ -121,7 +121,7 @@ QDF_STATUS wlansap_scan_callback(tHalHandle hal_handle, switch (scan_status) { case eCSR_SCAN_SUCCESS: /* sapScanCompleteCallback with eCSR_SCAN_SUCCESS */ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "In %s, CSR scanStatus = %s (%d)", __func__, "eCSR_SCAN_SUCCESS", scan_status); @@ -138,20 +138,20 @@ QDF_STATUS wlansap_scan_callback(tHalHandle hal_handle, if ((get_result_status != QDF_STATUS_SUCCESS) && (get_result_status != QDF_STATUS_E_NULL_VALUE)) { /* No scan results */ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "In %s, Get scan result failed! ret = %d", __func__, get_result_status); break; } #ifdef FEATURE_WLAN_AP_AP_ACS_OPTIMIZE if (scan_id != 0) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "%s: Sending ACS Scan skip event", __func__); sap_signal_hdd_event(sap_ctx, NULL, eSAP_ACS_SCAN_SUCCESS_EVENT, (void *) eSAP_STATUS_SUCCESS); } else - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "%s: ACS scan id: %d (skipped ACS SCAN)", __func__, scan_id); #endif @@ -162,7 +162,7 @@ QDF_STATUS wlansap_scan_callback(tHalHandle hal_handle, default: event = eSAP_CHANNEL_SELECTION_FAILED; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "In %s, CSR scanStatus = %s (%d)", __func__, "eCSR_SCAN_ABORT/FAILURE", scan_status); } @@ -170,7 +170,7 @@ QDF_STATUS wlansap_scan_callback(tHalHandle hal_handle, if (operChannel == SAP_CHANNEL_NOT_SELECTED) #ifdef SOFTAP_CHANNEL_RANGE { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "%s: No suitable channel selected due to DFS, LTE" "COEX and concurrent mode restrictions", __func__); @@ -199,7 +199,7 @@ QDF_STATUS wlansap_scan_callback(tHalHandle hal_handle, } #endif - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "In %s, Channel selected = %d", __func__, sap_ctx->channel); @@ -276,7 +276,7 @@ static QDF_STATUS sap_hdd_signal_event_handler(void *ctx) ptSapContext sap_ctx = (struct sSapContext *)ctx; QDF_STATUS status; if (NULL == sap_ctx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("sap context is not valid")); return QDF_STATUS_E_FAILURE; } @@ -313,7 +313,7 @@ wlansap_pre_start_bss_acs_scan_callback(tHalHandle hal_handle, void *pcontext, QDF_STATUS status = QDF_STATUS_E_FAILURE; if (eCSR_SCAN_SUCCESS != scan_status) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("CSR scan_status = eCSR_SCAN_ABORT/FAILURE (%d), choose default channel"), scan_status); #ifdef SOFTAP_CHANNEL_RANGE @@ -328,7 +328,7 @@ wlansap_pre_start_bss_acs_scan_callback(tHalHandle hal_handle, void *pcontext, sap_ctx->sap_status = eSAP_STATUS_SUCCESS; goto close_session; } - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("CSR scan_status = eCSR_SCAN_SUCCESS (%d)"), scan_status); /* * Now do @@ -346,19 +346,19 @@ wlansap_pre_start_bss_acs_scan_callback(tHalHandle hal_handle, void *pcontext, * to allow the default channel to be set when reporting to HDD */ oper_channel = SAP_CHANNEL_NOT_SELECTED; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("Get scan result failed! ret = %d"), scan_get_result_status); } else { #ifdef FEATURE_WLAN_AP_AP_ACS_OPTIMIZE if (scanid != 0) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("Sending ACS Scan skip event")); sap_signal_hdd_event(sap_ctx, NULL, eSAP_ACS_SCAN_SUCCESS_EVENT, (void *) eSAP_STATUS_SUCCESS); } else { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("ACS scanid: %d (skipped ACS SCAN)"), scanid); } @@ -369,7 +369,7 @@ wlansap_pre_start_bss_acs_scan_callback(tHalHandle hal_handle, void *pcontext, if (oper_channel == SAP_CHANNEL_NOT_SELECTED) { #ifdef SOFTAP_CHANNEL_RANGE - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, FL("No suitable channel selected")); sap_ctx->sap_state = eSAP_ACS_CHANNEL_SELECTED; @@ -398,7 +398,7 @@ wlansap_pre_start_bss_acs_scan_callback(tHalHandle hal_handle, void *pcontext, sap_ctx->channelList = NULL; } #endif - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("Channel selected = %d"), sap_ctx->channel); sap_ctx->sap_state = eSAP_ACS_CHANNEL_SELECTED; sap_ctx->sap_status = eSAP_STATUS_SUCCESS; @@ -407,7 +407,7 @@ close_session: sap_ctx->sessionId, sap_hdd_signal_event_handler, sap_ctx); if (QDF_STATUS_SUCCESS != status) - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("CloseSession failed")); else sap_ctx->isScanSessionOpen = eSAP_FALSE; @@ -438,7 +438,7 @@ wlansap_roam_process_ch_change_success(tpAniSirGlobal mac_ctx, * Channel change is successful. If the new channel is a DFS channel, * then we will to perform channel availability check for 60 seconds */ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, FL("sapdfs: changing target channel to [%d]"), mac_ctx->sap.SapDfsInfo.target_channel); sap_ctx->channel = mac_ctx->sap.SapDfsInfo.target_channel; @@ -452,7 +452,7 @@ wlansap_roam_process_ch_change_success(tpAniSirGlobal mac_ctx, && (eSAP_DFS_DO_NOT_SKIP_CAC == mac_ctx->sap.SapDfsInfo.cac_state)) { sap_ctx->sapsMachine = eSAP_DISCONNECTED; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, FL("sapdfs: from state eSAP_DISCONNECTING => DISCONNECTED with ignore cac false on sapctx[%p]"), sap_ctx); /* DFS Channel */ @@ -461,7 +461,7 @@ wlansap_roam_process_ch_change_success(tpAniSirGlobal mac_ctx, sap_event.u1 = 0; sap_event.u2 = 0; } else { - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, FL("sapdfs: from state eSAP_DISCONNECTING => eSAP_STARTING with ignore cac true on sapctx[%p]"), sap_ctx); @@ -476,7 +476,7 @@ wlansap_roam_process_ch_change_success(tpAniSirGlobal mac_ctx, sap_event.u2 = eCSR_ROAM_RESULT_INFRA_STARTED; } } else { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, FL("sapdfs: from state eSAP_DISCONNECTING => eSAP_STARTING on sapctx[%p]"), sap_ctx); /* non-DFS channel */ @@ -517,7 +517,7 @@ wlansap_roam_process_dfs_chansw_update_fail(tHalHandle hHal, uint8_t dfs_beacon_start_req = 0; if (sap_ctx->csr_roamProfile.disableDFSChSwitch) { - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("sapdfs: DFS channel switch disabled")); /* @@ -537,14 +537,14 @@ wlansap_roam_process_dfs_chansw_update_fail(tHalHandle hHal, */ if (eSAP_STARTED != sap_ctx->sapsMachine) { /* Further actions to be taken here */ - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_WARN, FL("eCSR_ROAM_RESULT_DFS_RADAR_FOUND_IND received in (%d) state\n"), sap_ctx->sapsMachine); return; } - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, FL("sapdfs: from state eSAP_STARTED => eSAP_DISCONNECTING")); /* SAP to be moved to DISCONNECTING state */ sap_ctx->sapsMachine = eSAP_DISCONNECTING; @@ -576,7 +576,7 @@ wlansap_roam_process_dfs_chansw_update_fail(tHalHandle hHal, sap_event.params = 0; sap_event.u1 = 0; sap_event.u2 = 0; - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, FL("sapdfs: Posting event eWNI_SME_CHANNEL_CHANGE_REQ to sapFSM")); /* Handle event */ @@ -596,7 +596,7 @@ wlansap_roam_process_dfs_chansw_update_fail(tHalHandle hHal, */ if (false == is_concurrent_sap_ready_for_channel_change(hHal, sap_ctx)) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, FL("sapdfs: sapctx[%p] ready but not concurrent sap"), sap_ctx); *ret_status = QDF_STATUS_SUCCESS; @@ -606,12 +606,12 @@ wlansap_roam_process_dfs_chansw_update_fail(tHalHandle hHal, /* Issue channel change req for each sapctx */ for (intf = 0; intf < SAP_MAX_NUM_SESSION; intf++) { ptSapContext pSapContext; - if (!((CDF_SAP_MODE == mac_ctx->sap.sapCtxList[intf].sapPersona) + if (!((QDF_SAP_MODE == mac_ctx->sap.sapCtxList[intf].sapPersona) && (mac_ctx->sap.sapCtxList[intf].pSapContext != NULL))) continue; pSapContext = mac_ctx->sap.sapCtxList[intf].pSapContext; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, FL("sapdfs:issue chnl change for sapctx[%p]"), pSapContext); /* Send channel switch request */ @@ -622,7 +622,7 @@ wlansap_roam_process_dfs_chansw_update_fail(tHalHandle hHal, /* Handle event */ qdf_status = sap_fsm(pSapContext, &sap_event); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("post chnl chng req failed, sap[%p]"), sap_ctx); *ret_status = QDF_STATUS_E_FAILURE; @@ -652,14 +652,14 @@ wlansap_roam_process_dfs_radar_found(tpAniSirGlobal mac_ctx, tWLAN_SAPEvent sap_event; if (eSAP_DFS_CAC_WAIT == sap_ctx->sapsMachine) { if (sap_ctx->csr_roamProfile.disableDFSChSwitch) { - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "sapdfs: DFS channel switch disabled"); return; } if (false == mac_ctx->sap.SapDfsInfo.sap_radar_found_status) return; - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, FL("sapdfs:Posting event eSAP_DFS_CHANNEL_CAC_RADAR_FOUND")); /* @@ -679,7 +679,7 @@ wlansap_roam_process_dfs_radar_found(tpAniSirGlobal mac_ctx, eSAP_DFS_CAC_INTERRUPTED, (void *) eSAP_STATUS_SUCCESS); if (QDF_STATUS_SUCCESS != qdf_status) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("Failed to send CAC end")); /* Want to still proceed and try to switch channel. * Lets try not to be on the DFS channel @@ -697,7 +697,7 @@ wlansap_roam_process_dfs_radar_found(tpAniSirGlobal mac_ctx, return; } if (eSAP_STARTED == sap_ctx->sapsMachine) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, FL("sapdfs:Posting event eSAP_DFS_CHNL_SWITCH_ANNOUNCEMENT_START")); /* @@ -715,7 +715,7 @@ wlansap_roam_process_dfs_radar_found(tpAniSirGlobal mac_ctx, return; } /* Further actions to be taken here */ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("eCSR_ROAM_RESULT_DFS_RADAR_FOUND_IND received in (%d) state\n"), sap_ctx->sapsMachine); @@ -740,7 +740,7 @@ wlansap_roam_process_infra_assoc_ind(ptSapContext sap_ctx, QDF_STATUS *ret_status) { QDF_STATUS qdf_status; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("CSR roam_result = eCSR_ROAM_RESULT_INFRA_ASSOCIATION_IND (%d)\n"), roam_result); sap_ctx->nStaWPARSnReqIeLength = csr_roam_info->rsnIELen; @@ -767,14 +767,14 @@ wlansap_roam_process_infra_assoc_ind(ptSapContext sap_ctx, csr_roam_info, eSAP_STA_ASSOC_IND, (void *) eSAP_STATUS_SUCCESS); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("CSR roam_result = (%d) MAC ("MAC_ADDRESS_STR") fail"), roam_result, MAC_ADDR_ARRAY( csr_roam_info->peerMac.bytes)); *ret_status = QDF_STATUS_E_FAILURE; } } else { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_WARN, FL("CSR roam_result = (%d) MAC ("MAC_ADDRESS_STR") not allowed"), roam_result, MAC_ADDR_ARRAY(csr_roam_info->peerMac.bytes)); @@ -812,18 +812,18 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, uint8_t intf; if (NULL == hal) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("Invalid hal")); cdf_ret_status = QDF_STATUS_E_NOMEM; return cdf_ret_status; } mac_ctx = PMAC_STRUCT(hal); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("Before switch on roam_status = %d\n"), roam_status); switch (roam_status) { case eCSR_ROAM_SESSION_OPENED: - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("Calling sme_roam_connect with eCSR_BSS_TYPE_INFRA_AP")); sap_ctx->isSapSessionOpen = eSAP_TRUE; cdf_ret_status = sme_roam_connect(hal, sap_ctx->sessionId, @@ -831,7 +831,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, &sap_ctx->csr_roamId); break; case eCSR_ROAM_INFRA_IND: - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("CSR roam_status = eCSR_ROAM_INFRA_IND (%d)\n"), roam_status); if (roam_result == eCSR_ROAM_RESULT_INFRA_START_FAILED) { @@ -847,17 +847,17 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, } break; case eCSR_ROAM_LOSTLINK: - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("CSR roam_status = eCSR_ROAM_LOSTLINK (%d)\n"), roam_status); break; case eCSR_ROAM_MIC_ERROR_IND: - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("CSR roam_status = eCSR_ROAM_MIC_ERROR_IND (%d)\n"), roam_status); break; case eCSR_ROAM_SET_KEY_COMPLETE: - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("CSR roam_status = eCSR_ROAM_SET_KEY_COMPLETE (%d)\n"), roam_status); if (roam_result == eCSR_ROAM_RESULT_FAILURE) @@ -866,7 +866,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, (void *) eSAP_STATUS_FAILURE); break; case eCSR_ROAM_ASSOCIATION_COMPLETION: - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("CSR roam_status = eCSR_ROAM_ASSOCIATION_COMPLETION (%d)\n"), roam_status); if (roam_result == eCSR_ROAM_RESULT_FAILURE) @@ -875,7 +875,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, (void *) eSAP_STATUS_FAILURE); break; case eCSR_ROAM_DISASSOCIATED: - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("CSR roam_status = eCSR_ROAM_DISASSOCIATED (%d)\n"), roam_status); if (roam_result == eCSR_ROAM_RESULT_MIC_FAILURE) @@ -884,7 +884,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, (void *) eSAP_STATUS_FAILURE); break; case eCSR_ROAM_WPS_PBC_PROBE_REQ_IND: - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("CSR roam_status = eCSR_ROAM_WPS_PBC_PROBE_REQ_IND (%d)\n"), roam_status); break; @@ -908,16 +908,16 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, (void *) eSAP_STATUS_SUCCESS); break; case eCSR_ROAM_SEND_P2P_STOP_BSS: - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("Received stopbss")); sap_signal_hdd_event(sap_ctx, csr_roam_info, eSAP_MAC_TRIG_STOP_BSS_EVENT, (void *) eSAP_STATUS_SUCCESS); break; case eCSR_ROAM_DFS_RADAR_IND: - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("Received Radar Indication")); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, FL("sapdfs: Indicate eSAP_DFS_RADAR_DETECT to HDD")); sap_signal_hdd_event(sap_ctx, NULL, eSAP_DFS_RADAR_DETECT, (void *) eSAP_STATUS_SUCCESS); @@ -945,15 +945,15 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, /* Issue stopbss for each sapctx */ for (intf = 0; intf < SAP_MAX_NUM_SESSION; intf++) { ptSapContext pSapContext; - if (((CDF_SAP_MODE == + if (((QDF_SAP_MODE == mac_ctx->sap.sapCtxList[intf].sapPersona) || - (CDF_P2P_GO_MODE == + (QDF_P2P_GO_MODE == mac_ctx->sap.sapCtxList[intf].sapPersona)) && mac_ctx->sap.sapCtxList[intf].pSapContext != NULL) { pSapContext = mac_ctx->sap.sapCtxList[intf].pSapContext; - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("sapdfs: no available channel for sapctx[%p], StopBss"), pSapContext); @@ -962,26 +962,26 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, } break; case eCSR_ROAM_DFS_CHAN_SW_NOTIFY: - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("Received Chan Sw Update Notification")); break; case eCSR_ROAM_SET_CHANNEL_RSP: - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("Received set channel response")); break; case eCSR_ROAM_EXT_CHG_CHNL_IND: - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("Received set channel Indication")); break; default: - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("CSR roam_status not handled roam_status = %s (%d)\n"), get_e_roam_cmd_status_str(roam_status), roam_status); break; } - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("Before switch on roam_result = %d\n"), roam_result); switch (roam_result) { @@ -990,7 +990,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, csr_roam_info, &cdf_ret_status); break; case eCSR_ROAM_RESULT_INFRA_ASSOCIATION_CNF: - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("CSR roam_result = eCSR_ROAM_RESULT_INFRA_ASSOCIATION_CNF (%d)\n"), roam_result); sap_ctx->nStaWPARSnReqIeLength = csr_roam_info->rsnIELen; @@ -1015,7 +1015,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, cdf_ret_status = QDF_STATUS_E_FAILURE; break; case eCSR_ROAM_RESULT_DISASSOC_IND: - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("CSR roam_result = eCSR_ROAM_RESULT_DISASSOC_IND (%d)\n"), roam_result); /* Fill in the event structure */ @@ -1026,7 +1026,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, cdf_ret_status = QDF_STATUS_E_FAILURE; break; case eCSR_ROAM_RESULT_DEAUTH_IND: - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("CSR roam_result = eCSR_ROAM_RESULT_DEAUTH_IND (%d)\n"), roam_result); /* @@ -1041,7 +1041,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, cdf_ret_status = QDF_STATUS_E_FAILURE; break; case eCSR_ROAM_RESULT_MIC_ERROR_GROUP: - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("CSR roam_result = eCSR_ROAM_RESULT_MIC_ERROR_GROUP (%d)\n"), roam_result); /* @@ -1055,7 +1055,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, cdf_ret_status = QDF_STATUS_E_FAILURE; break; case eCSR_ROAM_RESULT_MIC_ERROR_UNICAST: - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("CSR roam_result = eCSR_ROAM_RESULT_MIC_ERROR_UNICAST (%d)\n"), roam_result); /* @@ -1071,7 +1071,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, } break; case eCSR_ROAM_RESULT_AUTHENTICATED: - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("CSR roam_result = eCSR_ROAM_RESULT_AUTHENTICATED (%d)\n"), roam_result); /* Fill in the event structure */ @@ -1082,7 +1082,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, cdf_ret_status = QDF_STATUS_E_FAILURE; break; case eCSR_ROAM_RESULT_ASSOCIATED: - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("CSR roam_result = eCSR_ROAM_RESULT_ASSOCIATED (%d)\n"), roam_result); /* Fill in the event structure */ @@ -1091,7 +1091,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, (void *) eSAP_STATUS_SUCCESS); break; case eCSR_ROAM_RESULT_INFRA_STARTED: - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("CSR roam_result = eCSR_ROAM_RESULT_INFRA_STARTED (%d)\n"), roam_result); /* @@ -1109,7 +1109,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, cdf_ret_status = QDF_STATUS_E_FAILURE; break; case eCSR_ROAM_RESULT_INFRA_STOPPED: - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("CSR roam_result = eCSR_ROAM_RESULT_INFRA_STOPPED (%d)\n"), roam_result); /* Fill in the event structure */ @@ -1123,7 +1123,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, cdf_ret_status = QDF_STATUS_E_FAILURE; break; case eCSR_ROAM_RESULT_WPS_PBC_PROBE_REQ_IND: - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("CSR roam_result = eCSR_ROAM_RESULT_WPS_PBC_PROBE_REQ_IND (%d)\n"), roam_result); /* @@ -1137,7 +1137,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, cdf_ret_status = QDF_STATUS_E_FAILURE; break; case eCSR_ROAM_RESULT_FORCED: - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("CSR roam_result = eCSR_ROAM_RESULT_FORCED (%d)\n"), roam_result); /* @@ -1150,7 +1150,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, (void *) eSAP_STATUS_SUCCESS); break; case eCSR_ROAM_RESULT_NONE: - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("CSR roam_result = eCSR_ROAM_RESULT_NONE (%d)\n"), roam_result); /* @@ -1164,7 +1164,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, (void *) eSAP_STATUS_SUCCESS); break; case eCSR_ROAM_RESULT_MAX_ASSOC_EXCEEDED: - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("CSR roam_result = eCSR_ROAM_RESULT_MAX_ASSOC_EXCEEDED (%d)\n"), roam_result); /* Fill in the event structure */ @@ -1204,7 +1204,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, cdf_ret_status = QDF_STATUS_E_FAILURE; break; default: - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("CSR roam_result = %s (%d) not handled\n"), get_e_csr_roam_result_str(roam_result), roam_result); diff --git a/core/sap/src/sap_ch_select.c b/core/sap/src/sap_ch_select.c index 4ed3b36363..8bad430890 100644 --- a/core/sap/src/sap_ch_select.c +++ b/core/sap/src/sap_ch_select.c @@ -27,7 +27,7 @@ /*=========================================================================== - s a p C h S e l e c t . C + s a p C h S e l e c t . C OVERVIEW: This software unit holds the implementation of the WLAN SAP modules @@ -358,7 +358,7 @@ void sap_process_avoid_ie(tHalHandle hal, continue; sap_ctx->sap_detected_avoid_ch_ie.present = 1; - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_DEBUG, "Q2Q IE - avoid ch %d", avoid_ch_ie->channel); @@ -425,7 +425,7 @@ void sap_update_unsafe_channel_list(ptSapContext pSapCtx) if (pSapCtx->dfs_ch_disable == true) { if (CDS_IS_DFS_CH(safe_channels[i].channelNumber)) { safe_channels[i].isSafe = false; - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "%s: DFS Ch %d is not safe in" " Concurrent mode", @@ -446,7 +446,7 @@ void sap_update_unsafe_channel_list(ptSapContext pSapCtx) unsafe_channel_list[i]) { /* Found unsafe channel, update it */ safe_channels[j].isSafe = false; - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("CH %d is not safe"), unsafe_channel_list[i]); @@ -460,7 +460,7 @@ void sap_update_unsafe_channel_list(ptSapContext pSapCtx) #else void sap_update_unsafe_channel_list(ptSapContext pSapCtx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Not implemented", __func__); return; } @@ -490,18 +490,18 @@ void sap_cleanup_channel_list(void *p_cds_gctx) { ptSapContext pSapCtx; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "Cleaning up the channel list structure"); if (NULL == p_cds_gctx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_FATAL, "SAP Global Context is NULL"); return; } pSapCtx = CDS_GET_SAP_CB(p_cds_gctx); if (NULL == pSapCtx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_FATAL, "SAP Context is NULL"); return; } @@ -552,7 +552,7 @@ uint8_t sap_select_preferred_channel_from_channel_list(uint8_t best_chnl, /* Select the best channel from allowed list */ for (i = 0; i < sap_ctx->acs_cfg->ch_list_count; i++) { if (sap_ctx->acs_cfg->ch_list[i] == best_chnl) { - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "Best channel is: %d", best_chnl); @@ -568,7 +568,7 @@ uint8_t sap_select_preferred_channel_from_channel_list(uint8_t best_chnl, DESCRIPTION Function sap_chan_sel_init allocates the memory, intializes the - structures used by the channel selection algorithm + structures used by the channel selection algorithm DEPENDENCIES NA. @@ -599,7 +599,7 @@ bool sap_chan_sel_init(tHalHandle halHandle, uint32_t dfs_master_cap_enabled; bool include_dfs_ch = true; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "In %s", + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "In %s", __func__); pSpectInfoParams->numSpectChans = @@ -611,7 +611,7 @@ bool sap_chan_sel_init(tHalHandle halHandle, * sizeof(*pSpectCh)); if (pSpectCh == NULL) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "In %s, CDF_MALLOC_ERR", __func__); return eSAP_FALSE; } @@ -642,7 +642,7 @@ bool sap_chan_sel_init(tHalHandle halHandle, /* check if the channel is in NOL blacklist */ if (sap_dfs_is_channel_in_nol_list(pSapCtx, *pChans, PHY_SINGLE_CHANNEL_CENTERED)) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "In %s, Ch %d is in NOL list", __func__, *pChans); chSafe = false; @@ -652,7 +652,7 @@ bool sap_chan_sel_init(tHalHandle halHandle, if (include_dfs_ch == false) { if (CDS_IS_DFS_CH(*pChans)) { chSafe = false; - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "In %s, DFS Ch %d not considered for ACS", __func__, *pChans); @@ -664,7 +664,7 @@ bool sap_chan_sel_init(tHalHandle halHandle, for (i = 0; i < NUM_20MHZ_RF_CHANNELS; i++) { if ((safe_channels[i].channelNumber == *pChans) && (false == safe_channels[i].isSafe)) { - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "In %s, Ch %d is not safe", __func__, *pChans); @@ -695,7 +695,7 @@ bool sap_chan_sel_init(tHalHandle halHandle, DESCRIPTION Function weightRssiCount calculates the channel weight due to rssi - and data count(here number of BSS observed) + and data count(here number of BSS observed) DEPENDENCIES NA. @@ -735,7 +735,7 @@ uint32_t sapweight_rssi_count(int8_t rssi, uint16_t count) rssicountWeight = rssiWeight + countWeight; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "In %s, rssiWeight=%d, countWeight=%d, rssicountWeight=%d", __func__, rssiWeight, countWeight, rssicountWeight); @@ -837,7 +837,7 @@ void sap_upd_chan_spec_params(tSirProbeRespBeacon *pBeaconStruct, uint16_t *centerFreq_2) { if (NULL == pBeaconStruct) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("pBeaconStruct is NULL")); return; } @@ -924,7 +924,7 @@ void sap_interference_rssi_count_5G(tSapSpectChInfo *spect_ch, uint16_t num_ch; int32_t offset = 0; if (NULL == spect_ch) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("spect_ch is NULL")); return; } @@ -1006,7 +1006,7 @@ void sap_interference_rssi_count_5G(tSapSpectChInfo *spect_ch, void sap_interference_rssi_count(tSapSpectChInfo *spect_ch) { if (NULL == spect_ch) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: spect_ch is NULL", __func__); return; } @@ -1170,11 +1170,11 @@ void sap_compute_spect_weight(tSapChSelSpectInfo *pSpectInfoParams, pBeaconStruct = cdf_mem_malloc(sizeof(tSirProbeRespBeacon)); if (NULL == pBeaconStruct) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "Unable to allocate memory in sap_compute_spect_weight\n"); return; } - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "In %s, Computing spectral weight", __func__); /** @@ -1262,7 +1262,7 @@ void sap_compute_spect_weight(tSapChSelSpectInfo *pSpectInfoParams, break; } - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "In %s, bssdes.ch_self=%d, bssdes.ch_ID=%d, bssdes.rssi=%d, SpectCh.bssCount=%d, pScanResult=%p, ChannelWidth %d, secondaryChanOffset %d, center frequency %d \n", __func__, @@ -1286,7 +1286,7 @@ void sap_compute_spect_weight(tSapChSelSpectInfo *pSpectInfoParams, /* Calculate the weights for all channels in the spectrum pSpectCh */ pSpectCh = pSpectInfoParams->pSpectCh; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "In %s, Spectrum Channels Weight", __func__); for (chn_num = 0; chn_num < (pSpectInfoParams->numSpectChans); @@ -1308,7 +1308,7 @@ void sap_compute_spect_weight(tSapChSelSpectInfo *pSpectInfoParams, pSpectCh->weight_copy = pSpectCh->weight; /* ------ Debug Info ------ */ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "In %s, Chan=%d Weight= %d rssiAgr=%d bssCount=%d", __func__, pSpectCh->chNum, pSpectCh->weight, pSpectCh->rssiAgr, pSpectCh->bssCount); @@ -1480,7 +1480,7 @@ void sap_sort_chl_weight_ht80(tSapChSelSpectInfo *pSpectInfoParams) pSpectInfo = pSpectInfoParams->pSpectCh; for (j = 0; j < (pSpectInfoParams->numSpectChans); j++) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("Channel=%d Weight= %d rssi=%d bssCount=%d"), pSpectInfo->chNum, pSpectInfo->weight, pSpectInfo->rssiAgr, pSpectInfo->bssCount); @@ -1617,7 +1617,7 @@ void sap_sort_chl_weight_vht160(tSapChSelSpectInfo *pSpectInfoParams) pSpectInfo = pSpectInfoParams->pSpectCh; for (j = 0; j < (pSpectInfoParams->numSpectChans); j++) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("Channel=%d Weight= %d rssi=%d bssCount=%d"), pSpectInfo->chNum, pSpectInfo->weight, pSpectInfo->rssiAgr, pSpectInfo->bssCount); @@ -1794,7 +1794,7 @@ void sap_sort_chl_weight_ht40_5_g(tSapChSelSpectInfo *pSpectInfoParams) pSpectInfo = pSpectInfoParams->pSpectCh; for (j = 0; j < (pSpectInfoParams->numSpectChans); j++) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "In %s, Channel=%d Weight= %d rssi=%d bssCount=%d", __func__, pSpectInfo->chNum, pSpectInfo->weight, pSpectInfo->rssiAgr, pSpectInfo->bssCount); @@ -1885,11 +1885,11 @@ void sap_sort_chl_weight_all(ptSapContext pSapCtx, #endif /* For testing */ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "In %s, Sorted Spectrum Channels Weight", __func__); pSpectCh = pSpectInfoParams->pSpectCh; for (j = 0; j < (pSpectInfoParams->numSpectChans); j++) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "In %s, Channel=%d Weight= %d rssi=%d bssCount=%d", __func__, pSpectCh->chNum, pSpectCh->weight, pSpectCh->rssiAgr, pSpectCh->bssCount); @@ -1969,7 +1969,7 @@ uint8_t sap_select_channel(tHalHandle halHandle, ptSapContext pSapCtx, uint32_t tmpChNum; uint8_t count; #endif - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "In %s, Running SAP Ch Select", __func__); #ifdef FEATURE_WLAN_CH_AVOID @@ -1977,7 +1977,7 @@ uint8_t sap_select_channel(tHalHandle halHandle, ptSapContext pSapCtx, #endif if (NULL == pScanResult) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "%s: No external AP present\n", __func__); #ifndef SOFTAP_CHANNEL_RANGE @@ -1987,7 +1987,7 @@ uint8_t sap_select_channel(tHalHandle halHandle, ptSapContext pSapCtx, endChannelNum = pSapCtx->acs_cfg->end_ch; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "%s: start - end: %d - %d\n", __func__, startChannelNum, endChannelNum); @@ -2025,7 +2025,7 @@ uint8_t sap_select_channel(tHalHandle halHandle, ptSapContext pSapCtx, continue; if (safe_channels[i].isSafe == true) { - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "%s: channel %d in the configuration is safe\n", __func__, @@ -2036,7 +2036,7 @@ uint8_t sap_select_channel(tHalHandle halHandle, ptSapContext pSapCtx, break; } - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "%s: channel %d in the configuration is unsafe\n", __func__, @@ -2052,7 +2052,7 @@ uint8_t sap_select_channel(tHalHandle halHandle, ptSapContext pSapCtx, /* Initialize the structure pointed by pSpectInfoParams */ if (sap_chan_sel_init(halHandle, pSpectInfoParams, pSapCtx) != eSAP_TRUE) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "In %s, Ch Select initialization failed", __func__); return SAP_CHANNEL_NOT_SELECTED; } @@ -2171,7 +2171,7 @@ uint8_t sap_select_channel(tHalHandle halHandle, ptSapContext pSapCtx, continue; #endif bestChNum = pSpectInfoParams->pSpectCh[count].chNum; - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "change best channel to %d in PCL", bestChNum); @@ -2218,7 +2218,7 @@ uint8_t sap_select_channel(tHalHandle halHandle, ptSapContext pSapCtx, /* Free all the allocated memory */ sap_chan_sel_exit(pSpectInfoParams); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "In %s, Running SAP Ch select Completed, Ch=%d", __func__, bestChNum); if (bestChNum > 0 && bestChNum <= 252) diff --git a/core/sap/src/sap_fsm.c b/core/sap/src/sap_fsm.c index 621169cdf7..1ee1211800 100644 --- a/core/sap/src/sap_fsm.c +++ b/core/sap/src/sap_fsm.c @@ -903,22 +903,22 @@ sap_find_target_channel_in_channel_matrix(ptSapContext sapContext, case CH_WIDTH_20MHZ: /* HT20 */ pchan_matrix = ht20_chan; - nchan_matrix = CDF_ARRAY_SIZE(ht20_chan); + nchan_matrix = QDF_ARRAY_SIZE(ht20_chan); break; case CH_WIDTH_40MHZ: /* HT40 */ pchan_matrix = ht40_chan; - nchan_matrix = CDF_ARRAY_SIZE(ht40_chan); + nchan_matrix = QDF_ARRAY_SIZE(ht40_chan); break; case CH_WIDTH_80MHZ: /* HT80 */ pchan_matrix = ht80_chan; - nchan_matrix = CDF_ARRAY_SIZE(ht80_chan); + nchan_matrix = QDF_ARRAY_SIZE(ht80_chan); break; default: /* handle exception and fall back to HT20 table */ pchan_matrix = ht20_chan; - nchan_matrix = CDF_ARRAY_SIZE(ht20_chan); + nchan_matrix = QDF_ARRAY_SIZE(ht20_chan); break; } @@ -976,7 +976,7 @@ sap_mark_channels_leaking_into_nol(ptSapContext sap_ctx, /* not present in NOL */ continue; } - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_DEBUG, FL("sapdfs: processing NOL channel: %d"), dfs_nol_channel); if (false == sap_find_target_channel_in_channel_matrix( @@ -986,7 +986,7 @@ sap_mark_channels_leaking_into_nol(ptSapContext sap_ctx, * should never happen, we should always find a table * here, if we don't, need a fix here! */ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("Couldn't find target channel matrix!")); CDF_ASSERT(0); return QDF_STATUS_E_FAILURE; @@ -1016,7 +1016,7 @@ sap_mark_channels_leaking_into_nol(ptSapContext sap_ctx, * bad leakage in NOL channel, * remove from temp list */ - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, FL("sapdfs: channel: %d will have bad leakage due to channel: %d\n"), dfs_nol_channel, temp_ch_lst[j]); @@ -1051,7 +1051,7 @@ static void sap_set_bitmap(chan_bonding_bitmap *pBitmap, uint8_t channel) return; } } - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("Channel=%d is not in the bitmap"), channel); } @@ -1106,7 +1106,7 @@ static uint8_t sap_populate_available_channels(chan_bonding_bitmap *bitmap, } break; default: - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("Invalid case.")); break; } @@ -1136,7 +1136,7 @@ bool sap_dfs_is_w53_invalid(tHalHandle hHal, uint8_t channelID) pMac = PMAC_STRUCT(hHal); if (NULL == pMac) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("invalid pMac")); return false; } @@ -1174,14 +1174,14 @@ bool sap_dfs_is_channel_in_preferred_location(tHalHandle hHal, uint8_t channelID pMac = PMAC_STRUCT(hHal); if (NULL == pMac) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("invalid pMac")); return true; } if ((SAP_CHAN_PREFERRED_INDOOR == pMac->sap.SapDfsInfo.sap_operating_chan_preferred_location) && (true == IS_CHAN_JAPAN_OUTDOOR(channelID))) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, FL ("CHAN=%d is Outdoor so invalid,preferred Indoor only"), channelID); @@ -1189,7 +1189,7 @@ bool sap_dfs_is_channel_in_preferred_location(tHalHandle hHal, uint8_t channelID } else if ((SAP_CHAN_PREFERRED_OUTDOOR == pMac->sap.SapDfsInfo.sap_operating_chan_preferred_location) && (true == IS_CHAN_JAPAN_INDOOR(channelID))) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, FL ("CHAN=%d is Indoor so invalid,preferred Outdoor only"), channelID); @@ -1251,14 +1251,14 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext) uint8_t dfs_region; if (NULL == hHal) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("invalid hHal")); return target_channel; } pMac = PMAC_STRUCT(hHal); if (NULL == pMac) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("invalid pMac")); return target_channel; } @@ -1277,7 +1277,7 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext) } if (sap_get5_g_hz_channel_list(sapContext)) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, FL("Getting 5Ghz channel list failed")); return target_channel; } @@ -1315,7 +1315,7 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext) * Check for JAPAN W53 Channel operation capability */ if (true == sap_dfs_is_w53_invalid(hHal, channelID)) { - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, FL ("index:%d, Channel=%d Invalid,Japan W53 Disabled"), @@ -1336,7 +1336,7 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext) if (false == sap_dfs_is_channel_in_preferred_location(hHal, channelID)) { - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, FL ("CHAN=%d is invalid,preferred Channel Location %d Only"), @@ -1361,7 +1361,7 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext) * Mark this channel invalid since it is still * in DFS Non-Occupancy-Period which is 30 mins. */ - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, FL ("index: %d, Channel = %d Present in NOL LIST"), @@ -1378,7 +1378,7 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext) if (pMac->sap.sap_channel_avoidance && sapContext->sap_detected_avoid_ch_ie.present) { if (sap_check_in_avoid_ch_list(sapContext, channelID)) { - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, FL("index: %d, Channel = %d, avoided due to presence of another AP+AP MCC device in same channel."), i, channelID); @@ -1395,7 +1395,7 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext) * mark this channel invalid since it is out of ACS * channel range */ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, FL ("index: %d, Channel = %d out of ACS channel range"), i, channelID); @@ -1408,7 +1408,7 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext) /* valid_chnl_count now have number of valid channels */ tmp_ch_lst = cdf_mem_malloc(valid_chnl_count); if (tmp_ch_lst == NULL) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("sapdfs: memory alloc failed")); return target_channel; } @@ -1422,7 +1422,7 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext) /* prepare temp list of just the valid channels */ for (i = 0; i < sapContext->SapAllChnlList.numChannel; i++) { if (sapContext->SapAllChnlList.channelList[i].valid) { - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL ("sapdfs: Adding Channel = %d to temp List"), @@ -1434,7 +1434,7 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext) } #ifdef WLAN_ENABLE_CHNL_MATRIX_RESTRICTION - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL ("sapdfs: Processing temp channel list against NOL.") @@ -1458,7 +1458,7 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext) channelBitmap.chanBondingSet[3].startChannel = 132; channelBitmap.chanBondingSet[4].startChannel = 149; /* now loop through whatever is left of channel list */ - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("sapdfs: Moving temp channel list to final.")); for (i = 0; i < valid_chnl_count; i++) { @@ -1467,7 +1467,7 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext) * channel list (in case of 20MHz width) */ if (tmp_ch_lst[i] != 0) { - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_DEBUG, FL("sapdfs: processing channel: %d "), tmp_ch_lst[i]); @@ -1476,7 +1476,7 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext) * channel list */ if (ch_width == CH_WIDTH_20MHZ) { - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_DEBUG, FL ("sapdfs: Channel=%d added to available list"), @@ -1484,7 +1484,7 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext) availableChannels[available_ch_cnt++] = tmp_ch_lst[i]; } else { - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_DEBUG, FL("sapdfs: Channel=%d added to bitmap"), tmp_ch_lst[i]); @@ -1509,11 +1509,11 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext) */ if (available_ch_cnt == 0) { if (ch_width == CH_WIDTH_80MHZ) { - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_WARN, FL ("sapdfs:No 80MHz cb found, falling to 40MHz")); - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_WARN, FL ("sapdfs:Changing chanWidth from [%d] to [%d]"), @@ -1523,11 +1523,11 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext) /* continue to start of do loop */ continue; } else if (ch_width == CH_WIDTH_40MHZ) { - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_WARN, FL ("sapdfs:No 40MHz cb found, falling to 20MHz")); - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_WARN, FL ("sapdfs:Changing chanWidth from [%d] to [%d]"), @@ -1557,7 +1557,7 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext) } } } else { - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, FL("No target channel found")); } @@ -1580,11 +1580,11 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext) } pMac->sap.SapDfsInfo.new_chanWidth = ch_width; - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, FL("sapdfs: New Channel width = %d"), pMac->sap.SapDfsInfo.new_chanWidth); - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, FL("sapdfs: target_channel = %d"), target_channel); @@ -1639,13 +1639,13 @@ void sap_mark_dfs_channels(ptSapContext sapContext, uint8_t *channels, if (NULL == channels) return; if (NULL == hHal) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("invalid hHal")); return; } pMac = PMAC_STRUCT(hHal); if (NULL == pMac) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("invalid pMac")); return; } @@ -1670,7 +1670,7 @@ void sap_mark_dfs_channels(ptSapContext sapContext, uint8_t *channels, */ if (psapDfsChannelNolList[j].radar_status_flag == eSAP_DFS_CHANNEL_UNAVAILABLE) { - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("Channel=%d already in NOL"), channels[i]); @@ -1685,7 +1685,7 @@ void sap_mark_dfs_channels(ptSapContext sapContext, uint8_t *channels, psapDfsChannelNolList[j].radar_status_flag = eSAP_DFS_CHANNEL_UNAVAILABLE; - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("Channel=%d Added to NOL LIST"), channels[i]); @@ -1716,7 +1716,7 @@ uint8_t sap_get_bonding_channels(ptSapContext sapContext, uint8_t channel, } else return 0; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, FL("cbmode: %d, channel: %d"), chanBondState, channel); switch (chanBondState) { @@ -1797,7 +1797,7 @@ static bool sap_dfs_check_if_channel_avaialable(tSapDfsNolInfo *nol) * SAP operation since it is past * Non-Occupancy-Period so, return false. */ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, FL("Chan=%d not in NOL,CHAN AVAILABLE"), nol->dfs_channel_number); return true; @@ -1830,7 +1830,7 @@ static bool sap_dfs_check_if_channel_avaialable(tSapDfsNolInfo *nol) nol->radar_status_flag = eSAP_DFS_CHANNEL_AVAILABLE; nol->radar_found_timestamp = 0; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, FL("Chan=%d not in NOL, Channel AVAILABLE"), nol->dfs_channel_number); return true; @@ -1841,13 +1841,13 @@ static bool sap_dfs_check_if_channel_avaialable(tSapDfsNolInfo *nol) * Channel is still in * Non-occupancy-Period. */ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, FL("Chan=%d in NOL, Channel UNAVAILBLE"), nol->dfs_channel_number); return false; } } else { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("Invalid Radar Status Flag")); } return true; @@ -1879,7 +1879,7 @@ sap_dfs_is_channel_in_nol_list(ptSapContext sap_context, bool channel_available; if (NULL == h_hal) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("invalid h_hal")); return false; } else { @@ -1890,7 +1890,7 @@ sap_dfs_is_channel_in_nol_list(ptSapContext sap_context, if ((dfs_info->numCurrentRegDomainDfsChannels == 0) || (dfs_info->numCurrentRegDomainDfsChannels > NUM_5GHZ_CHANNELS)) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, FL("invalid dfs channel count %d"), dfs_info->numCurrentRegDomainDfsChannels); return false; @@ -1927,7 +1927,7 @@ sap_dfs_is_channel_in_nol_list(ptSapContext sap_context, if (j < num_channels && i < dfs_info->numCurrentRegDomainDfsChannels) { if (num_channels > MAX_BONDED_CHANNELS) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_WARN, FL("num_channel>MAX_BONDED_CHANNEL, reset")); num_channels = MAX_BONDED_CHANNELS; } @@ -1974,10 +1974,10 @@ QDF_STATUS sap_goto_channel_sel(ptSapContext sap_context, tHalHandle h_hal; uint8_t con_ch; - h_hal = cds_get_context(CDF_MODULE_ID_SME); + h_hal = cds_get_context(QDF_MODULE_ID_SME); if (NULL == h_hal) { /* we have a serious problem */ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_FATAL, FL("invalid h_hal")); return QDF_STATUS_E_FAULT; } @@ -1990,7 +1990,7 @@ QDF_STATUS sap_goto_channel_sel(ptSapContext sap_context, sap_context->dfs_ch_disable = true; } else if (con_ch && sap_context->channel != con_ch && CDS_IS_DFS_CH(sap_context->channel)) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_WARN, FL("MCC DFS not supported in AP_AP Mode")); return QDF_STATUS_E_ABORTED; } @@ -2003,7 +2003,7 @@ QDF_STATUS sap_goto_channel_sel(ptSapContext sap_context, sap_context->csr_roamProfile.phyMode, sap_context->cc_switch_mode); if (con_ch) { - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Override ch %d to %d due to CC Intf", __func__, sap_context->channel, con_ch); @@ -2013,12 +2013,12 @@ QDF_STATUS sap_goto_channel_sel(ptSapContext sap_context, #endif } - if (cds_get_concurrency_mode() == (CDF_STA_MASK | CDF_SAP_MASK)) { + if (cds_get_concurrency_mode() == (QDF_STA_MASK | QDF_SAP_MASK)) { #ifdef FEATURE_WLAN_STA_AP_MODE_DFS_DISABLE if (sap_context->channel == AUTO_CHANNEL_SELECT) sap_context->dfs_ch_disable = true; else if (CDS_IS_DFS_CH(sap_context->channel)) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_WARN, FL("DFS not supported in STA_AP Mode")); return QDF_STATUS_E_ABORTED; } @@ -2031,7 +2031,7 @@ QDF_STATUS sap_goto_channel_sel(ptSapContext sap_context, sap_context->csr_roamProfile.phyMode, sap_context->cc_switch_mode); if (con_ch && !CDS_IS_DFS_CH(con_ch)) { - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Override ch %d to %d due to CC Intf", __func__, sap_context->channel, con_ch); @@ -2043,7 +2043,7 @@ QDF_STATUS sap_goto_channel_sel(ptSapContext sap_context, if (sap_context->channel == AUTO_CHANNEL_SELECT) { #ifdef FEATURE_WLAN_AP_AP_ACS_OPTIMIZE - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("%s skip_acs_status = %d "), __func__, sap_context->acs_cfg->skip_scan_status); if (sap_context->acs_cfg->skip_scan_status != @@ -2095,7 +2095,7 @@ QDF_STATUS sap_goto_channel_sel(ptSapContext sap_context, #endif /* Set requestType to Full scan */ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("calling sme_scan_request")); #ifdef FEATURE_WLAN_AP_AP_ACS_OPTIMIZE if (sap_context->acs_cfg->skip_scan_status == @@ -2128,10 +2128,10 @@ QDF_STATUS sap_goto_channel_sel(ptSapContext sap_context, sap_context); } if (QDF_STATUS_SUCCESS != cdf_ret_status) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("sme_scan_request fail %d!!!"), cdf_ret_status); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("SAP Configuring default channel, Ch=%d"), sap_context->channel); /* In case of error, switch to default channel */ @@ -2160,7 +2160,7 @@ QDF_STATUS sap_goto_channel_sel(ptSapContext sap_context, qdf_status = sap_fsm(sap_context, sap_event); } } else { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("return sme_ScanReq, scanID=%d, Ch=%d"), scan_request.scan_id, sap_context->channel); } @@ -2171,18 +2171,18 @@ QDF_STATUS sap_goto_channel_sel(ptSapContext sap_context, } if (sap_context->acs_cfg->skip_scan_status == eSAP_SKIP_ACS_SCAN) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("## %s SKIPPED ACS SCAN"), __func__); wlansap_scan_callback(h_hal, sap_context, sap_context->sessionId, 0, eCSR_SCAN_SUCCESS); } #endif } else { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("for configured channel, Ch= %d"), sap_context->channel); if (sap_do_acs_pre_start_bss == true) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, FL("ACS end due to Ch override. Sel Ch = %d"), sap_context->channel); sap_context->acs_cfg->pri_ch = sap_context->channel; @@ -2209,7 +2209,7 @@ QDF_STATUS sap_goto_channel_sel(ptSapContext sap_context, * Have to wait for the call back to be called to get the * channel cannot advance state machine here as said above */ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("before exiting sap_goto_channel_sel channel=%d"), sap_context->channel); @@ -2245,13 +2245,13 @@ QDF_STATUS sap_open_session(tHalHandle hHal, ptSapContext sapContext) QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - if (sapContext->csr_roamProfile.csrPersona == CDF_P2P_GO_MODE) - status = cds_get_vdev_types(CDF_P2P_GO_MODE, &type, &subType); + if (sapContext->csr_roamProfile.csrPersona == QDF_P2P_GO_MODE) + status = cds_get_vdev_types(QDF_P2P_GO_MODE, &type, &subType); else - status = cds_get_vdev_types(CDF_SAP_MODE, &type, &subType); + status = cds_get_vdev_types(QDF_SAP_MODE, &type, &subType); if (QDF_STATUS_SUCCESS != status) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_FATAL, "failed to get vdev type"); return QDF_STATUS_E_FAILURE; } @@ -2263,7 +2263,7 @@ QDF_STATUS sap_open_session(tHalHandle hHal, ptSapContext sapContext) &sapContext->sessionId, type, subType); if (QDF_STATUS_SUCCESS != cdf_ret_status) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "Error: In %s calling sme_roam_connect status = %d", __func__, cdf_ret_status); @@ -2317,12 +2317,12 @@ sap_goto_starting sapContext->key_length = 32; cdf_mem_copy(sapContext->key_material, key_material, sizeof(key_material)); /* Need a key size define */ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "In %s", + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "In %s", __func__); if (NULL == hHal) { /* we have a serious problem */ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_FATAL, "In %s, invalid hHal", __func__); return QDF_STATUS_E_FAULT; } @@ -2330,7 +2330,7 @@ sap_goto_starting cdf_ret_status = sap_open_session(hHal, sapContext); if (QDF_STATUS_SUCCESS != cdf_ret_status) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "Error: In %s calling sap_open_session status = %d", __func__, cdf_ret_status); return QDF_STATUS_E_FAILURE; @@ -2369,7 +2369,7 @@ QDF_STATUS sap_goto_disconnecting(ptSapContext sapContext) hHal = CDS_GET_HAL_CB(sapContext->p_cds_gctx); if (NULL == hHal) { /* we have a serious problem */ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "In %s, invalid hHal", __func__); return QDF_STATUS_E_FAULT; } @@ -2377,7 +2377,7 @@ QDF_STATUS sap_goto_disconnecting(ptSapContext sapContext) sap_free_roam_profile(&sapContext->csr_roamProfile); cdf_ret_status = sme_roam_stop_bss(hHal, sapContext->sessionId); if (QDF_STATUS_SUCCESS != cdf_ret_status) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "Error: In %s calling sme_roam_stop_bss status = %d", __func__, cdf_ret_status); return QDF_STATUS_E_FAILURE; @@ -2467,18 +2467,18 @@ QDF_STATUS sap_signal_hdd_event(ptSapContext sap_ctx, return QDF_STATUS_E_FAILURE; } if (NULL == hal) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("Invalid hal")); return QDF_STATUS_E_FAILURE; } mac_ctx = PMAC_STRUCT(hal); if (NULL == mac_ctx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("Invalid MAC context")); return QDF_STATUS_E_FAILURE; } - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("SAP event callback event = %s"), sap_hdd_event_to_string(sap_hddevent)); @@ -2517,7 +2517,7 @@ QDF_STATUS sap_signal_hdd_event(ptSapContext sap_ctx, else bss_complete->staId = 0; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("(eSAP_START_BSS_EVENT): staId = %d"), bss_complete->staId); @@ -2702,7 +2702,7 @@ QDF_STATUS sap_signal_hdd_event(ptSapContext sap_ctx, sap_ap_event.sapHddEventCode = eSAP_UNKNOWN_STA_JOIN; cdf_mem_copy((void *) sap_ap_event.sapevt.sapUnknownSTAJoin. macaddr.bytes, (void *) context, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); break; case eSAP_MAX_ASSOC_EXCEEDED: @@ -2750,7 +2750,7 @@ QDF_STATUS sap_signal_hdd_event(ptSapContext sap_ctx, (&mac_ctx->sap.SapDfsInfo.sapDfsChannelNolList[0]); break; case eSAP_ECSA_CHANGE_CHAN_IND: - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "In %s, SAP event callback event = %s", __func__, "eSAP_ECSA_CHANGE_CHAN_IND"); sap_ap_event.sapHddEventCode = eSAP_ECSA_CHANGE_CHAN_IND; @@ -2758,7 +2758,7 @@ QDF_STATUS sap_signal_hdd_event(ptSapContext sap_ctx, csr_roaminfo->target_channel; break; default: - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("SAP Unknown callback event = %d"), sap_hddevent); break; @@ -2793,9 +2793,9 @@ ptSapContext sap_find_valid_concurrent_session(tHalHandle hHal) uint8_t intf = 0; for (intf = 0; intf < SAP_MAX_NUM_SESSION; intf++) { - if (((CDF_SAP_MODE == pMac->sap.sapCtxList[intf].sapPersona) + if (((QDF_SAP_MODE == pMac->sap.sapCtxList[intf].sapPersona) || - (CDF_P2P_GO_MODE == pMac->sap.sapCtxList[intf].sapPersona)) && + (QDF_P2P_GO_MODE == pMac->sap.sapCtxList[intf].sapPersona)) && pMac->sap.sapCtxList[intf].pSapContext != NULL) { return pMac->sap.sapCtxList[intf].pSapContext; } @@ -2849,7 +2849,7 @@ QDF_STATUS sap_close_session(tHalHandle hHal, if (NULL == sap_find_valid_concurrent_session(hHal)) { /* If timer is running then stop the timer and destory it */ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, "sapdfs: no session are valid, so clearing dfs global structure"); /* * CAC timer will be initiated and started only when SAP starts @@ -2893,9 +2893,9 @@ void sap_cac_reset_notify(tHalHandle hHal) for (intf = 0; intf < SAP_MAX_NUM_SESSION; intf++) { ptSapContext pSapContext = (ptSapContext) pMac->sap.sapCtxList[intf].pSapContext; - if (((CDF_SAP_MODE == pMac->sap.sapCtxList[intf].sapPersona) + if (((QDF_SAP_MODE == pMac->sap.sapCtxList[intf].sapPersona) || - (CDF_P2P_GO_MODE == pMac->sap.sapCtxList[intf].sapPersona)) + (QDF_P2P_GO_MODE == pMac->sap.sapCtxList[intf].sapPersona)) && pMac->sap.sapCtxList[intf].pSapContext != NULL) { pSapContext->isCacStartNotified = false; pSapContext->isCacEndNotified = false; @@ -2925,12 +2925,12 @@ QDF_STATUS sap_cac_start_notify(tHalHandle hHal) for (intf = 0; intf < SAP_MAX_NUM_SESSION; intf++) { ptSapContext pSapContext = (ptSapContext) pMac->sap.sapCtxList[intf].pSapContext; - if (((CDF_SAP_MODE == pMac->sap.sapCtxList[intf].sapPersona) + if (((QDF_SAP_MODE == pMac->sap.sapCtxList[intf].sapPersona) || - (CDF_P2P_GO_MODE == pMac->sap.sapCtxList[intf].sapPersona)) + (QDF_P2P_GO_MODE == pMac->sap.sapCtxList[intf].sapPersona)) && pMac->sap.sapCtxList[intf].pSapContext != NULL && (false == pSapContext->isCacStartNotified)) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, "sapdfs: Signaling eSAP_DFS_CAC_START to HDD for sapctx[%p]", pSapContext); @@ -2939,7 +2939,7 @@ QDF_STATUS sap_cac_start_notify(tHalHandle hHal) (void *) eSAP_STATUS_SUCCESS); if (QDF_STATUS_SUCCESS != qdf_status) { - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "In %s, failed setting isCacStartNotified on interface[%d]", __func__, intf); @@ -2979,9 +2979,9 @@ QDF_STATUS sap_cac_end_notify(tHalHandle hHal, tCsrRoamInfo *roamInfo) for (intf = 0; intf < SAP_MAX_NUM_SESSION; intf++) { ptSapContext pSapContext = (ptSapContext) pMac->sap.sapCtxList[intf].pSapContext; - if (((CDF_SAP_MODE == pMac->sap.sapCtxList[intf].sapPersona) + if (((QDF_SAP_MODE == pMac->sap.sapCtxList[intf].sapPersona) || - (CDF_P2P_GO_MODE == pMac->sap.sapCtxList[intf].sapPersona)) + (QDF_P2P_GO_MODE == pMac->sap.sapCtxList[intf].sapPersona)) && pMac->sap.sapCtxList[intf].pSapContext != NULL && (false == pSapContext->isCacEndNotified)) { pSapContext = pMac->sap.sapCtxList[intf].pSapContext; @@ -2990,7 +2990,7 @@ QDF_STATUS sap_cac_end_notify(tHalHandle hHal, tCsrRoamInfo *roamInfo) (void *) eSAP_STATUS_SUCCESS); if (QDF_STATUS_SUCCESS != qdf_status) { - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "In %s, failed setting isCacEndNotified on interface[%d]", __func__, intf); @@ -2998,7 +2998,7 @@ QDF_STATUS sap_cac_end_notify(tHalHandle hHal, tCsrRoamInfo *roamInfo) } pSapContext->isCacEndNotified = true; pMac->sap.SapDfsInfo.sap_radar_found_status = false; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, "sapdfs: Start beacon request on sapctx[%p]", pSapContext); @@ -3008,7 +3008,7 @@ QDF_STATUS sap_cac_end_notify(tHalHandle hHal, tCsrRoamInfo *roamInfo) /* Transition from eSAP_STARTING to eSAP_STARTED * (both without substates) */ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, "sapdfs: channel[%d] from state %s => %s", pSapContext->channel, "eSAP_STARTING", "eSAP_STARTED"); @@ -3021,7 +3021,7 @@ QDF_STATUS sap_cac_end_notify(tHalHandle hHal, tCsrRoamInfo *roamInfo) (void *) eSAP_STATUS_SUCCESS); if (QDF_STATUS_SUCCESS != qdf_status) { - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "In %s, failed setting isCacEndNotified on interface[%d]", __func__, intf); @@ -3031,7 +3031,7 @@ QDF_STATUS sap_cac_end_notify(tHalHandle hHal, tCsrRoamInfo *roamInfo) /* Transition from eSAP_STARTING to eSAP_STARTED * (both without substates) */ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "eSAP_DFS_CAC_WAIT", "eSAP_STARTED"); @@ -3072,13 +3072,13 @@ static QDF_STATUS sap_fsm_state_disconnected(ptSapContext sap_ctx, * Transition from eSAP_DISCONNECTED to eSAP_CH_SELECT * (both without substates) */ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("new from state %s => %s"), "eSAP_DISCONNECTED", "eSAP_CH_SELECT"); /* There can be one SAP Session for softap */ if (sap_ctx->isSapSessionOpen == eSAP_TRUE) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_FATAL, FL("SME Session is already opened")); return QDF_STATUS_E_EXISTS; } @@ -3089,13 +3089,13 @@ static QDF_STATUS sap_fsm_state_disconnected(ptSapContext sap_ctx, (sap_ctx->isScanSessionOpen == eSAP_FALSE)) { uint32_t type, subtype; if (QDF_STATUS_SUCCESS == cds_get_vdev_types( - CDF_STA_MODE, &type, &subtype)) { + QDF_STA_MODE, &type, &subtype)) { /* Open SME Session for scan */ qdf_status = sme_open_session(hal, NULL, sap_ctx, sap_ctx->self_mac_addr, &sap_ctx->sessionId, type, subtype); if (QDF_STATUS_SUCCESS != qdf_status) { - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("Error: calling sme_open_session")); } else { @@ -3119,7 +3119,7 @@ static QDF_STATUS sap_fsm_state_disconnected(ptSapContext sap_ctx, * Transition from eSAP_DISCONNECTED to eSAP_CH_SELECT * (both without substates) */ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("from state %s => %s"), "eSAP_DISCONNECTED", "eSAP_CH_SELECT"); } else if (msg == eSAP_DFS_CHANNEL_CAC_START) { @@ -3129,10 +3129,10 @@ static QDF_STATUS sap_fsm_state_disconnected(ptSapContext sap_ctx, */ sap_ctx->sapsMachine = eSAP_DFS_CAC_WAIT; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, FL("from state eSAP_DISCONNECTED => SAP_DFS_CAC_WAIT")); if (mac_ctx->sap.SapDfsInfo.is_dfs_cac_timer_running != true) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, FL("sapdfs: starting dfs cac timer on sapctx[%p]"), sap_ctx); sap_start_dfs_cac_timer(sap_ctx); @@ -3149,7 +3149,7 @@ static QDF_STATUS sap_fsm_state_disconnected(ptSapContext sap_ctx, */ qdf_status = sap_goto_channel_sel(sap_ctx, sap_event, false); } else { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("in state %s, event msg %d"), "eSAP_DISCONNECTED", msg); } @@ -3186,7 +3186,7 @@ static QDF_STATUS sap_fsm_state_ch_select(ptSapContext sap_ctx, qdf_status = sme_close_session(hal, sap_ctx->sessionId, NULL, NULL); if (QDF_STATUS_SUCCESS != qdf_status) - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("CloseSession error event msg %d"), msg); else sap_ctx->isScanSessionOpen = eSAP_FALSE; @@ -3227,7 +3227,7 @@ static QDF_STATUS sap_fsm_state_ch_select(ptSapContext sap_ctx, ch = sap_random_channel_sel(sap_ctx); if (ch == 0) { /* No available channel found */ - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("No available channel found!!!")); sap_signal_hdd_event(sap_ctx, NULL, @@ -3236,7 +3236,7 @@ static QDF_STATUS sap_fsm_state_ch_select(ptSapContext sap_ctx, return QDF_STATUS_E_FAULT; } - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("channel %d is in NOL, StartBss on new channel %d"), sap_ctx->channel, ch); @@ -3269,7 +3269,7 @@ static QDF_STATUS sap_fsm_state_ch_select(ptSapContext sap_ctx, * Transition from eSAP_CH_SELECT to eSAP_STARTING * (both without substates) */ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("from state %s => %s"), "eSAP_CH_SELECT", "eSAP_STARTING"); /* Channel selected. Now can sap_goto_starting */ @@ -3289,7 +3289,7 @@ static QDF_STATUS sap_fsm_state_ch_select(ptSapContext sap_ctx, sap_ctx->ch_params.center_freq_seg1; sap_ctx->csr_roamProfile.ch_params.sec_ch_offset = sap_ctx->ch_params.sec_ch_offset; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("notify hostapd about channel selection: %d"), sap_ctx->channel); sap_signal_hdd_event(sap_ctx, NULL, @@ -3299,16 +3299,16 @@ static QDF_STATUS sap_fsm_state_ch_select(ptSapContext sap_ctx, eCSR_BSS_TYPE_INFRA_AP); } else if (msg == eSAP_CHANNEL_SELECTION_FAILED) { sap_ctx->sapsMachine = eSAP_DISCONNECTED; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("Cannot start BSS, ACS Fail")); } else if (msg == eSAP_HDD_STOP_INFRA_BSS) { sap_ctx->sapsMachine = eSAP_DISCONNECTED; sap_signal_hdd_event(sap_ctx, NULL, eSAP_START_BSS_EVENT, (void *)eSAP_STATUS_FAILURE); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s: BSS stopped when Ch select in Progress", __func__); } else { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("in state %s, invalid event msg %d"), "eSAP_CH_SELECT", msg); } @@ -3336,7 +3336,7 @@ static QDF_STATUS sap_fsm_state_dfs_cac_wait(ptSapContext sap_ctx, QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; if (msg == eSAP_DFS_CHANNEL_CAC_START) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("from state %s => %s"), "eSAP_CH_SELECT", "eSAP_DFS_CAC_WAIT"); if (mac_ctx->sap.SapDfsInfo.is_dfs_cac_timer_running != true) @@ -3349,7 +3349,7 @@ static QDF_STATUS sap_fsm_state_dfs_cac_wait(ptSapContext sap_ctx, * check, need to switch the channel again */ eCsrPhyMode phymode = sap_ctx->csr_roamProfile.phyMode; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "ENTERTRED CAC WAIT STATE-->eSAP_DISCONNECTING\n"); if (mac_ctx->sap.SapDfsInfo.target_channel) { sme_set_ch_params(hal, phymode, @@ -3359,9 +3359,9 @@ static QDF_STATUS sap_fsm_state_dfs_cac_wait(ptSapContext sap_ctx, for (intf = 0; intf < SAP_MAX_NUM_SESSION; intf++) { ptSapContext t_sap_ctx; - if (((CDF_SAP_MODE == + if (((QDF_SAP_MODE == mac_ctx->sap.sapCtxList[intf].sapPersona) || - (CDF_P2P_GO_MODE == + (QDF_P2P_GO_MODE == mac_ctx->sap.sapCtxList[intf].sapPersona)) && mac_ctx->sap.sapCtxList[intf].pSapContext != NULL) { t_sap_ctx = @@ -3389,7 +3389,7 @@ static QDF_STATUS sap_fsm_state_dfs_cac_wait(ptSapContext sap_ctx, qdf_status = sap_cac_end_notify(hal, roam_info); } else if (msg == eSAP_HDD_STOP_INFRA_BSS) { /* Transition from eSAP_DFS_CAC_WAIT to eSAP_DISCONNECTING */ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("from state %s => %s"), "eSAP_DFS_CAC_WAIT", "eSAP_DISCONNECTING"); @@ -3400,7 +3400,7 @@ static QDF_STATUS sap_fsm_state_dfs_cac_wait(ptSapContext sap_ctx, * all APs are down. */ if (NULL == sap_find_valid_concurrent_session(hal)) { - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, FL("sapdfs: no sessions are valid, stopping timer")); sap_stop_dfs_cac_timer(sap_ctx); @@ -3409,7 +3409,7 @@ static QDF_STATUS sap_fsm_state_dfs_cac_wait(ptSapContext sap_ctx, sap_ctx->sapsMachine = eSAP_DISCONNECTING; qdf_status = sap_goto_disconnecting(sap_ctx); } else { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("in state %s, invalid event msg %d"), "eSAP_DFS_CAC_WAIT", msg); } @@ -3442,7 +3442,7 @@ static QDF_STATUS sap_fsm_state_starting(ptSapContext sap_ctx, * Transition from eSAP_STARTING to eSAP_STARTED * (both without substates) */ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("from state channel = %d %s => %s"), sap_ctx->channel, "eSAP_STARTING", "eSAP_STARTED"); sap_ctx->sapsMachine = eSAP_STARTED; @@ -3486,7 +3486,7 @@ static QDF_STATUS sap_fsm_state_starting(ptSapContext sap_ctx, * Transition from STARTING to DISCONNECTED * (both without substates) */ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("from state %s => %s"), "eSAP_STARTING", "eSAP_DISCONNECTED"); @@ -3502,7 +3502,7 @@ static QDF_STATUS sap_fsm_state_starting(ptSapContext sap_ctx, * Transition from eSAP_STARTING to eSAP_DISCONNECTED * (both without substates) */ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("from state %s => %s"), "eSAP_STARTING", "eSAP_DISCONNECTED"); @@ -3526,7 +3526,7 @@ static QDF_STATUS sap_fsm_state_starting(ptSapContext sap_ctx, sap_ctx->sapsMachine = eSAP_STARTED; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("from state %s => %s"), "eSAP_STARTING", "eSAP_STARTED"); @@ -3535,7 +3535,7 @@ static QDF_STATUS sap_fsm_state_starting(ptSapContext sap_ctx, eSAP_START_BSS_EVENT, (void *)eSAP_STATUS_SUCCESS); } else { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("in state %s, invalid event msg %d"), "eSAP_STARTING", msg); } @@ -3564,7 +3564,7 @@ static QDF_STATUS sap_fsm_state_started(ptSapContext sap_ctx, * Transition from eSAP_STARTED to eSAP_DISCONNECTING * (both without substates) */ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("from state %s => %s"), "eSAP_STARTED", "eSAP_DISCONNECTING"); sap_ctx->sapsMachine = eSAP_DISCONNECTING; @@ -3578,14 +3578,14 @@ static QDF_STATUS sap_fsm_state_started(ptSapContext sap_ctx, */ for (intf = 0; intf < SAP_MAX_NUM_SESSION; intf++) { ptSapContext temp_sap_ctx; - if (((CDF_SAP_MODE == + if (((QDF_SAP_MODE == mac_ctx->sap.sapCtxList[intf].sapPersona) || - (CDF_P2P_GO_MODE == + (QDF_P2P_GO_MODE == mac_ctx->sap.sapCtxList[intf].sapPersona)) && mac_ctx->sap.sapCtxList[intf].pSapContext != NULL) { temp_sap_ctx = mac_ctx->sap.sapCtxList[intf].pSapContext; - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, FL("sapdfs: Sending CSAIE for sapctx[%p]"), temp_sap_ctx); @@ -3595,7 +3595,7 @@ static QDF_STATUS sap_fsm_state_started(ptSapContext sap_ctx, } } } else { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("in state %s, invalid event msg %d"), "eSAP_STARTED", msg); } @@ -3625,7 +3625,7 @@ static QDF_STATUS sap_fsm_state_disconnecting(ptSapContext sap_ctx, * Transition from eSAP_DISCONNECTING to eSAP_DISCONNECTED * (both without substates) */ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("from state %s => %s"), "eSAP_DISCONNECTING", "eSAP_DISCONNECTED"); sap_ctx->sapsMachine = eSAP_DISCONNECTED; @@ -3642,7 +3642,7 @@ static QDF_STATUS sap_fsm_state_disconnecting(ptSapContext sap_ctx, } } } else if (msg == eWNI_SME_CHANNEL_CHANGE_REQ) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, FL("sapdfs: Send channel change request on sapctx[%p]"), sap_ctx); /* @@ -3652,10 +3652,10 @@ static QDF_STATUS sap_fsm_state_disconnecting(ptSapContext sap_ctx, qdf_status = wlansap_channel_change_request((void *) sap_ctx, mac_ctx->sap.SapDfsInfo.target_channel); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, FL("Sending DFS eWNI_SME_CHANNEL_CHANGE_REQ")); } else { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("in state %s, invalid event msg %d"), "eSAP_DISCONNECTING", msg); } @@ -3686,19 +3686,19 @@ QDF_STATUS sap_fsm(ptSapContext sap_ctx, ptWLAN_SAPEvent sap_event) tpAniSirGlobal mac_ctx; if (NULL == hal) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("Invalid hal")); return QDF_STATUS_E_FAILURE; } mac_ctx = PMAC_STRUCT(hal); if (NULL == mac_ctx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("Invalid MAC context")); return QDF_STATUS_E_FAILURE; } - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_DEBUG, FL("sap_ctx=%p, state_var=%d, msg=0x%x"), sap_ctx, state_var, msg); @@ -3807,7 +3807,7 @@ sapconvert_to_csr_profile(tsap_Config_t *pconfig_params, eCsrRoamBssType bssType profile->pRSNReqIE = cdf_mem_malloc(pconfig_params->RSNWPAReqIELength); if (NULL == profile->pRSNReqIE) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, " %s Fail to alloc memory", __func__); return eSAP_STATUS_FAILURE; } @@ -3896,14 +3896,14 @@ void sap_free_roam_profile(tCsrRoamProfile *profile) } } -void sap_sort_mac_list(struct cdf_mac_addr *macList, uint8_t size) +void sap_sort_mac_list(struct qdf_mac_addr *macList, uint8_t size) { uint8_t outer, inner; - struct cdf_mac_addr temp; + struct qdf_mac_addr temp; int32_t nRes = -1; if ((NULL == macList) || (size > MAX_ACL_MAC_ADDRESS)) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("either buffer is NULL or size = %d is more"), size); return; } @@ -3913,23 +3913,23 @@ void sap_sort_mac_list(struct cdf_mac_addr *macList, uint8_t size) nRes = cdf_mem_compare2((macList + inner)->bytes, (macList + inner + 1)->bytes, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); if (nRes > 0) { cdf_mem_copy(temp.bytes, (macList + inner + 1)->bytes, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); cdf_mem_copy((macList + inner + 1)->bytes, (macList + inner)->bytes, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); cdf_mem_copy((macList + inner)->bytes, - temp.bytes, CDF_MAC_ADDR_SIZE); + temp.bytes, QDF_MAC_ADDR_SIZE); } } } } eSapBool -sap_search_mac_list(struct cdf_mac_addr *macList, +sap_search_mac_list(struct qdf_mac_addr *macList, uint8_t num_mac, uint8_t *peerMac, uint8_t *index) { @@ -3938,7 +3938,7 @@ sap_search_mac_list(struct cdf_mac_addr *macList, nEnd = num_mac - 1; if ((NULL == macList) || (num_mac > MAX_ACL_MAC_ADDRESS)) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("either buffer is NULL or size = %d is more."), num_mac); return eSAP_FALSE; } @@ -3947,16 +3947,16 @@ sap_search_mac_list(struct cdf_mac_addr *macList, nMiddle = (nStart + nEnd) / 2; nRes = cdf_mem_compare2(&macList[nMiddle], peerMac, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); if (0 == nRes) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "search SUCC"); /* "index equals NULL" means the caller does not need the */ /* index value of the peerMac being searched */ if (index != NULL) { *index = (uint8_t) nMiddle; - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "index %d", *index); } @@ -3968,22 +3968,22 @@ sap_search_mac_list(struct cdf_mac_addr *macList, nEnd = nMiddle - 1; } - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "search not succ"); return eSAP_FALSE; } -void sap_add_mac_to_acl(struct cdf_mac_addr *macList, +void sap_add_mac_to_acl(struct qdf_mac_addr *macList, uint8_t *size, uint8_t *peerMac) { int32_t nRes = -1; int i; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "add acl entered"); if (NULL == macList || *size == 0 || *size > MAX_ACL_MAC_ADDRESS) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("either buffer is NULL or size = %d is incorrect."), *size); return; @@ -3991,28 +3991,28 @@ void sap_add_mac_to_acl(struct cdf_mac_addr *macList, for (i = ((*size) - 1); i >= 0; i--) { nRes = - cdf_mem_compare2(&macList[i], peerMac, CDF_MAC_ADDR_SIZE); + cdf_mem_compare2(&macList[i], peerMac, QDF_MAC_ADDR_SIZE); if (nRes > 0) { /* Move alphabetically greater mac addresses one index down to allow for insertion of new mac in sorted order */ cdf_mem_copy((macList + i + 1)->bytes, - (macList + i)->bytes, CDF_MAC_ADDR_SIZE); + (macList + i)->bytes, QDF_MAC_ADDR_SIZE); } else { break; } } /* This should also take care of if the element is the first to be added in the list */ - cdf_mem_copy((macList + i + 1)->bytes, peerMac, CDF_MAC_ADDR_SIZE); + cdf_mem_copy((macList + i + 1)->bytes, peerMac, QDF_MAC_ADDR_SIZE); /* increment the list size */ (*size)++; } -void sap_remove_mac_from_acl(struct cdf_mac_addr *macList, +void sap_remove_mac_from_acl(struct qdf_mac_addr *macList, uint8_t *size, uint8_t index) { int i; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "remove acl entered"); /* * Return if the list passed is empty. Ideally this should never happen @@ -4022,7 +4022,7 @@ void sap_remove_mac_from_acl(struct cdf_mac_addr *macList, */ if ((macList == NULL) || (*size == 0) || (*size > MAX_ACL_MAC_ADDRESS)) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("either buffer is NULL or size %d is incorrect."), *size); return; @@ -4031,23 +4031,23 @@ void sap_remove_mac_from_acl(struct cdf_mac_addr *macList, /* Move mac addresses starting from "index" passed one index up to delete the void created by deletion of a mac address in ACL */ cdf_mem_copy((macList + i)->bytes, (macList + i + 1)->bytes, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); } /* The last space should be made empty since all mac addesses moved one step up */ - cdf_mem_zero((macList + (*size) - 1)->bytes, CDF_MAC_ADDR_SIZE); + cdf_mem_zero((macList + (*size) - 1)->bytes, QDF_MAC_ADDR_SIZE); /* reduce the list size by 1 */ (*size)--; } -void sap_print_acl(struct cdf_mac_addr *macList, uint8_t size) +void sap_print_acl(struct qdf_mac_addr *macList, uint8_t size) { int i; uint8_t *macArray; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "print acl entered"); if ((NULL == macList) || (size == 0) || (size >= MAX_ACL_MAC_ADDRESS)) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "In %s, either buffer is NULL or size %d is incorrect.", __func__, size); return; @@ -4055,7 +4055,7 @@ void sap_print_acl(struct cdf_mac_addr *macList, uint8_t size) for (i = 0; i < size; i++) { macArray = (macList + i)->bytes; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "** ACL entry %i - " MAC_ADDRESS_STR, i, MAC_ADDR_ARRAY(macArray)); } @@ -4073,7 +4073,7 @@ QDF_STATUS sap_is_peer_mac_allowed(ptSapContext sapContext, uint8_t *peerMac) if (sap_search_mac_list (sapContext->denyMacList, sapContext->nDenyMac, peerMac, NULL)) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "In %s, Peer " MAC_ADDRESS_STR " in deny list", __func__, MAC_ADDR_ARRAY(peerMac)); return QDF_STATUS_E_FAILURE; @@ -4084,7 +4084,7 @@ QDF_STATUS sap_is_peer_mac_allowed(ptSapContext sapContext, uint8_t *peerMac) /* A new station CANNOT associate, unless in accept list. More stringent mode */ if (eSAP_DENY_UNLESS_ACCEPTED == sapContext->eSapMacAddrAclMode) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "In %s, Peer " MAC_ADDRESS_STR " denied, Mac filter mode is eSAP_DENY_UNLESS_ACCEPTED", __func__, MAC_ADDR_ARRAY(peerMac)); @@ -4097,7 +4097,7 @@ QDF_STATUS sap_is_peer_mac_allowed(ptSapContext sapContext, uint8_t *peerMac) if (eSAP_SUPPORT_ACCEPT_AND_DENY == sapContext->eSapMacAddrAclMode) { sap_signal_hdd_event(sapContext, NULL, eSAP_UNKNOWN_STA_JOIN, (void *) peerMac); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "In %s, Peer " MAC_ADDRESS_STR " denied, Mac filter mode is eSAP_SUPPORT_ACCEPT_AND_DENY", __func__, MAC_ADDR_ARRAY(peerMac)); @@ -4134,7 +4134,7 @@ static QDF_STATUS sap_get_channel_list(ptSapContext sap_ctx, tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal); if (NULL == hal) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("Invalid HAL pointer from p_cds_gctx")); *num_ch = 0; *ch_list = NULL; @@ -4143,7 +4143,7 @@ static QDF_STATUS sap_get_channel_list(ptSapContext sap_ctx, start_ch_num = sap_ctx->acs_cfg->start_ch; end_ch_num = sap_ctx->acs_cfg->end_ch; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, FL("startChannel %d, EndChannel %d, HW:%d"), start_ch_num, end_ch_num, sap_ctx->acs_cfg->hw_mode); @@ -4151,11 +4151,11 @@ static QDF_STATUS sap_get_channel_list(ptSapContext sap_ctx, wlansap_extend_to_acs_range(&start_ch_num, &end_ch_num, &band_start_ch, &band_end_ch); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, FL("expanded startChannel %d,EndChannel %d"), start_ch_num, end_ch_num); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, FL("band_start_ch %d, band_end_ch %d"), band_start_ch, band_end_ch); @@ -4172,7 +4172,7 @@ static QDF_STATUS sap_get_channel_list(ptSapContext sap_ctx, list = (uint8_t *) cdf_mem_malloc(NUM_5GHZ_CHANNELS + NUM_24GHZ_CHANNELS); if (NULL == list) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("Unable to allocate channel list")); *num_ch = 0; *ch_list = NULL; @@ -4218,12 +4218,12 @@ static QDF_STATUS sap_get_channel_list(ptSapContext sap_ctx, list[ch_count] = CDS_CHANNEL_NUM(loop_count); ch_count++; - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, FL("%d %d added to ACS ch range"), ch_count, ch); } else { - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("%d %d skipped from ACS ch range"), ch_count, ch); @@ -4232,7 +4232,7 @@ static QDF_STATUS sap_get_channel_list(ptSapContext sap_ctx, list[ch_count] = CDS_CHANNEL_NUM(loop_count); ch_count++; - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, FL("%d %d added to ACS ch range"), ch_count, ch); @@ -4249,14 +4249,14 @@ static QDF_STATUS sap_get_channel_list(ptSapContext sap_ctx, #endif } if (0 == ch_count) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("No active channels present for the current region")); /* * LTE COEX: channel range outside the restricted 2.4GHz * band limits */ if (en_lte_coex && (start_ch_num > band_end_ch)) - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_FATAL, FL("SAP can't be started as due to LTE COEX")); } @@ -4270,7 +4270,7 @@ static QDF_STATUS sap_get_channel_list(ptSapContext sap_ctx, } for (loop_count = 0; loop_count < ch_count; loop_count++) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_DEBUG, FL("channel number: %d"), list[loop_count]); } return QDF_STATUS_SUCCESS; @@ -4286,7 +4286,7 @@ static QDF_STATUS sap_get5_g_hz_channel_list(ptSapContext sapContext) uint8_t count = 0; int i; if (NULL == sapContext) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "Invalid sapContext pointer on sap_get_channel_list"); return QDF_STATUS_E_FAULT; } @@ -4300,7 +4300,7 @@ static QDF_STATUS sap_get5_g_hz_channel_list(ptSapContext sapContext) (tChannelInfo *) cdf_mem_malloc(WNI_CFG_VALID_CHANNEL_LIST_LEN * sizeof(tChannelInfo)); if (NULL == sapContext->SapAllChnlList.channelList) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, " Memory Allocation failed sap_get_channel_list"); return QDF_STATUS_E_NOMEM; } @@ -4310,7 +4310,7 @@ static QDF_STATUS sap_get5_g_hz_channel_list(ptSapContext sapContext) CDS_CHANNEL_STATE(i) == CHANNEL_STATE_DFS) { sapContext->SapAllChnlList.channelList[count].channel = CDS_CHANNEL_NUM(i); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, "%s[%d] CHANNEL = %d", __func__, __LINE__, sapContext->SapAllChnlList.channelList[count]. channel); @@ -4321,7 +4321,7 @@ static QDF_STATUS sap_get5_g_hz_channel_list(ptSapContext sapContext) } sapContext->SapAllChnlList.numChannel = count; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, "%s[%d] NUMBER OF CHANNELS count = %d" "sapContext->SapAllChnlList.numChannel = %d", __func__, __LINE__, count, @@ -4350,7 +4350,7 @@ uint8_t sap_indicate_radar(ptSapContext sapContext, hHal = CDS_GET_HAL_CB(sapContext->p_cds_gctx); if (NULL == hHal) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "In %s invalid hHal", __func__); return 0; } @@ -4378,7 +4378,7 @@ uint8_t sap_indicate_radar(ptSapContext sapContext, sap_get5_g_hz_channel_list(sapContext); if (dfs_event->chan_list.nchannels > SIR_DFS_MAX_20M_SUB_CH) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_WARN, FL("nchannels >SIR_DFS_MAX_20M_SUB_CH so resetting")); dfs_event->chan_list.nchannels = SIR_DFS_MAX_20M_SUB_CH; } @@ -4402,7 +4402,7 @@ uint8_t sap_indicate_radar(ptSapContext sapContext, eSAP_DFS_NO_AVAILABLE_CHANNEL, (void *) eSAP_STATUS_SUCCESS); } - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_WARN, FL("sapdfs: New selected target channel is [%d]"), target_channel); return target_channel; @@ -4420,7 +4420,7 @@ void sap_dfs_cac_timer_callback(void *data) tpAniSirGlobal pMac; if (NULL == hHal) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "In %s invalid hHal", __func__); return; } @@ -4428,7 +4428,7 @@ void sap_dfs_cac_timer_callback(void *data) sapContext = sap_find_valid_concurrent_session(hHal); if (NULL == sapContext) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "In %s no SAP contexts are found", __func__); return; } @@ -4441,7 +4441,7 @@ void sap_dfs_cac_timer_callback(void *data) /* * CAC Complete, post eSAP_DFS_CHANNEL_CAC_END to sap_fsm */ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, "sapdfs: Sending eSAP_DFS_CHANNEL_CAC_END for target_channel = %d on sapctx[%p]", sapContext->channel, sapContext); @@ -4467,7 +4467,7 @@ static int sap_stop_dfs_cac_timer(ptSapContext sapContext) hHal = CDS_GET_HAL_CB(sapContext->p_cds_gctx); if (NULL == hHal) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "In %s invalid hHal", __func__); return 0; } @@ -4523,7 +4523,7 @@ int sap_start_dfs_cac_timer(ptSapContext sapContext) hHal = CDS_GET_HAL_CB(sapContext->p_cds_gctx); if (NULL == hHal) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "In %s invalid hHal", __func__); return 0; } @@ -4545,12 +4545,12 @@ int sap_start_dfs_cac_timer(ptSapContext sapContext) (sap_is_channel_bonding_etsi_weather_channel(sapContext)))) { cacTimeOut = ETSI_WEATHER_CH_CAC_TIMEOUT; } - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, "sapdfs: SAP_DFS_CHANNEL_CAC_START on CH - %d, CAC TIMEOUT - %d sec", sapContext->channel, cacTimeOut / 1000); cdf_mc_timer_init(&pMac->sap.SapDfsInfo.sap_dfs_cac_timer, - CDF_TIMER_TYPE_SW, + QDF_TIMER_TYPE_SW, sap_dfs_cac_timer_callback, (void *) hHal); /*Start the CAC timer */ @@ -4579,14 +4579,14 @@ QDF_STATUS sap_init_dfs_channel_nol_list(ptSapContext sapContext) tpAniSirGlobal pMac; if (NULL == sapContext) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "Invalid sapContext pointer on sap_init_dfs_channel_nol_list"); return QDF_STATUS_E_FAULT; } hHal = CDS_GET_HAL_CB(sapContext->p_cds_gctx); if (NULL == hHal) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "In %s invalid hHal", __func__); return QDF_STATUS_E_FAULT; } @@ -4608,7 +4608,7 @@ QDF_STATUS sap_init_dfs_channel_nol_list(ptSapContext sapContext) .dfs_channel_number = CDS_CHANNEL_NUM(i); - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, "%s: CHANNEL = %d", __func__, pMac->sap.SapDfsInfo. @@ -4627,7 +4627,7 @@ QDF_STATUS sap_init_dfs_channel_nol_list(ptSapContext sapContext) pMac->sap.SapDfsInfo.numCurrentRegDomainDfsChannels = count; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, "%s[%d] NUMBER OF DFS CHANNELS = %d", __func__, __LINE__, pMac->sap.SapDfsInfo.numCurrentRegDomainDfsChannels); @@ -4646,9 +4646,9 @@ uint8_t sap_get_total_number_sap_intf(tHalHandle hHal) uint8_t intf_count = 0; for (intf = 0; intf < SAP_MAX_NUM_SESSION; intf++) { - if (((CDF_SAP_MODE == pMac->sap.sapCtxList[intf].sapPersona) + if (((QDF_SAP_MODE == pMac->sap.sapCtxList[intf].sapPersona) || - (CDF_P2P_GO_MODE == pMac->sap.sapCtxList[intf].sapPersona)) + (QDF_P2P_GO_MODE == pMac->sap.sapCtxList[intf].sapPersona)) && pMac->sap.sapCtxList[intf].pSapContext != NULL) { intf_count++; } @@ -4668,21 +4668,21 @@ bool is_concurrent_sap_ready_for_channel_change(tHalHandle hHal, uint8_t intf = 0; for (intf = 0; intf < SAP_MAX_NUM_SESSION; intf++) { - if (((CDF_SAP_MODE == pMac->sap.sapCtxList[intf].sapPersona) + if (((QDF_SAP_MODE == pMac->sap.sapCtxList[intf].sapPersona) || - (CDF_P2P_GO_MODE == pMac->sap.sapCtxList[intf].sapPersona)) + (QDF_P2P_GO_MODE == pMac->sap.sapCtxList[intf].sapPersona)) && pMac->sap.sapCtxList[intf].pSapContext != NULL) { pSapContext = (ptSapContext) pMac->sap.sapCtxList[intf]. pSapContext; if (pSapContext == sapContext) { - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("sapCtx matched [%p]"), sapContext); continue; } else { - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL ("concurrent sapCtx[%p] didn't matche with [%p]"), diff --git a/core/sap/src/sap_internal.h b/core/sap/src/sap_internal.h index 86f2781143..46bb79e868 100644 --- a/core/sap/src/sap_internal.h +++ b/core/sap/src/sap_internal.h @@ -62,7 +62,7 @@ extern "C" { /* When MBSSID feature is enabled, SAP context is directly passed to SAP APIs */ #define CDS_GET_SAP_CB(ctx) (ptSapContext)(ctx) -#define CDS_GET_HAL_CB(ctx) cds_get_context(CDF_MODULE_ID_PE) +#define CDS_GET_HAL_CB(ctx) cds_get_context(QDF_MODULE_ID_PE) /* MAC Address length */ #define ANI_EAPOL_KEY_RSN_NONCE_SIZE 32 @@ -183,13 +183,13 @@ typedef struct sSapContext { tCsrSSIDInfo SSIDList[2]; /* Actual storage for AP bssid */ - struct cdf_mac_addr bssid; + struct qdf_mac_addr bssid; /* Mac filtering settings */ eSapMacAddrACL eSapMacAddrAclMode; - struct cdf_mac_addr acceptMacList[MAX_ACL_MAC_ADDRESS]; + struct qdf_mac_addr acceptMacList[MAX_ACL_MAC_ADDRESS]; uint8_t nAcceptMac; - struct cdf_mac_addr denyMacList[MAX_ACL_MAC_ADDRESS]; + struct qdf_mac_addr denyMacList[MAX_ACL_MAC_ADDRESS]; uint8_t nDenyMac; /* QOS config */ @@ -339,21 +339,21 @@ QDF_STATUS sap_is_peer_mac_allowed(ptSapContext sapContext, uint8_t *peerMac); void -sap_sort_mac_list(struct cdf_mac_addr *macList, uint8_t size); +sap_sort_mac_list(struct qdf_mac_addr *macList, uint8_t size); void -sap_add_mac_to_acl(struct cdf_mac_addr *macList, uint8_t *size, +sap_add_mac_to_acl(struct qdf_mac_addr *macList, uint8_t *size, uint8_t *peerMac); void -sap_remove_mac_from_acl(struct cdf_mac_addr *macList, uint8_t *size, +sap_remove_mac_from_acl(struct qdf_mac_addr *macList, uint8_t *size, uint8_t index); void -sap_print_acl(struct cdf_mac_addr *macList, uint8_t size); +sap_print_acl(struct qdf_mac_addr *macList, uint8_t size); eSapBool -sap_search_mac_list(struct cdf_mac_addr *macList, uint8_t num_mac, +sap_search_mac_list(struct qdf_mac_addr *macList, uint8_t num_mac, uint8_t *peerMac, uint8_t *index); QDF_STATUS sap_acquire_global_lock(ptSapContext pSapCtx); diff --git a/core/sap/src/sap_module.c b/core/sap/src/sap_module.c index 1e23e87492..1e2c3b887c 100644 --- a/core/sap/src/sap_module.c +++ b/core/sap/src/sap_module.c @@ -109,13 +109,13 @@ void *wlansap_open(void *p_cds_gctx) pSapCtx = (ptSapContext) cdf_mem_malloc(sizeof(tSapContext)); if (NULL == pSapCtx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from p_cds_gctx", __func__); return NULL; } /* Clean up SAP control block, initialize all values */ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "wlansap_open"); + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "wlansap_open"); wlansap_clean_cb(pSapCtx, 0); /*do not empty */ @@ -149,7 +149,7 @@ QDF_STATUS wlansap_start(void *pCtx) /*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*/ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "wlansap_start invoked successfully"); /*------------------------------------------------------------------------ Sanity check @@ -158,7 +158,7 @@ QDF_STATUS wlansap_start(void *pCtx) pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); return QDF_STATUS_E_FAULT; } @@ -186,7 +186,7 @@ QDF_STATUS wlansap_start(void *pCtx) pSapCtx->csr_roamProfile.negotiatedAuthType = eCSR_AUTH_TYPE_OPEN_SYSTEM; /* open is the default */ if (!QDF_IS_STATUS_SUCCESS(cdf_mutex_init(&pSapCtx->SapGlobalLock))) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "wlansap_start failed init lock"); return QDF_STATUS_E_FAULT; } @@ -214,12 +214,12 @@ QDF_STATUS wlansap_stop(void *pCtx) ptSapContext pSapCtx = NULL; /* Sanity check - Extract SAP control block */ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "wlansap_stop invoked successfully "); pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); return QDF_STATUS_E_FAULT; } @@ -227,7 +227,7 @@ QDF_STATUS wlansap_stop(void *pCtx) sap_free_roam_profile(&pSapCtx->csr_roamProfile); if (!QDF_IS_STATUS_SUCCESS(cdf_mutex_destroy(&pSapCtx->SapGlobalLock))) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "wlansap_stop failed destroy lock"); return QDF_STATUS_E_FAULT; } @@ -254,18 +254,18 @@ QDF_STATUS wlansap_close(void *pCtx) ptSapContext pSapCtx = NULL; /* Sanity check - Extract SAP control block */ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "wlansap_close invoked"); pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); return QDF_STATUS_E_FAULT; } /* Cleanup SAP control block */ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "wlansap_close"); /* empty queues/lists/pkts if any */ @@ -300,7 +300,7 @@ QDF_STATUS wlansap_clean_cb(ptSapContext pSapCtx, uint32_t freeFlag /* 0 / ------------------------------------------------------------------------*/ if (NULL == pSapCtx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer", __func__); return QDF_STATUS_E_FAULT; } @@ -308,7 +308,7 @@ QDF_STATUS wlansap_clean_cb(ptSapContext pSapCtx, uint32_t freeFlag /* 0 / /*------------------------------------------------------------------------ Clean up SAP control block, initialize all values ------------------------------------------------------------------------*/ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "wlansap_clean_cb"); cdf_mem_zero(pSapCtx, sizeof(tSapContext)); @@ -317,7 +317,7 @@ QDF_STATUS wlansap_clean_cb(ptSapContext pSapCtx, uint32_t freeFlag /* 0 / pSapCtx->sapsMachine = eSAP_DISCONNECTED; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "%s: Initializing State: %d, sapContext value = %p", __func__, pSapCtx->sapsMachine, pSapCtx); pSapCtx->sessionId = 0; @@ -352,7 +352,7 @@ wlansap_pmc_full_pwr_req_cb(void *callbackContext, QDF_STATUS status) if (QDF_IS_STATUS_SUCCESS(status)) { /* If success what else to be handled??? */ } else { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_FATAL, "wlansap_pmc_full_pwr_req_cb: PMC failed to put the chip in Full power"); } @@ -376,7 +376,7 @@ uint8_t wlansap_get_state(void *pCtx) pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "%s: Invalid SAP pointer from pCtx", __func__); return QDF_STATUS_E_FAULT; } @@ -407,7 +407,7 @@ uint16_t wlansap_check_cc_intf(void *Ctx) hHal = (tHalHandle) CDS_GET_HAL_CB(pSapCtx->p_cds_gctx); if (NULL == hHal) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid MAC context from p_cds_gctx", __func__); return 0; } @@ -438,13 +438,13 @@ wlansap_set_scan_acs_channel_params(tsap_Config_t *pconfig, tHalHandle h_hal = NULL; if (NULL == pconfig) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid pconfig passed ", __func__); return QDF_STATUS_E_FAULT; } if (NULL == psap_ctx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid pconfig passed ", __func__); return QDF_STATUS_E_FAULT; } @@ -469,13 +469,13 @@ wlansap_set_scan_acs_channel_params(tsap_Config_t *pconfig, /* Save a copy to SAP context */ cdf_mem_copy(psap_ctx->csr_roamProfile.BSSIDs.bssid, - pconfig->self_macaddr.bytes, CDF_MAC_ADDR_SIZE); + pconfig->self_macaddr.bytes, QDF_MAC_ADDR_SIZE); cdf_mem_copy(psap_ctx->self_mac_addr, - pconfig->self_macaddr.bytes, CDF_MAC_ADDR_SIZE); + pconfig->self_macaddr.bytes, QDF_MAC_ADDR_SIZE); h_hal = (tHalHandle)CDS_GET_HAL_CB(psap_ctx->p_cds_gctx); if (NULL == h_hal) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "%s: Invalid MAC context from pvosGCtx", __func__); } else { /* @@ -507,7 +507,7 @@ uint32_t wlan_sap_get_vht_ch_width(void *ctx) ptSapContext sap_ctx = CDS_GET_SAP_CB(ctx); if (!sap_ctx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("Invalid SAP pointer from ctx")); return 0; } @@ -529,7 +529,7 @@ void wlan_sap_set_vht_ch_width(void *ctx, uint32_t vht_channel_width) ptSapContext sap_ctx = CDS_GET_SAP_CB(ctx); if (!sap_ctx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("Invalid SAP pointer from ctx")); return; } @@ -601,11 +601,11 @@ QDF_STATUS wlansap_start_bss(void *pCtx, /* pwextCtx */ ------------------------------------------------------------------------*/ pSapCtx = CDS_GET_SAP_CB(pCtx); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "wlansap_start_bss: sapContext=%p", pSapCtx); if (NULL == pSapCtx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "%s: Invalid SAP pointer from pCtx", __func__); return QDF_STATUS_E_FAULT; @@ -632,20 +632,20 @@ QDF_STATUS wlansap_start_bss(void *pCtx, /* pwextCtx */ from Configuation ITEM received from HDD */ pSapCtx->csr_roamProfile.BSSIDs.numOfBSSIDs = 1; cdf_mem_copy(pSapCtx->csr_roamProfile.BSSIDs.bssid, - pSapCtx->self_mac_addr, sizeof(struct cdf_mac_addr)); + pSapCtx->self_mac_addr, sizeof(struct qdf_mac_addr)); /* Save a copy to SAP context */ cdf_mem_copy(pSapCtx->csr_roamProfile.BSSIDs.bssid, - pConfig->self_macaddr.bytes, CDF_MAC_ADDR_SIZE); + pConfig->self_macaddr.bytes, QDF_MAC_ADDR_SIZE); cdf_mem_copy(pSapCtx->self_mac_addr, - pConfig->self_macaddr.bytes, CDF_MAC_ADDR_SIZE); + pConfig->self_macaddr.bytes, QDF_MAC_ADDR_SIZE); /* copy the configuration items to csrProfile */ sapconvert_to_csr_profile(pConfig, eCSR_BSS_TYPE_INFRA_AP, &pSapCtx->csr_roamProfile); hHal = (tHalHandle) CDS_GET_HAL_CB(pSapCtx->p_cds_gctx); if (NULL == hHal) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "%s: Invalid MAC context from p_cds_gctx", __func__); return QDF_STATUS_E_FAULT; @@ -664,7 +664,7 @@ QDF_STATUS wlansap_start_bss(void *pCtx, /* pwextCtx */ pmac = PMAC_STRUCT(hHal); if (NULL == pmac) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "%s: Invalid MAC context from p_cds_gctx", __func__); return QDF_STATUS_E_FAULT; @@ -719,12 +719,12 @@ QDF_STATUS wlansap_set_mac_acl(void *pCtx, /* pwextCtx */ QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; ptSapContext pSapCtx = NULL; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "wlansap_set_mac_acl"); pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "%s: Invalid SAP pointer from pCtx", __func__); return QDF_STATUS_E_FAULT; @@ -776,7 +776,7 @@ QDF_STATUS wlansap_stop_bss(void *pCtx) Extract SAP control block ------------------------------------------------------------------------*/ if (NULL == pCtx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid Global CDS handle", __func__); return QDF_STATUS_E_FAULT; } @@ -784,7 +784,7 @@ QDF_STATUS wlansap_stop_bss(void *pCtx) pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); return QDF_STATUS_E_FAULT; } @@ -806,7 +806,7 @@ QDF_STATUS wlansap_stop_bss(void *pCtx) * SAP context is directly passed to SAP APIs. * @modId: Module from whom list of associtated stations is supposed to be * probed. If an invalid module is passed then by default - * CDF_MODULE_ID_PE will be probed + * QDF_MODULE_ID_PE will be probed * @pAssocStas: Pointer to list of associated stations that are known to the * module specified in mod parameter * @@ -819,7 +819,7 @@ QDF_STATUS wlansap_stop_bss(void *pCtx) */ QDF_STATUS wlansap_get_assoc_stations - (void *pCtx, CDF_MODULE_ID modId, tpSap_AssocMacAddr pAssocStas) { + (void *pCtx, QDF_MODULE_ID modId, tpSap_AssocMacAddr pAssocStas) { ptSapContext pSapCtx = CDS_GET_SAP_CB(pCtx); /*------------------------------------------------------------------------ @@ -827,7 +827,7 @@ wlansap_get_assoc_stations Extract SAP control block ------------------------------------------------------------------------*/ if (NULL == pSapCtx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); return QDF_STATUS_E_FAULT; } @@ -846,7 +846,7 @@ wlansap_get_assoc_stations * @pCtx: Pointer to the global cds context; a handle to SAP's control block * can be extracted from its context. When MBSSID feature is enabled, * SAP context is directly passed to SAP APIs. - * @pRemoveMac: pointer to struct cdf_mac_addr for session MAC address + * @pRemoveMac: pointer to struct qdf_mac_addr for session MAC address * * This api function provides for Ap App/HDD to remove an entry from session * overlap info. @@ -858,7 +858,7 @@ wlansap_get_assoc_stations */ QDF_STATUS wlansap_remove_wps_session_overlap(void *pCtx, - struct cdf_mac_addr pRemoveMac) + struct qdf_mac_addr pRemoveMac) { ptSapContext pSapCtx = CDS_GET_SAP_CB(pCtx); @@ -867,7 +867,7 @@ wlansap_remove_wps_session_overlap(void *pCtx, Extract SAP control block ------------------------------------------------------------------------*/ if (NULL == pSapCtx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); return QDF_STATUS_E_FAULT; } @@ -893,7 +893,7 @@ wlansap_remove_wps_session_overlap(void *pCtx, */ QDF_STATUS wlansap_get_wps_session_overlap(void *pCtx) { - struct cdf_mac_addr pRemoveMac = CDF_MAC_ADDR_ZERO_INITIALIZER; + struct qdf_mac_addr pRemoveMac = QDF_MAC_ADDR_ZERO_INITIALIZER; ptSapContext pSapCtx = CDS_GET_SAP_CB(pCtx); @@ -902,7 +902,7 @@ QDF_STATUS wlansap_get_wps_session_overlap(void *pCtx) Extract SAP control block ------------------------------------------------------------------------*/ if (NULL == pSapCtx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); return QDF_STATUS_E_FAULT; } @@ -921,7 +921,7 @@ QDF_STATUS wlansap_set_mode(void *pCtx, uint32_t mode) ptSapContext pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); return QDF_STATUS_E_FAULT; } @@ -936,7 +936,7 @@ QDF_STATUS wlansap_get_acl_mode(void *pCtx, eSapMacAddrACL *mode) ptSapContext pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); return QDF_STATUS_E_FAULT; } @@ -947,36 +947,36 @@ QDF_STATUS wlansap_get_acl_mode(void *pCtx, eSapMacAddrACL *mode) /* API to get ACL Accept List */ QDF_STATUS -wlansap_get_acl_accept_list(void *pCtx, struct cdf_mac_addr *pAcceptList, +wlansap_get_acl_accept_list(void *pCtx, struct qdf_mac_addr *pAcceptList, uint8_t *nAcceptList) { ptSapContext pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from p_cds_gctx", __func__); return QDF_STATUS_E_FAULT; } memcpy((void *)pAcceptList, (void *)pSapCtx->acceptMacList, - (pSapCtx->nAcceptMac * CDF_MAC_ADDR_SIZE)); + (pSapCtx->nAcceptMac * QDF_MAC_ADDR_SIZE)); *nAcceptList = pSapCtx->nAcceptMac; return QDF_STATUS_SUCCESS; } /* API to get Deny List */ QDF_STATUS -wlansap_get_acl_deny_list(void *pCtx, struct cdf_mac_addr *pDenyList, +wlansap_get_acl_deny_list(void *pCtx, struct qdf_mac_addr *pDenyList, uint8_t *nDenyList) { ptSapContext pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from p_cds_gctx", __func__); return QDF_STATUS_E_FAULT; } memcpy((void *)pDenyList, (void *)pSapCtx->denyMacList, - (pSapCtx->nDenyMac * CDF_MAC_ADDR_SIZE)); + (pSapCtx->nDenyMac * QDF_MAC_ADDR_SIZE)); *nDenyList = pSapCtx->nDenyMac; return QDF_STATUS_SUCCESS; } @@ -995,7 +995,7 @@ QDF_STATUS wlansap_clear_acl(void *pCtx) if (pSapCtx->denyMacList != NULL) { for (i = 0; i < (pSapCtx->nDenyMac - 1); i++) { cdf_mem_zero((pSapCtx->denyMacList + i)->bytes, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); } } @@ -1005,7 +1005,7 @@ QDF_STATUS wlansap_clear_acl(void *pCtx) if (pSapCtx->acceptMacList != NULL) { for (i = 0; i < (pSapCtx->nAcceptMac - 1); i++) { cdf_mem_zero((pSapCtx->acceptMacList + i)->bytes, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); } } @@ -1038,19 +1038,19 @@ wlansap_modify_acl ptSapContext sap_ctx = CDS_GET_SAP_CB(ctx); if (NULL == sap_ctx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP Context", __func__); return QDF_STATUS_E_FAULT; } - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, "Modify ACL entered\n" "Before modification of ACL\n" "size of accept and deny lists %d %d", sap_ctx->nAcceptMac, sap_ctx->nDenyMac); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "*** WHITE LIST ***"); sap_print_acl(sap_ctx->acceptMacList, sap_ctx->nAcceptMac); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "*** BLACK LIST ***"); sap_print_acl(sap_ctx->denyMacList, sap_ctx->nDenyMac); @@ -1064,7 +1064,7 @@ wlansap_modify_acl peer_sta_mac, &staBLIndex); if (sta_white_list && sta_black_list) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "Peer mac " MAC_ADDRESS_STR " found in white and black lists." "Initial lists passed incorrect. Cannot execute this command.", @@ -1072,7 +1072,7 @@ wlansap_modify_acl return QDF_STATUS_E_FAILURE; } - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, "cmd %d", cmd); switch (list_type) { @@ -1081,7 +1081,7 @@ wlansap_modify_acl /* error check */ /* if list is already at max, return failure */ if (sap_ctx->nAcceptMac == MAX_ACL_MAC_ADDRESS) { - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "White list is already maxed out. Cannot accept " MAC_ADDRESS_STR, @@ -1090,7 +1090,7 @@ wlansap_modify_acl } if (sta_white_list) { /* Do nothing if already present in white list. Just print a warning */ - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_WARN, "MAC address already present in white list " MAC_ADDRESS_STR, @@ -1099,7 +1099,7 @@ wlansap_modify_acl } if (sta_black_list) { /* remove it from black list before adding to the white list */ - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_WARN, "STA present in black list so first remove from it"); sap_remove_mac_from_acl(sap_ctx-> @@ -1107,13 +1107,13 @@ wlansap_modify_acl &sap_ctx->nDenyMac, staBLIndex); } - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "... Now add to the white list"); sap_add_mac_to_acl(sap_ctx->acceptMacList, &sap_ctx->nAcceptMac, peer_sta_mac); - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, "size of accept and deny lists %d %d", sap_ctx->nAcceptMac, @@ -1123,7 +1123,7 @@ wlansap_modify_acl struct tagCsrDelStaParams delStaParams; - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "Delete from white list"); sap_remove_mac_from_acl(sap_ctx->acceptMacList, @@ -1135,13 +1135,13 @@ wlansap_modify_acl (SIR_MAC_MGMT_DEAUTH >> 4), &delStaParams); wlansap_deauth_sta(ctx, &delStaParams); - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, "size of accept and deny lists %d %d", sap_ctx->nAcceptMac, sap_ctx->nDenyMac); } else { - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_WARN, "MAC address to be deleted is not present in the white list " MAC_ADDRESS_STR, @@ -1149,7 +1149,7 @@ wlansap_modify_acl return QDF_STATUS_E_FAILURE; } } else { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "Invalid cmd type passed"); return QDF_STATUS_E_FAILURE; } @@ -1162,7 +1162,7 @@ wlansap_modify_acl /* error check */ /* if list is already at max, return failure */ if (sap_ctx->nDenyMac == MAX_ACL_MAC_ADDRESS) { - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "Black list is already maxed out. Cannot accept " MAC_ADDRESS_STR, @@ -1171,7 +1171,7 @@ wlansap_modify_acl } if (sta_black_list) { /* Do nothing if already present in white list */ - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_WARN, "MAC address already present in black list " MAC_ADDRESS_STR, @@ -1180,7 +1180,7 @@ wlansap_modify_acl } if (sta_white_list) { /* remove it from white list before adding to the black list */ - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_WARN, "Present in white list so first remove from it"); sap_remove_mac_from_acl(sap_ctx-> @@ -1195,31 +1195,31 @@ wlansap_modify_acl (SIR_MAC_MGMT_DEAUTH >> 4), &delStaParams); wlansap_deauth_sta(ctx, &delStaParams); - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "... Now add to black list"); sap_add_mac_to_acl(sap_ctx->denyMacList, &sap_ctx->nDenyMac, peer_sta_mac); - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, "size of accept and deny lists %d %d", sap_ctx->nAcceptMac, sap_ctx->nDenyMac); } else if (cmd == DELETE_STA_FROM_ACL) { if (sta_black_list) { - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "Delete from black list"); sap_remove_mac_from_acl(sap_ctx->denyMacList, &sap_ctx->nDenyMac, staBLIndex); - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, "no accept and deny mac %d %d", sap_ctx->nAcceptMac, sap_ctx->nDenyMac); } else { - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_WARN, "MAC address to be deleted is not present in the black list " MAC_ADDRESS_STR, @@ -1227,7 +1227,7 @@ wlansap_modify_acl return QDF_STATUS_E_FAILURE; } } else { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "Invalid cmd type passed"); return QDF_STATUS_E_FAILURE; } @@ -1235,17 +1235,17 @@ wlansap_modify_acl default: { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "Invalid list type passed %d", list_type); return QDF_STATUS_E_FAILURE; } } - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, "After modification of ACL"); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "*** WHITE LIST ***"); sap_print_acl(sap_ctx->acceptMacList, sap_ctx->nAcceptMac); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "*** BLACK LIST ***"); sap_print_acl(sap_ctx->denyMacList, sap_ctx->nDenyMac); return QDF_STATUS_SUCCESS; @@ -1272,7 +1272,7 @@ QDF_STATUS wlansap_disassoc_sta(void *pCtx, const uint8_t *pPeerStaMac) Extract SAP control block ------------------------------------------------------------------------*/ if (NULL == pSapCtx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); return QDF_STATUS_E_FAULT; } @@ -1308,7 +1308,7 @@ QDF_STATUS wlansap_deauth_sta(void *pCtx, Extract SAP control block ------------------------------------------------------------------------*/ if (NULL == pSapCtx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); return qdf_status; } @@ -1370,7 +1370,7 @@ static QDF_STATUS wlansap_update_csa_channel_params(ptSapContext sap_context, hal = CDS_GET_HAL_CB(sap_context->p_cds_gctx); if (!hal) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid hal pointer from p_cds_gctx", __func__); return QDF_STATUS_E_FAULT; } @@ -1449,7 +1449,7 @@ wlansap_set_channel_change_with_csa(void *p_cds_gctx, uint32_t targetChannel, sapContext = CDS_GET_SAP_CB(p_cds_gctx); if (NULL == sapContext) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from p_cds_gctx", __func__); return QDF_STATUS_E_FAULT; @@ -1457,7 +1457,7 @@ wlansap_set_channel_change_with_csa(void *p_cds_gctx, uint32_t targetChannel, hHal = CDS_GET_HAL_CB(sapContext->p_cds_gctx); if (NULL == hHal) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid HAL pointer from p_cds_gctx", __func__); return QDF_STATUS_E_FAULT; } @@ -1480,7 +1480,7 @@ wlansap_set_channel_change_with_csa(void *p_cds_gctx, uint32_t targetChannel, valid = wlan_sap_validate_channel_switch(hHal, targetChannel, sapContext); if (!valid) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("Channel switch to %u is not allowed due to concurrent channel interference"), targetChannel); return QDF_STATUS_E_FAULT; @@ -1520,7 +1520,7 @@ wlansap_set_channel_change_with_csa(void *p_cds_gctx, uint32_t targetChannel, * user input is used for the bandwidth */ if (target_bw != CH_WIDTH_MAX) { - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s: target bw:%d new width:%d", __func__, target_bw, @@ -1528,7 +1528,7 @@ wlansap_set_channel_change_with_csa(void *p_cds_gctx, uint32_t targetChannel, new_ch_params.ch_width); pMac->sap.SapDfsInfo.new_ch_params.ch_width = pMac->sap.SapDfsInfo.new_chanWidth = - CDF_MIN(pMac->sap.SapDfsInfo. + QDF_MIN(pMac->sap.SapDfsInfo. new_ch_params.ch_width, target_bw); } @@ -1571,21 +1571,21 @@ wlansap_set_channel_change_with_csa(void *p_cds_gctx, uint32_t targetChannel, sap_fsm(sapContext, &sapEvent); } else { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Failed to request Channel Change, since" "SAP is not in eSAP_STARTED state", __func__); return QDF_STATUS_E_FAULT; } } else { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Channel = %d is not valid in the current" "regulatory domain", __func__, targetChannel); return QDF_STATUS_E_FAULT; } - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "%s: Posted eSAP_DFS_CHNL_SWITCH_ANNOUNCEMENT_START" "successfully to sap_fsm for Channel = %d", __func__, targetChannel); @@ -1624,7 +1624,7 @@ QDF_STATUS wlansap_set_counter_measure(void *pCtx, bool bEnable) Extract SAP control block ------------------------------------------------------------------------*/ if (NULL == pSapCtx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); return QDF_STATUS_E_FAULT; } @@ -1657,14 +1657,14 @@ QDF_STATUS wlansap_set_key_sta(void *pCtx, tCsrRoamSetKey *pSetKeyInfo) pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); return QDF_STATUS_E_FAULT; } hHal = CDS_GET_HAL_CB(pSapCtx->p_cds_gctx); if (NULL == hHal) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid HAL pointer from p_cds_gctx", __func__); return QDF_STATUS_E_FAULT; @@ -1702,7 +1702,7 @@ wlan_sap_getstation_ie_information sap_ctx = CDS_GET_SAP_CB(ctx); if (NULL == sap_ctx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("Invalid SAP pointer from pCtx")); return QDF_STATUS_E_FAULT; } @@ -1710,13 +1710,13 @@ wlan_sap_getstation_ie_information if (len) { ie_len = *len; *len = sap_ctx->nStaWPARSnReqIeLength; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, FL("WPAIE len : %x"), *len); if ((buf) && (ie_len >= sap_ctx->nStaWPARSnReqIeLength)) { cdf_mem_copy(buf, sap_ctx->pStaWpaRsnReqIE, sap_ctx->nStaWPARSnReqIeLength); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, FL("WPAIE: %02x:%02x:%02x:%02x:%02x:%02x"), buf[0], buf[1], buf[2], buf[3], buf[4], buf[5]); @@ -1743,12 +1743,12 @@ QDF_STATUS wlansap_set_wps_ie(void *pCtx, tSap_WPSIE *pSap_WPSIe) ptSapContext pSapCtx = NULL; void *hHal = NULL; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s, %d", __func__, __LINE__); pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); return QDF_STATUS_E_FAULT; @@ -1756,7 +1756,7 @@ QDF_STATUS wlansap_set_wps_ie(void *pCtx, tSap_WPSIE *pSap_WPSIe) hHal = CDS_GET_HAL_CB(pSapCtx->p_cds_gctx); if (NULL == hHal) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid HAL pointer from p_cds_gctx", __func__); return QDF_STATUS_E_FAULT; @@ -1803,12 +1803,12 @@ QDF_STATUS wlansap_update_wps_ie(void *pCtx) QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; void *hHal = NULL; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s, %d", __func__, __LINE__); pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); return QDF_STATUS_E_FAULT; @@ -1816,7 +1816,7 @@ QDF_STATUS wlansap_update_wps_ie(void *pCtx) hHal = CDS_GET_HAL_CB(pSapCtx->p_cds_gctx); if (NULL == hHal) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid HAL pointer from p_cds_gctx", __func__); return QDF_STATUS_E_FAULT; @@ -1852,12 +1852,12 @@ QDF_STATUS wlansap_get_wps_state(void *pCtx, bool *bWPSState) ptSapContext pSapCtx = NULL; void *hHal = NULL; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s, %d", __func__, __LINE__); pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); return QDF_STATUS_E_FAULT; @@ -1865,7 +1865,7 @@ QDF_STATUS wlansap_get_wps_state(void *pCtx, bool *bWPSState) hHal = CDS_GET_HAL_CB(pSapCtx->p_cds_gctx); if (NULL == hHal) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid HAL pointer from p_cds_gctx", __func__); return QDF_STATUS_E_FAULT; @@ -1931,7 +1931,7 @@ QDF_STATUS wlansap_set_wparsn_ies pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); return QDF_STATUS_E_FAULT; @@ -1939,7 +1939,7 @@ QDF_STATUS wlansap_set_wparsn_ies hHal = CDS_GET_HAL_CB(pSapCtx->p_cds_gctx); if (NULL == hHal) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid HAL pointer from p_cds_gctx", __func__); return QDF_STATUS_E_FAULT; @@ -1983,14 +1983,14 @@ QDF_STATUS wlansap_send_action(void *pCtx, const uint8_t *pBuf, pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); return QDF_STATUS_E_FAULT; } hHal = CDS_GET_HAL_CB(pSapCtx->p_cds_gctx); if ((NULL == hHal) || (eSAP_TRUE != pSapCtx->isSapSessionOpen)) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: HAL pointer (%p) NULL OR SME session is not open (%d)", __func__, hHal, pSapCtx->isSapSessionOpen); return QDF_STATUS_E_FAULT; @@ -2004,7 +2004,7 @@ QDF_STATUS wlansap_send_action(void *pCtx, const uint8_t *pBuf, return QDF_STATUS_SUCCESS; } - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "Failed to Send Action Frame"); return QDF_STATUS_E_FAULT; @@ -2037,14 +2037,14 @@ QDF_STATUS wlansap_remain_on_channel(void *pCtx, pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); return QDF_STATUS_E_FAULT; } hHal = CDS_GET_HAL_CB(pSapCtx->p_cds_gctx); if ((NULL == hHal) || (eSAP_TRUE != pSapCtx->isSapSessionOpen)) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: HAL pointer (%p) NULL OR SME session is not open (%d)", __func__, hHal, pSapCtx->isSapSessionOpen); return QDF_STATUS_E_FAULT; @@ -2058,7 +2058,7 @@ QDF_STATUS wlansap_remain_on_channel(void *pCtx, return QDF_STATUS_SUCCESS; } - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "Failed to Set Remain on Channel"); return QDF_STATUS_E_FAULT; @@ -2084,7 +2084,7 @@ QDF_STATUS wlansap_cancel_remain_on_channel(void *pCtx, pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); return QDF_STATUS_E_FAULT; @@ -2092,7 +2092,7 @@ QDF_STATUS wlansap_cancel_remain_on_channel(void *pCtx, hHal = CDS_GET_HAL_CB(pSapCtx->p_cds_gctx); if ((NULL == hHal) || (eSAP_TRUE != pSapCtx->isSapSessionOpen)) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: HAL pointer (%p) NULL OR SME session is not open (%d)", __func__, hHal, pSapCtx->isSapSessionOpen); return QDF_STATUS_E_FAULT; @@ -2106,7 +2106,7 @@ QDF_STATUS wlansap_cancel_remain_on_channel(void *pCtx, return QDF_STATUS_SUCCESS; } - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "Failed to Cancel Remain on Channel"); return QDF_STATUS_E_FAULT; @@ -2135,14 +2135,14 @@ QDF_STATUS wlansap_register_mgmt_frame pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); return QDF_STATUS_E_FAULT; } hHal = CDS_GET_HAL_CB(pSapCtx->p_cds_gctx); if ((NULL == hHal) || (eSAP_TRUE != pSapCtx->isSapSessionOpen)) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: HAL pointer (%p) NULL OR SME session is not open (%d)", __func__, hHal, pSapCtx->isSapSessionOpen); return QDF_STATUS_E_FAULT; @@ -2156,7 +2156,7 @@ QDF_STATUS wlansap_register_mgmt_frame return QDF_STATUS_SUCCESS; } - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "Failed to Register MGMT frame"); return QDF_STATUS_E_FAULT; @@ -2185,14 +2185,14 @@ QDF_STATUS wlansap_de_register_mgmt_frame pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); return QDF_STATUS_E_FAULT; } hHal = CDS_GET_HAL_CB(pSapCtx->p_cds_gctx); if ((NULL == hHal) || (eSAP_TRUE != pSapCtx->isSapSessionOpen)) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: HAL pointer (%p) NULL OR SME session is not open (%d)", __func__, hHal, pSapCtx->isSapSessionOpen); return QDF_STATUS_E_FAULT; @@ -2206,7 +2206,7 @@ QDF_STATUS wlansap_de_register_mgmt_frame return QDF_STATUS_SUCCESS; } - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "Failed to Deregister MGMT frame"); return QDF_STATUS_E_FAULT; @@ -2251,14 +2251,14 @@ wlansap_channel_change_request(void *pSapCtx, uint8_t target_channel) sapContext = (ptSapContext) pSapCtx; if (NULL == sapContext) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer", __func__); return QDF_STATUS_E_FAULT; } hHal = CDS_GET_HAL_CB(sapContext->p_cds_gctx); if (NULL == hHal) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid HAL pointer from p_cds_gctx", __func__); return QDF_STATUS_E_FAULT; } @@ -2328,14 +2328,14 @@ QDF_STATUS wlansap_start_beacon_req(void *pSapCtx) sapContext = (ptSapContext) pSapCtx; if (NULL == sapContext) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer", __func__); return QDF_STATUS_E_FAULT; } hHal = CDS_GET_HAL_CB(sapContext->p_cds_gctx); if (NULL == hHal) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid HAL pointer from p_cds_gctx", __func__); return QDF_STATUS_E_FAULT; } @@ -2385,14 +2385,14 @@ QDF_STATUS wlansap_dfs_send_csa_ie_request(void *pSapCtx) sapContext = (ptSapContext) pSapCtx; if (NULL == sapContext) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer", __func__); return QDF_STATUS_E_FAULT; } hHal = CDS_GET_HAL_CB(sapContext->p_cds_gctx); if (NULL == hHal) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid HAL pointer from p_cds_gctx", __func__); return QDF_STATUS_E_FAULT; } @@ -2439,7 +2439,7 @@ QDF_STATUS wlansap_get_dfs_ignore_cac(tHalHandle hHal, uint8_t *pIgnore_cac) if (NULL != hHal) { pMac = PMAC_STRUCT(hHal); } else { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid hHal pointer", __func__); return QDF_STATUS_E_FAULT; } @@ -2476,7 +2476,7 @@ QDF_STATUS wlansap_set_dfs_ignore_cac(tHalHandle hHal, uint8_t ignore_cac) if (NULL != hHal) { pMac = PMAC_STRUCT(hHal); } else { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid hHal pointer", __func__); return QDF_STATUS_E_FAULT; } @@ -2506,7 +2506,7 @@ wlansap_set_dfs_restrict_japan_w53(tHalHandle hHal, uint8_t disable_Dfs_W53) if (NULL != hHal) { pMac = PMAC_STRUCT(hHal); } else { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid hHal pointer", __func__); return QDF_STATUS_E_FAULT; } @@ -2519,14 +2519,14 @@ wlansap_set_dfs_restrict_japan_w53(tHalHandle hHal, uint8_t disable_Dfs_W53) */ if (DFS_MKK4_DOMAIN == dfs_region) { pMac->sap.SapDfsInfo.is_dfs_w53_disabled = disable_Dfs_W53; - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, FL("sapdfs: SET DFS JAPAN W53 DISABLED = %d"), pMac->sap.SapDfsInfo.is_dfs_w53_disabled); status = QDF_STATUS_SUCCESS; } else { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL ("Regdomain not japan, set disable JP W53 not valid")); @@ -2553,7 +2553,7 @@ wlan_sap_set_channel_avoidance(tHalHandle hal, bool sap_channel_avoidance) if (NULL != hal) mac_ctx = PMAC_STRUCT(hal); if (mac_ctx == NULL || hal == NULL) { - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("hal or mac_ctx pointer NULL")); return QDF_STATUS_E_FAULT; @@ -2590,7 +2590,7 @@ wlansap_set_dfs_preferred_channel_location(tHalHandle hHal, if (NULL != hHal) { pMac = PMAC_STRUCT(hHal); } else { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid hHal pointer", __func__); return QDF_STATUS_E_FAULT; } @@ -2605,7 +2605,7 @@ wlansap_set_dfs_preferred_channel_location(tHalHandle hHal, if (DFS_MKK4_DOMAIN == dfs_region) { pMac->sap.SapDfsInfo.sap_operating_chan_preferred_location = dfs_Preferred_Channels_location; - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, FL ("sapdfs:Set Preferred Operating Channel location=%d"), @@ -2614,7 +2614,7 @@ wlansap_set_dfs_preferred_channel_location(tHalHandle hHal, status = QDF_STATUS_SUCCESS; } else { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL ("sapdfs:NOT JAPAN REG, Invalid Set preferred chans location")); @@ -2653,7 +2653,7 @@ QDF_STATUS wlansap_set_dfs_target_chnl(tHalHandle hHal, uint8_t target_channel) if (NULL != hHal) { pMac = PMAC_STRUCT(hHal); } else { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid hHal pointer", __func__); return QDF_STATUS_E_FAULT; } @@ -2688,7 +2688,7 @@ wlansap_update_sap_config_add_ie(tsap_Config_t *pConfig, bufferLength = additionIELength; pBuffer = cdf_mem_malloc(bufferLength); if (NULL == pBuffer) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Could not allocate the buffer ")); return QDF_STATUS_E_NOMEM; @@ -2707,7 +2707,7 @@ wlansap_update_sap_config_add_ie(tsap_Config_t *pConfig, cdf_mem_free(pConfig->pProbeRespBcnIEsBuffer); pConfig->probeRespBcnIEsLen = 0; pConfig->pProbeRespBcnIEsBuffer = NULL; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL ("No Probe Resp beacone IE received in set beacon")); } @@ -2720,7 +2720,7 @@ wlansap_update_sap_config_add_ie(tsap_Config_t *pConfig, cdf_mem_free(pConfig->pProbeRespIEsBuffer); pConfig->probeRespIEsBufferLen = 0; pConfig->pProbeRespIEsBuffer = NULL; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL ("No Probe Response IE received in set beacon")); } @@ -2733,13 +2733,13 @@ wlansap_update_sap_config_add_ie(tsap_Config_t *pConfig, cdf_mem_free(pConfig->pAssocRespIEsBuffer); pConfig->assocRespIEsLen = 0; pConfig->pAssocRespIEsBuffer = NULL; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL ("No Assoc Response IE received in set beacon")); } break; default: - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("No matching buffer type %d"), updateType); if (pBuffer != NULL) cdf_mem_free(pBuffer); @@ -2753,7 +2753,7 @@ QDF_STATUS wlansap_reset_sap_config_add_ie(tsap_Config_t *pConfig, eUpdateIEsType updateType) { if (NULL == pConfig) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid Config pointer", __func__); return QDF_STATUS_E_FAULT; } @@ -2783,7 +2783,7 @@ wlansap_reset_sap_config_add_ie(tsap_Config_t *pConfig, eUpdateIEsType updateTyp default: if (eUPDATE_IE_ALL != updateType) - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("Invalid buffer type %d"), updateType); break; } @@ -2893,20 +2893,20 @@ QDF_STATUS wlansap_get_dfs_nol(void *pSapCtx) bool bAvailable = false; if (NULL == sapContext) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from p_cds_gctx", __func__); return QDF_STATUS_E_FAULT; } hHal = CDS_GET_HAL_CB(sapContext->p_cds_gctx); if (NULL == hHal) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid HAL pointer from p_cds_gctx", __func__); return QDF_STATUS_E_FAULT; } pMac = PMAC_STRUCT(hHal); if (!pMac->sap.SapDfsInfo.numCurrentRegDomainDfsChannels) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s: DFS NOL is empty", __func__); return QDF_STATUS_SUCCESS; } @@ -2914,7 +2914,7 @@ QDF_STATUS wlansap_get_dfs_nol(void *pSapCtx) dfs_nol = pMac->sap.SapDfsInfo.sapDfsChannelNolList; if (!dfs_nol) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s: DFS NOL context is null", __func__); return QDF_STATUS_E_FAULT; } @@ -2944,7 +2944,7 @@ QDF_STATUS wlansap_get_dfs_nol(void *pSapCtx) eSAP_DFS_CHANNEL_AVAILABLE; dfs_nol[i].radar_found_timestamp = 0; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Channel[%d] is AVAILABLE", __func__, dfs_nol[i].dfs_channel_number); } else { @@ -2953,7 +2953,7 @@ QDF_STATUS wlansap_get_dfs_nol(void *pSapCtx) left_time = SAP_DFS_NON_OCCUPANCY_PERIOD - elapsed_time; left_time = left_time / (60 * 1000 * 1000); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Channel[%d] is UNAVAILABLE [%lu min left]", __func__, dfs_nol[i].dfs_channel_number, left_time); @@ -2991,26 +2991,26 @@ QDF_STATUS wlansap_set_dfs_nol(void *pSapCtx, eSapDfsNolType conf) tpAniSirGlobal pMac = NULL; if (NULL == sapContext) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from p_cds_gctx", __func__); return QDF_STATUS_E_FAULT; } hHal = CDS_GET_HAL_CB(sapContext->p_cds_gctx); if (NULL == hHal) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid HAL pointer from p_cds_gctx", __func__); return QDF_STATUS_E_FAULT; } pMac = PMAC_STRUCT(hHal); if (!pMac->sap.SapDfsInfo.numCurrentRegDomainDfsChannels) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s: DFS NOL is empty", __func__); return QDF_STATUS_SUCCESS; } if (conf == eSAP_DFS_NOL_CLEAR) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: clear the DFS NOL", __func__); for (i = 0; @@ -3027,7 +3027,7 @@ QDF_STATUS wlansap_set_dfs_nol(void *pSapCtx, eSapDfsNolType conf) sapDfsChannelNolList[i].radar_found_timestamp = 0; } } else if (conf == eSAP_DFS_NOL_RANDOMIZE) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Randomize the DFS NOL", __func__); /* random 1/0 to decide to put the channel into NOL */ @@ -3063,7 +3063,7 @@ QDF_STATUS wlansap_set_dfs_nol(void *pSapCtx, eSapDfsNolType conf) [i].radar_found_timestamp = 0; } - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Set channel[%d] %s", __func__, pMac->sap.SapDfsInfo.sapDfsChannelNolList[i] @@ -3074,7 +3074,7 @@ QDF_STATUS wlansap_set_dfs_nol(void *pSapCtx, eSapDfsNolType conf) "AVAILABLE"); } } else { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: unsupport type %d", __func__, conf); } @@ -3106,7 +3106,7 @@ void wlansap_populate_del_sta_params(const uint8_t *mac, cdf_set_macaddr_broadcast(&pDelStaParams->peerMacAddr); else cdf_mem_copy(pDelStaParams->peerMacAddr.bytes, mac, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); if (reason_code == 0) pDelStaParams->reason_code = eSIR_MAC_DEAUTH_LEAVING_BSS_REASON; @@ -3119,7 +3119,7 @@ void wlansap_populate_del_sta_params(const uint8_t *mac, else pDelStaParams->subtype = (SIR_MAC_MGMT_DEAUTH >> 4); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, FL( "Delete STA with RC:%hu subtype:%hhu MAC::" MAC_ADDRESS_STR), @@ -3155,7 +3155,7 @@ wlansap_acs_chselect(void *pvos_gctx, sap_context = CDS_GET_SAP_CB(pvos_gctx); if (NULL == sap_context) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pvos_gctx", __func__); return QDF_STATUS_E_FAULT; @@ -3163,13 +3163,13 @@ wlansap_acs_chselect(void *pvos_gctx, h_hal = (tHalHandle)CDS_GET_HAL_CB(sap_context->p_cds_gctx); if (NULL == h_hal) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid MAC context from pvosGCtx", __func__); return QDF_STATUS_E_FAULT; } if (sap_context->isSapSessionOpen == eSAP_TRUE) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_FATAL, "%s:SME Session is already opened\n", __func__); return QDF_STATUS_E_EXISTS; } @@ -3192,7 +3192,7 @@ wlansap_acs_chselect(void *pvos_gctx, pusr_context); if (QDF_STATUS_SUCCESS == - cds_get_vdev_types(CDF_STA_MODE, &type, &subType)) { + cds_get_vdev_types(QDF_STA_MODE, &type, &subType)) { /* * Open SME Session for scan */ @@ -3201,7 +3201,7 @@ wlansap_acs_chselect(void *pvos_gctx, sap_context->self_mac_addr, &sap_context->sessionId, type, subType)) { - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "Error: In %s calling sme_OpenSession", __func__); @@ -3237,7 +3237,7 @@ wlansap_acs_chselect(void *pvos_gctx, qdf_status = sap_goto_channel_sel(sap_context, NULL, true); if (QDF_STATUS_E_ABORTED == qdf_status) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "In %s,DFS not supported in the current operating mode", __func__); return QDF_STATUS_E_FAILURE; @@ -3247,9 +3247,9 @@ wlansap_acs_chselect(void *pvos_gctx, * failed or ACS is overridden due to other constrainst * So send selected channel to HDD */ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("Scan Req Failed/ACS Overridden")); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("Selected channel = %d"), sap_context->channel); if (sap_context->isScanSessionOpen == eSAP_TRUE) { @@ -3265,7 +3265,7 @@ wlansap_acs_chselect(void *pvos_gctx, sap_context->isScanSessionOpen = eSAP_FALSE; else - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "ACS Scan Session close fail"); sap_context->sessionId = 0xff; @@ -3275,7 +3275,7 @@ wlansap_acs_chselect(void *pvos_gctx, eSAP_ACS_CHANNEL_SELECTED, (void *) eSAP_STATUS_SUCCESS); } else if (QDF_STATUS_SUCCESS == qdf_status) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("Successfully Issued a Pre Start Bss Scan Request")); } } @@ -3316,7 +3316,7 @@ wlansap_get_phymode(void *pctx) sap_context = CDS_GET_SAP_CB(pctx); if (NULL == sap_context) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pctx", __func__); return eCSR_DOT11_MODE_AUTO; } diff --git a/core/sme/inc/csr_api.h b/core/sme/inc/csr_api.h index 3493465496..a359244f55 100644 --- a/core/sme/inc/csr_api.h +++ b/core/sme/inc/csr_api.h @@ -245,7 +245,7 @@ typedef struct tagCsrSSIDs { typedef struct tagCsrBSSIDs { uint32_t numOfBSSIDs; - struct cdf_mac_addr *bssid; + struct qdf_mac_addr *bssid; } tCsrBSSIDs; typedef struct tagCsrStaParams { @@ -267,7 +267,7 @@ typedef struct tagCsrStaParams { typedef struct tagCsrScanRequest { tSirScanType scanType; - struct cdf_mac_addr bssid; + struct qdf_mac_addr bssid; eCsrRoamBssType BSSType; tCsrSSIDs SSIDs; tCsrChannelInfo ChannelInfo; @@ -291,7 +291,7 @@ typedef struct tagCsrScanResultInfo { */ void *pvIes; tAniSSID ssId; - v_TIME_t timer; /* timer is variable for hidden SSID timer */ + unsigned long timer; /* timer is variable for hidden SSID timer */ /* * This member must be the last in the structure because the * end of tSirBssDescription is an @@ -385,7 +385,7 @@ typedef struct tagCsrScanResultFilter { */ uint8_t scan_filter_for_roam; struct sCsrChannel_ pcl_channels; - enum tCDF_ADAPTER_MODE csrPersona; + enum tQDF_ADAPTER_MODE csrPersona; } tCsrScanResultFilter; typedef struct sCsrChnPower_ { @@ -804,23 +804,23 @@ enum csr_hi_rssi_scan_id { }; typedef struct tagPmkidCandidateInfo { - struct cdf_mac_addr BSSID; + struct qdf_mac_addr BSSID; bool preAuthSupported; } tPmkidCandidateInfo; typedef struct tagPmkidCacheInfo { - struct cdf_mac_addr BSSID; + struct qdf_mac_addr BSSID; uint8_t PMKID[CSR_RSN_PMKID_SIZE]; } tPmkidCacheInfo; #ifdef FEATURE_WLAN_WAPI typedef struct tagBkidCandidateInfo { - struct cdf_mac_addr BSSID; + struct qdf_mac_addr BSSID; bool preAuthSupported; } tBkidCandidateInfo; typedef struct tagBkidCacheInfo { - struct cdf_mac_addr BSSID; + struct qdf_mac_addr BSSID; uint8_t BKID[CSR_WAPI_BKID_SIZE]; } tBkidCacheInfo; #endif /* FEATURE_WLAN_WAPI */ @@ -925,7 +925,7 @@ typedef struct tagCsrRoamProfile { uint16_t cfg_protection; uint8_t wps_state; tCsrMobilityDomainInfo MDID; - enum tCDF_ADAPTER_MODE csrPersona; + enum tQDF_ADAPTER_MODE csrPersona; uint8_t disableDFSChSwitch; /* addIe params */ tSirAddIeParams addIeParams; @@ -951,7 +951,7 @@ typedef struct tagCsrRoamConnectedProfile { tSirMacSSid SSID; bool handoffPermitted; bool ssidHidden; - struct cdf_mac_addr bssid; + struct qdf_mac_addr bssid; eCsrRoamBssType BSSType; eCsrAuthType AuthType; tCsrAuthList AuthInfo; @@ -1253,12 +1253,12 @@ typedef struct tagCsrRoamInfo { uint8_t *pbFrames; bool fReassocReq; /* set to true if for re-association */ bool fReassocRsp; /* set to true if for re-association */ - struct cdf_mac_addr bssid; + struct qdf_mac_addr bssid; /* * Only valid in IBSS. this is the peers MAC address for * eCSR_ROAM_RESULT_IBSS_NEW_PEER or PEER_DEPARTED */ - struct cdf_mac_addr peerMac; + struct qdf_mac_addr peerMac; tSirResultCodes statusCode; /* this'd be our own defined or sent from otherBSS(per 802.11spec) */ uint32_t reasonCode; @@ -1447,7 +1447,7 @@ typedef struct tagCsrPerStaStatsInfo { typedef struct tagCsrRoamSetKey { eCsrEncryptionType encType; tAniKeyDirection keyDirection; /* Tx, Rx or Tx-and-Rx */ - struct cdf_mac_addr peerMac; /* Peer MAC. ALL 1's for group key */ + struct qdf_mac_addr peerMac; /* Peer MAC. ALL 1's for group key */ uint8_t paeRole; /* 0 for supplicant */ uint8_t keyId; /* Key index */ uint16_t keyLength; /* Number of bytes containing the key in pKey */ @@ -1457,7 +1457,7 @@ typedef struct tagCsrRoamSetKey { typedef struct tagCsrRoamRemoveKey { eCsrEncryptionType encType; - struct cdf_mac_addr peerMac; /* Peer MAC. ALL 1's for group key */ + struct qdf_mac_addr peerMac; /* Peer MAC. ALL 1's for group key */ uint8_t keyId; /* key index */ } tCsrRoamRemoveKey; @@ -1497,7 +1497,7 @@ typedef enum { } handoff_src; typedef struct tagCsrHandoffRequest { - struct cdf_mac_addr bssid; + struct qdf_mac_addr bssid; uint8_t channel; uint8_t src; /* To check if its a REASSOC or a FASTREASSOC IOCTL */ } tCsrHandoffRequest; @@ -1517,7 +1517,7 @@ typedef struct tagCsrEseBeaconReq { #endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */ struct tagCsrDelStaParams { - struct cdf_mac_addr peerMacAddr; + struct qdf_mac_addr peerMacAddr; uint16_t reason_code; uint8_t subtype; }; diff --git a/core/sme/inc/csr_internal.h b/core/sme/inc/csr_internal.h index 1ce8679700..1c2aa01cc7 100644 --- a/core/sme/inc/csr_internal.h +++ b/core/sme/inc/csr_internal.h @@ -295,7 +295,7 @@ typedef struct tagScanProfile { uint8_t bReturnAfter1stMatch; uint8_t fUniqueResult; uint8_t freshScan; - struct cdf_mac_addr bssid; + struct qdf_mac_addr bssid; } tScanProfile; typedef struct tagBssConfigParam { @@ -327,7 +327,7 @@ typedef struct tagCsrRoamStartBssParams { * This is the BSSID for the party we want to * join (only use for IBSS or WDS). */ - struct cdf_mac_addr bssid; + struct qdf_mac_addr bssid; tSirNwType sirNwType; ePhyChanBondState cbMode; tSirMacRateSet operationalRateSet; @@ -346,7 +346,7 @@ typedef struct tagCsrRoamStartBssParams { uint8_t ApUapsdEnable; uint8_t ssidHidden; uint8_t wps_state; - enum tCDF_ADAPTER_MODE bssPersona; + enum tQDF_ADAPTER_MODE bssPersona; uint16_t nRSNIELength; /* If 0, pRSNIE is ignored. */ uint8_t *pRSNIE; /* If not null, it has IE byte stream for RSN */ /* Flag used to indicate update beaconInterval */ @@ -409,7 +409,7 @@ typedef struct tagSetKeyCmd { eCsrEncryptionType encType; eCsrAuthType authType; tAniKeyDirection keyDirection; /* Tx, Rx or Tx-and-Rx */ - struct cdf_mac_addr peermac; /* Peer's MAC address. ALL 1's for group key */ + struct qdf_mac_addr peermac; /* Peer's MAC address. ALL 1's for group key */ uint8_t paeRole; /* 0 for supplicant */ uint8_t keyId; /* Kye index */ uint8_t keyLength; /* Number of bytes containing the key in pKey */ @@ -429,7 +429,7 @@ typedef struct tagWmStatusChangeCmd { typedef struct tagAddStaForSessionCmd { /* Session self mac addr */ tSirMacAddr selfMacAddr; - enum tCDF_ADAPTER_MODE currDeviceMode; + enum tQDF_ADAPTER_MODE currDeviceMode; uint32_t type; uint32_t subType; uint8_t sessionId; @@ -706,7 +706,7 @@ typedef struct tagCsrScanStruct { v_REGDOMAIN_t domainIdCurrent; /* current regulatory domain */ /* Bssid for current country code */ - struct cdf_mac_addr currentCountryBssid; + struct qdf_mac_addr currentCountryBssid; int8_t currentCountryRSSI; /* RSSI for current country code */ bool fCancelIdleScan; @@ -841,7 +841,7 @@ typedef struct tagCsrRoamOffloadSynchStruct { uint8_t nss; /* no of spatial streams */ uint16_t chainMask; /* chainmask */ uint16_t smpsMode; /* smps.mode */ - struct cdf_mac_addr bssid; /* MAC address of roamed AP */ + struct qdf_mac_addr bssid; /* MAC address of roamed AP */ tCsrRoamOffloadAuthStatus authStatus; /* auth status */ uint8_t kck[SIR_KCK_KEY_LEN]; uint8_t kek[SIR_KEK_KEY_LEN]; @@ -865,7 +865,7 @@ typedef struct tagCsrRoamSession { bool sessionActive; /* true if it is used */ /* For BT-AMP station, this serve as BSSID for self-BSS. */ - struct cdf_mac_addr selfMacAddr; + struct qdf_mac_addr selfMacAddr; csr_roam_completeCallback callback; void *pContext; @@ -944,7 +944,7 @@ typedef struct tagCsrRoamSession { tCsrEseCckmInfo eseCckmInfo; bool isPrevApInfoValid; tSirMacSSid prevApSSID; - struct cdf_mac_addr prevApBssid; + struct qdf_mac_addr prevApBssid; uint8_t prevOpChannel; uint16_t clientDissSecs; uint32_t roamTS1; @@ -1232,15 +1232,15 @@ QDF_STATUS csr_get_statistics(tpAniSirGlobal pMac, uint32_t periodicity, bool cache, uint8_t staId, void *pContext, uint8_t sessionId); QDF_STATUS csr_get_rssi(tpAniSirGlobal pMac, tCsrRssiCallback callback, - uint8_t staId, struct cdf_mac_addr bssId, int8_t lastRSSI, + uint8_t staId, struct qdf_mac_addr bssId, int8_t lastRSSI, void *pContext, void *p_cds_context); QDF_STATUS csr_get_snr(tpAniSirGlobal pMac, tCsrSnrCallback callback, - uint8_t staId, struct cdf_mac_addr bssId, void *pContext); + uint8_t staId, struct qdf_mac_addr bssId, void *pContext); #if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) QDF_STATUS csr_get_tsm_stats(tpAniSirGlobal pMac, tCsrTsmStatsCallback callback, uint8_t staId, - struct cdf_mac_addr bssId, + struct qdf_mac_addr bssId, void *pContext, void *p_cds_context, uint8_t tid); #endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */ QDF_STATUS csr_get_config_param(tpAniSirGlobal pMac, tCsrConfigParam *pParam); @@ -1324,15 +1324,15 @@ bool csr_roam_is_sta_mode(tpAniSirGlobal pMac, uint32_t sessionId); /* Post Channel Change Indication */ QDF_STATUS csr_roam_channel_change_req(tpAniSirGlobal pMac, - struct cdf_mac_addr bssid, chan_params_t *ch_params, + struct qdf_mac_addr bssid, chan_params_t *ch_params, tCsrRoamProfile *profile); /* Post Beacon Tx Start Indication */ QDF_STATUS csr_roam_start_beacon_req(tpAniSirGlobal pMac, - struct cdf_mac_addr bssid, uint8_t dfsCacWaitStatus); + struct qdf_mac_addr bssid, uint8_t dfsCacWaitStatus); QDF_STATUS -csr_roam_send_chan_sw_ie_request(tpAniSirGlobal pMac, struct cdf_mac_addr bssid, +csr_roam_send_chan_sw_ie_request(tpAniSirGlobal pMac, struct qdf_mac_addr bssid, uint8_t targetChannel, uint8_t csaIeReqd, chan_params_t *ch_params); QDF_STATUS @@ -1397,6 +1397,6 @@ QDF_STATUS csr_scan_process_single_bssdescr(tpAniSirGlobal pMac, bool csr_wait_for_connection_update(tpAniSirGlobal mac, bool do_release_reacquire_lock); -enum tCDF_ADAPTER_MODE csr_get_session_persona(tpAniSirGlobal pmac, +enum tQDF_ADAPTER_MODE csr_get_session_persona(tpAniSirGlobal pmac, uint32_t session_id); #endif diff --git a/core/sme/inc/csr_neighbor_roam.h b/core/sme/inc/csr_neighbor_roam.h index c65f195633..aeafbad84d 100644 --- a/core/sme/inc/csr_neighbor_roam.h +++ b/core/sme/inc/csr_neighbor_roam.h @@ -141,7 +141,7 @@ typedef struct sCsrNeighborRoamControlInfo { eCsrNeighborRoamState neighborRoamState; eCsrNeighborRoamState prevNeighborRoamState; tCsrNeighborRoamCfgParams cfgParams; - struct cdf_mac_addr currAPbssid; /* current assoc AP */ + struct qdf_mac_addr currAPbssid; /* current assoc AP */ uint8_t currAPoperationChannel; /* current assoc AP */ tCsrNeighborRoamChannelInfo roamChannelInfo; uint8_t currentNeighborLookupThreshold; diff --git a/core/sme/inc/csr_support.h b/core/sme/inc/csr_support.h index d937ba0e80..e5dfa58ebb 100644 --- a/core/sme/inc/csr_support.h +++ b/core/sme/inc/csr_support.h @@ -131,7 +131,7 @@ typedef enum { typedef struct sDot11IEHeader { uint8_t ElementID; uint8_t Length; -} cdf_packed tDot11IEHeader; +} qdf_packed tDot11IEHeader; typedef struct tagCsrWpaIe { tDot11IEHeader IeHeader; @@ -141,15 +141,15 @@ typedef struct tagCsrWpaIe { uint16_t cUnicastCyphers; struct { uint8_t Oui[CSR_WPA_OUI_SIZE]; - } cdf_packed UnicastOui[1]; -} cdf_packed tCsrWpaIe; + } qdf_packed UnicastOui[1]; +} qdf_packed tCsrWpaIe; typedef struct tagCsrWpaAuthIe { uint16_t cAuthenticationSuites; struct { uint8_t Oui[CSR_WPA_OUI_SIZE]; - } cdf_packed AuthOui[1]; -} cdf_packed tCsrWpaAuthIe; + } qdf_packed AuthOui[1]; +} qdf_packed tCsrWpaAuthIe; typedef struct tagCsrRSNIe { tDot11IEHeader IeHeader; @@ -158,15 +158,15 @@ typedef struct tagCsrRSNIe { uint16_t cUnicastCyphers; struct { uint8_t Oui[CSR_RSN_OUI_SIZE]; - } cdf_packed UnicastOui[1]; -} cdf_packed tCsrRSNIe; + } qdf_packed UnicastOui[1]; +} qdf_packed tCsrRSNIe; typedef struct tagCsrRSNAuthIe { uint16_t cAuthenticationSuites; struct { uint8_t Oui[CSR_RSN_OUI_SIZE]; - } cdf_packed AuthOui[1]; -} cdf_packed tCsrRSNAuthIe; + } qdf_packed AuthOui[1]; +} qdf_packed tCsrRSNAuthIe; typedef struct tagCsrRSNCapabilities { uint16_t PreAuthSupported:1; @@ -176,19 +176,19 @@ typedef struct tagCsrRSNCapabilities { uint16_t MFPRequired:1; uint16_t MFPCapable:1; uint16_t Reserved:8; -} cdf_packed tCsrRSNCapabilities; +} qdf_packed tCsrRSNCapabilities; typedef struct tagCsrRSNPMKIe { uint16_t cPMKIDs; struct { uint8_t PMKID[CSR_RSN_PMKID_SIZE]; - } cdf_packed PMKIDList[1]; -} cdf_packed tCsrRSNPMKIe; + } qdf_packed PMKIDList[1]; +} qdf_packed tCsrRSNPMKIe; typedef struct tCsrIELenInfo { uint8_t min; uint8_t max; -} cdf_packed tCsrIELenInfo; +} qdf_packed tCsrIELenInfo; #ifdef FEATURE_WLAN_WAPI typedef struct tagCsrWapiIe { @@ -197,17 +197,17 @@ typedef struct tagCsrWapiIe { uint16_t cAuthenticationSuites; struct { uint8_t Oui[CSR_WAPI_OUI_SIZE]; - } cdf_packed AuthOui[1]; + } qdf_packed AuthOui[1]; uint16_t cUnicastCyphers; struct { uint8_t Oui[CSR_WAPI_OUI_SIZE]; - } cdf_packed UnicastOui[1]; + } qdf_packed UnicastOui[1]; uint8_t MulticastOui[CSR_WAPI_OUI_SIZE]; struct { uint16_t PreAuthSupported:1; uint16_t Reserved:15; - } cdf_packed tCsrWapiCapabilities; -} cdf_packed tCsrWapiIe; + } qdf_packed tCsrWapiCapabilities; +} qdf_packed tCsrWapiIe; #endif /* FEATURE_WLAN_WAPI */ typedef struct tagRoamingTimerInfo { @@ -225,7 +225,7 @@ typedef struct tagRoamingTimerInfo { ((pIes)->WMMInfoAp.present && (pIes)->WMMInfoAp.uapsd)) bool csr_get_bss_id_bss_desc(tHalHandle hHal, tSirBssDescription *pSirBssDesc, - struct cdf_mac_addr *pBssId); + struct qdf_mac_addr *pBssId); bool csr_is_bss_id_equal(tHalHandle hHal, tSirBssDescription *pSirBssDesc1, tSirBssDescription *pSirBssDesc2); eCsrMediaAccessType csr_get_qo_s_from_bss_desc(tHalHandle hHal, @@ -316,8 +316,8 @@ bool csr_match_bss(tHalHandle hHal, tSirBssDescription *pBssDesc, tCsrScanResultFilter *pFilter, eCsrAuthType *pNegAuth, eCsrEncryptionType *pNegUc, eCsrEncryptionType *pNegMc, tDot11fBeaconIEs **ppIes); -bool csr_is_bssid_match(tHalHandle hHal, struct cdf_mac_addr *pProfBssid, - struct cdf_mac_addr *BssBssid); +bool csr_is_bssid_match(tHalHandle hHal, struct qdf_mac_addr *pProfBssid, + struct qdf_mac_addr *BssBssid); bool csr_match_bss_to_connect_profile(tHalHandle hHal, tCsrRoamConnectedProfile *pProfile, tSirBssDescription *pBssDesc, tDot11fBeaconIEs *pIes); @@ -356,11 +356,11 @@ QDF_STATUS csr_reassoc(tpAniSirGlobal pMac, uint32_t sessionId, uint32_t *pRoamId, bool fForce); QDF_STATUS csr_isconcurrentsession_valid(tpAniSirGlobal pMac, - uint32_t cursessionId, enum tCDF_ADAPTER_MODE currBssPersona); + uint32_t cursessionId, enum tQDF_ADAPTER_MODE currBssPersona); /* BeaconInterval validation for MCC support */ QDF_STATUS csr_validate_mcc_beacon_interval(tpAniSirGlobal pMac, uint8_t channelId, uint16_t *beaconInterval, uint32_t cursessionId, - enum tCDF_ADAPTER_MODE currBssPersona); + enum tQDF_ADAPTER_MODE currBssPersona); bool csr_is_profile11r(tCsrRoamProfile *pProfile); bool csr_is_auth_type11r(eCsrAuthType AuthType, uint8_t mdiePresent); #ifdef FEATURE_WLAN_ESE diff --git a/core/sme/inc/nan_api.h b/core/sme/inc/nan_api.h index 0d68a3fe8e..1c0722b2ae 100644 --- a/core/sme/inc/nan_api.h +++ b/core/sme/inc/nan_api.h @@ -36,8 +36,7 @@ #ifndef __NAN_API_H__ #define __NAN_API_H__ -#include "cdf_types.h" -#include "cdf_types.h" +#include "qdf_types.h" typedef struct sNanRequestReq { uint16_t request_data_len; diff --git a/core/sme/inc/p2p_api.h b/core/sme/inc/p2p_api.h index 7519f1a417..7b57e5dd31 100644 --- a/core/sme/inc/p2p_api.h +++ b/core/sme/inc/p2p_api.h @@ -37,8 +37,7 @@ #ifndef __P2P_API_H__ #define __P2P_API_H__ -#include "cdf_types.h" -#include "cdf_types.h" +#include "qdf_types.h" #include "cdf_mc_timer.h" #include "cdf_lock.h" diff --git a/core/sme/inc/sme_api.h b/core/sme/inc/sme_api.h index f41d9747e8..963ef871d8 100644 --- a/core/sme/inc/sme_api.h +++ b/core/sme/inc/sme_api.h @@ -40,7 +40,7 @@ #include "csr_api.h" #include "cds_mq.h" #include "cdf_lock.h" -#include "cdf_types.h" +#include "qdf_types.h" #include "sir_api.h" #include "cds_reg_service.h" #include "p2p_api.h" @@ -216,7 +216,7 @@ QDF_STATUS sme_open_session(tHalHandle hHal, csr_roam_completeCallback callback, uint8_t *pbSessionId, uint32_t type, uint32_t subType); void sme_set_curr_device_mode(tHalHandle hHal, - enum tCDF_ADAPTER_MODE currDeviceMode); + enum tQDF_ADAPTER_MODE currDeviceMode); QDF_STATUS sme_close_session(tHalHandle hHal, uint8_t sessionId, csr_roamSessionCloseCallback callback, void *pContext); @@ -291,7 +291,7 @@ QDF_STATUS sme_roam_disconnect(tHalHandle hHal, uint8_t sessionId, eCsrRoamDisconnectReason reason); QDF_STATUS sme_roam_stop_bss(tHalHandle hHal, uint8_t sessionId); QDF_STATUS sme_roam_get_associated_stas(tHalHandle hHal, uint8_t sessionId, - CDF_MODULE_ID modId, void *pUsrContext, + QDF_MODULE_ID modId, void *pUsrContext, void *pfnSapEventCallback, uint8_t *pAssocStasBuf); QDF_STATUS sme_roam_disconnect_sta(tHalHandle hHal, uint8_t sessionId, @@ -303,7 +303,7 @@ QDF_STATUS sme_roam_tkip_counter_measures(tHalHandle hHal, uint8_t sessionId, QDF_STATUS sme_roam_get_wps_session_overlap(tHalHandle hHal, uint8_t sessionId, void *pUsrContext, void *pfnSapEventCallback, - struct cdf_mac_addr pRemoveMac); + struct qdf_mac_addr pRemoveMac); QDF_STATUS sme_roam_get_connect_state(tHalHandle hHal, uint8_t sessionId, eCsrConnectState *pState); QDF_STATUS sme_roam_get_connect_profile(tHalHandle hHal, uint8_t sessionId, @@ -336,15 +336,15 @@ QDF_STATUS sme_get_statistics(tHalHandle hHal, void *pContext, uint8_t sessionId); QDF_STATUS sme_get_rssi(tHalHandle hHal, tCsrRssiCallback callback, - uint8_t staId, struct cdf_mac_addr bssId, int8_t lastRSSI, + uint8_t staId, struct qdf_mac_addr bssId, int8_t lastRSSI, void *pContext, void *p_cds_context); QDF_STATUS sme_get_snr(tHalHandle hHal, tCsrSnrCallback callback, - uint8_t staId, struct cdf_mac_addr bssId, void *pContext); + uint8_t staId, struct qdf_mac_addr bssId, void *pContext); #if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) QDF_STATUS sme_get_tsm_stats(tHalHandle hHal, tCsrTsmStatsCallback callback, - uint8_t staId, struct cdf_mac_addr bssId, + uint8_t staId, struct qdf_mac_addr bssId, void *pContext, void *p_cds_context, uint8_t tid); QDF_STATUS sme_set_cckm_ie(tHalHandle hHal, uint8_t sessionId, @@ -543,12 +543,12 @@ QDF_STATUS sme_get_gtk_offload(tHalHandle hal_ctx, #endif /* WLAN_FEATURE_GTK_OFFLOAD */ uint16_t sme_chn_to_freq(uint8_t chanNum); bool sme_is_channel_valid(tHalHandle hHal, uint8_t channel); -QDF_STATUS sme_set_max_tx_power(tHalHandle hHal, struct cdf_mac_addr pBssid, - struct cdf_mac_addr pSelfMacAddress, int8_t dB); +QDF_STATUS sme_set_max_tx_power(tHalHandle hHal, struct qdf_mac_addr pBssid, + struct qdf_mac_addr pSelfMacAddress, int8_t dB); QDF_STATUS sme_set_max_tx_power_per_band(eCsrBand band, int8_t db); QDF_STATUS sme_set_tx_power(tHalHandle hHal, uint8_t sessionId, - struct cdf_mac_addr bssid, - enum tCDF_ADAPTER_MODE dev_mode, int power); + struct qdf_mac_addr bssid, + enum tQDF_ADAPTER_MODE dev_mode, int power); QDF_STATUS sme_set_custom_mac_addr(tSirMacAddr customMacAddr); QDF_STATUS sme_hide_ssid(tHalHandle hHal, uint8_t sessionId, uint8_t ssidHidden); @@ -738,7 +738,7 @@ int16_t sme_get_ht_config(tHalHandle hHal, uint8_t session_id, uint16_t ht_capab); #ifdef QCA_HT_2040_COEX QDF_STATUS sme_notify_ht2040_mode(tHalHandle hHal, uint16_t staId, - struct cdf_mac_addr macAddrSTA, + struct qdf_mac_addr macAddrSTA, uint8_t sessionId, uint8_t channel_type); QDF_STATUS sme_set_ht2040_mode(tHalHandle hHal, uint8_t sessionId, @@ -775,11 +775,11 @@ QDF_STATUS sme_set_auto_shutdown_cb(tHalHandle hHal, void (*pCallbackfn)(void)); QDF_STATUS sme_set_auto_shutdown_timer(tHalHandle hHal, uint32_t timer_value); #endif QDF_STATUS sme_roam_channel_change_req(tHalHandle hHal, - struct cdf_mac_addr bssid, chan_params_t *ch_params, + struct qdf_mac_addr bssid, chan_params_t *ch_params, tCsrRoamProfile *profile); QDF_STATUS sme_roam_start_beacon_req(tHalHandle hHal, - struct cdf_mac_addr bssid, uint8_t dfsCacWaitStatus); -QDF_STATUS sme_roam_csa_ie_request(tHalHandle hHal, struct cdf_mac_addr bssid, + struct qdf_mac_addr bssid, uint8_t dfsCacWaitStatus); +QDF_STATUS sme_roam_csa_ie_request(tHalHandle hHal, struct qdf_mac_addr bssid, uint8_t targetChannel, uint8_t csaIeReqd, chan_params_t *ch_params); QDF_STATUS sme_init_thermal_info(tHalHandle hHal, diff --git a/core/sme/inc/sme_inside.h b/core/sme/inc/sme_inside.h index d1ee264cce..91a686a204 100644 --- a/core/sme/inc/sme_inside.h +++ b/core/sme/inc/sme_inside.h @@ -41,7 +41,7 @@ #include "cdf_lock.h" #include "cdf_trace.h" #include "cdf_memory.h" -#include "cdf_types.h" +#include "qdf_types.h" #include "sir_api.h" #include "csr_internal.h" #include "sme_qos_api.h" @@ -109,7 +109,7 @@ typedef struct TdlsSendMgmtInfo { } tTdlsSendMgmtCmdInfo; typedef struct TdlsLinkEstablishInfo { - struct cdf_mac_addr peermac; + struct qdf_mac_addr peermac; uint8_t uapsdQueues; uint8_t maxSp; uint8_t isBufSta; @@ -123,7 +123,7 @@ typedef struct TdlsLinkEstablishInfo { typedef struct TdlsAddStaInfo { eTdlsAddOper tdlsAddOper; - struct cdf_mac_addr peermac; + struct qdf_mac_addr peermac; uint16_t capability; uint8_t extnCapability[SIR_MAC_MAX_EXTN_CAP]; uint8_t supportedRatesLen; @@ -137,7 +137,7 @@ typedef struct TdlsAddStaInfo { } tTdlsAddStaCmdInfo; typedef struct TdlsDelStaInfo { - struct cdf_mac_addr peermac; + struct qdf_mac_addr peermac; } tTdlsDelStaCmdInfo; /* * TDLS cmd info, CMD from SME to PE. diff --git a/core/sme/inc/sme_internal.h b/core/sme/inc/sme_internal.h index 88286266d7..a3b1e4c920 100644 --- a/core/sme/inc/sme_internal.h +++ b/core/sme/inc/sme_internal.h @@ -41,7 +41,7 @@ #include "cdf_lock.h" #include "cdf_trace.h" #include "cdf_memory.h" -#include "cdf_types.h" +#include "qdf_types.h" #include "host_diag_core_event.h" #include "csr_link_list.h" #include "sme_power_save.h" @@ -148,7 +148,7 @@ typedef struct tagSmeStruct { tDblLinkList smeCmdActiveList; tDblLinkList smeCmdPendingList; tDblLinkList smeCmdFreeList; /* preallocated roam cmd list */ - enum tCDF_ADAPTER_MODE currDeviceMode; + enum tQDF_ADAPTER_MODE currDeviceMode; #ifdef FEATURE_WLAN_LPHB void (*pLphbIndCb)(void *pHddCtx, tSirLPHBInd *indParam); #endif /* FEATURE_WLAN_LPHB */ diff --git a/core/sme/inc/sme_power_save.h b/core/sme/inc/sme_power_save.h index 7965e6d627..731edc0e6a 100644 --- a/core/sme/inc/sme_power_save.h +++ b/core/sme/inc/sme_power_save.h @@ -30,7 +30,7 @@ #include "cdf_lock.h" #include "cdf_trace.h" #include "cdf_memory.h" -#include "cdf_types.h" +#include "qdf_types.h" #include "ani_system_defs.h" #include "sir_api.h" diff --git a/core/sme/inc/sme_qos_api.h b/core/sme/inc/sme_qos_api.h index f3a18a4091..8add99a0b4 100644 --- a/core/sme/inc/sme_qos_api.h +++ b/core/sme/inc/sme_qos_api.h @@ -40,7 +40,7 @@ #include "cdf_lock.h" #include "cdf_trace.h" #include "cdf_memory.h" -#include "cdf_types.h" +#include "qdf_types.h" #include "ani_global.h" #include "sir_api.h" diff --git a/core/sme/inc/sme_qos_internal.h b/core/sme/inc/sme_qos_internal.h index 7e24a2976d..ae09e6e90d 100644 --- a/core/sme/inc/sme_qos_internal.h +++ b/core/sme/inc/sme_qos_internal.h @@ -40,7 +40,7 @@ #include "cdf_lock.h" #include "cdf_trace.h" #include "cdf_memory.h" -#include "cdf_types.h" +#include "qdf_types.h" #include "ani_global.h" #include "sir_api.h" #include "sme_qos_api.h" diff --git a/core/sme/inc/sme_rrm_api.h b/core/sme/inc/sme_rrm_api.h index 1720d3b6c3..49b02625ab 100644 --- a/core/sme/inc/sme_rrm_api.h +++ b/core/sme/inc/sme_rrm_api.h @@ -40,7 +40,7 @@ #include "cdf_lock.h" #include "cdf_trace.h" #include "cdf_memory.h" -#include "cdf_types.h" +#include "qdf_types.h" #include "ani_global.h" #include "sir_api.h" #include "sme_internal.h" diff --git a/core/sme/inc/sme_rrm_internal.h b/core/sme/inc/sme_rrm_internal.h index fdcb5e1ba7..312e295b0b 100644 --- a/core/sme/inc/sme_rrm_internal.h +++ b/core/sme/inc/sme_rrm_internal.h @@ -40,7 +40,7 @@ #include "cdf_lock.h" #include "cdf_trace.h" #include "cdf_memory.h" -#include "cdf_types.h" +#include "qdf_types.h" #include "rrm_global.h" /*-------------------------------------------------------------------------- @@ -71,7 +71,7 @@ typedef struct sRrmNeighborRequestControlInfo { typedef struct sRrmSMEContext { uint16_t token; - struct cdf_mac_addr sessionBssId; + struct qdf_mac_addr sessionBssId; uint8_t regClass; /* list of all channels to be measured. */ tCsrChannelInfo channelList; diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c index 5c7169a65d..af364d0246 100644 --- a/core/sme/src/common/sme_api.c +++ b/core/sme/src/common/sme_api.c @@ -46,7 +46,7 @@ #include "wma_if.h" #include "cdf_trace.h" #include "sme_trace.h" -#include "cdf_types.h" +#include "qdf_types.h" #include "cdf_trace.h" #include "cds_utils.h" #include "sap_api.h" @@ -374,11 +374,11 @@ static QDF_STATUS init_sme_cmd_list(tpAniSirGlobal pMac) pMac->sme.smeCmdActiveList.cmdTimeoutTimer = cmdTimeoutTimer; qdf_status = cdf_mc_timer_init(pMac->sme.smeCmdActiveList. - cmdTimeoutTimer, CDF_TIMER_TYPE_SW, + cmdTimeoutTimer, QDF_TIMER_TYPE_SW, active_list_cmd_timeout_handle, (void *)pMac); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "Init Timer fail for active list command process time out"); cdf_mem_free(pMac->sme.smeCmdActiveList. cmdTimeoutTimer); @@ -903,7 +903,7 @@ sme_process_cmd: csr_ll_insert_head(&pMac->sme.smeCmdActiveList, &pCommand->Link, LL_ACCESS_NOLOCK); /* .... and process the command. */ - MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_COMMAND, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_COMMAND, pCommand->sessionId, pCommand->command)); switch (pCommand->command) { @@ -974,7 +974,7 @@ sme_process_cmd: case eSmeCommandTdlsAddPeer: case eSmeCommandTdlsDelPeer: case eSmeCommandTdlsLinkEstablish: - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("sending TDLS Command 0x%x to PE"), pCommand->command); csr_ll_unlock(&pMac->sme.smeCmdActiveList); @@ -1047,7 +1047,7 @@ QDF_STATUS sme_open(tHalHandle hHal) tpAniSirGlobal pMac = PMAC_STRUCT(hHal); pMac->sme.state = SME_STATE_STOP; - pMac->sme.currDeviceMode = CDF_STA_MODE; + pMac->sme.currDeviceMode = QDF_STA_MODE; if (!QDF_IS_STATUS_SUCCESS(cdf_mutex_init( &pMac->sme.lkSmeGlobalLock))) { sms_log(pMac, LOGE, FL("sme_open failed init lock")); @@ -1141,7 +1141,7 @@ QDF_STATUS sme_set11dinfo(tHalHandle hHal, tpSmeConfigParams pSmeConfigParams) QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_MSG_SET_11DINFO, NO_SESSION, 0)); if (NULL == pSmeConfigParams) { sms_log(pMac, LOGE, @@ -1193,7 +1193,7 @@ QDF_STATUS sme_get_soft_ap_domain(tHalHandle hHal, v_REGDOMAIN_t *domainIdSoftAp QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_MSG_GET_SOFTAP_DOMAIN, NO_SESSION, 0)); if (NULL == domainIdSoftAp) { @@ -1212,7 +1212,7 @@ QDF_STATUS sme_set_reg_info(tHalHandle hHal, uint8_t *apCntryCode) QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_MSG_SET_REGINFO, NO_SESSION, 0)); if (NULL == apCntryCode) { sms_log(pMac, LOGE, "Empty Country Code, nothing to update"); @@ -1250,7 +1250,7 @@ QDF_STATUS sme_set_plm_request(tHalHandle hHal, tpSirPlmReq pPlmReq) } if (!pSession->sessionActive) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Invalid Sessionid")); sme_release_global_lock(&pMac->sme); return QDF_STATUS_E_FAILURE; @@ -1267,7 +1267,7 @@ QDF_STATUS sme_set_plm_request(tHalHandle hHal, tpSirPlmReq pPlmReq) /* DFS channel is provided, no PLM bursts can be * transmitted. Ignoring these channels. */ - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("DFS channel %d ignored for PLM"), pPlmReq->plmChList[count]); @@ -1275,7 +1275,7 @@ QDF_STATUS sme_set_plm_request(tHalHandle hHal, tpSirPlmReq pPlmReq) } } else if (!ret) { /* Not supported, ignore the channel */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("Unsupported channel %d ignored for PLM"), pPlmReq->plmChList[count]); continue; @@ -1301,9 +1301,9 @@ send_plm_start: msg.reserved = 0; msg.bodyptr = pPlmReq; - if (!QDF_IS_STATUS_SUCCESS(cds_mq_post_message(CDF_MODULE_ID_WMA, + if (!QDF_IS_STATUS_SUCCESS(cds_mq_post_message(QDF_MODULE_ID_WMA, &msg))) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to post WMA_SET_PLM_REQ to WMA")); sme_release_global_lock(&pMac->sme); return QDF_STATUS_E_FAILURE; @@ -1340,7 +1340,7 @@ QDF_STATUS sme_update_config(tHalHandle hHal, tpSmeConfigParams pSmeConfigParams QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_MSG_UPDATE_CONFIG, NO_SESSION, 0)); if (NULL == pSmeConfigParams) { @@ -1381,7 +1381,7 @@ QDF_STATUS sme_update_config(tHalHandle hHal, tpSmeConfigParams pSmeConfigParams status = sme_cfg_set_int(hHal, WNI_CFG_SCAN_IN_POWERSAVE, true); if (QDF_STATUS_SUCCESS != status) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "Could not pass on WNI_CFG_SCAN_IN_POWERSAVE to CFG"); } return status; @@ -1451,7 +1451,7 @@ QDF_STATUS sme_update_roam_params(tHalHandle hal, break; case REASON_ROAM_SET_BLACKLIST_BSSID: cdf_mem_set(&roam_params_dst->bssid_avoid_list, 0, - CDF_MAC_ADDR_SIZE * MAX_BSSID_AVOID_LIST); + QDF_MAC_ADDR_SIZE * MAX_BSSID_AVOID_LIST); roam_params_dst->num_bssid_avoid_list = roam_params_src.num_bssid_avoid_list; for (i = 0; i < roam_params_dst->num_bssid_avoid_list; i++) { @@ -1479,12 +1479,12 @@ void sme_process_get_gtk_info_rsp(tHalHandle hHal, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); if (NULL == pMac) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, "%s: pMac is null", __func__); return; } if (pMac->sme.gtk_offload_get_info_cb == NULL) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: HDD callback is null", __func__); return; } @@ -1516,7 +1516,7 @@ void sme_process_ready_to_suspend(tHalHandle hHal, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); if (NULL == pMac) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, "%s: pMac is null", __func__); return; } @@ -1547,7 +1547,7 @@ void sme_process_ready_to_ext_wow(tHalHandle hHal, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); if (NULL == pMac) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, "%s: pMac is null", __func__); return; } @@ -1631,7 +1631,7 @@ QDF_STATUS sme_hdd_ready_ind(tHalHandle hHal) QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_MSG_HDDREADYIND, NO_SESSION, 0)); do { @@ -1844,7 +1844,7 @@ QDF_STATUS dfs_msg_processor(tpAniSirGlobal pMac, uint16_t msgType, void *pMsgBu roamStatus = eCSR_ROAM_DFS_RADAR_IND; roamResult = eCSR_ROAM_RESULT_DFS_RADAR_FOUND_IND; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, "sapdfs: Radar indication event occurred"); break; } @@ -1861,7 +1861,7 @@ QDF_STATUS dfs_msg_processor(tpAniSirGlobal pMac, uint16_t msgType, void *pMsgBu sessionId = csaIeTxCompleteRsp->sessionId; roamStatus = eCSR_ROAM_DFS_CHAN_SW_NOTIFY; roamResult = eCSR_ROAM_RESULT_DFS_CHANSW_UPDATE_SUCCESS; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, "sapdfs: Received eWNI_SME_DFS_CSAIE_TX_COMPLETE_IND for session id [%d]", sessionId); break; @@ -2178,7 +2178,7 @@ QDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg) switch (pMsg->type) { #ifdef WLAN_FEATURE_ROAM_OFFLOAD case eWNI_SME_HO_FAIL_IND: - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("LFR3: Rcvd eWNI_SME_HO_FAIL_IND")); csr_process_ho_fail_ind(pMac, pMsg->bodyptr); cdf_mem_free(pMsg->bodyptr); @@ -2431,7 +2431,7 @@ QDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg) /* channel avoid message arrived, send IND to client */ case eWNI_SME_CH_AVOID_IND: if (pMac->sme.pChAvoidNotificationCb) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("CH avoid notification")); pMac->sme.pChAvoidNotificationCb(pMac->hHdd, pMsg->bodyptr); @@ -2442,7 +2442,7 @@ QDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg) #ifdef FEATURE_WLAN_AUTO_SHUTDOWN case eWNI_SME_AUTO_SHUTDOWN_IND: if (pMac->sme.pAutoShutdownNotificationCb) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("Auto shutdown notification")); pMac->sme.pAutoShutdownNotificationCb(); } @@ -2936,7 +2936,7 @@ QDF_STATUS sme_scan_request(tHalHandle hal, uint8_t session_id, cds_msg_t msg; uint32_t scan_req_id, scan_count; - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_MSG_SCAN_REQ, session_id, scan_req->scanType)); if (!mac_ctx->scan.fScanEnable) { @@ -3011,7 +3011,7 @@ QDF_STATUS sme_scan_get_result(tHalHandle hHal, uint8_t sessionId, QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_MSG_SCAN_GET_RESULTS, sessionId, 0)); sms_log(pMac, LOG2, FL("enter")); @@ -3050,13 +3050,13 @@ QDF_STATUS sme_get_ap_channel_from_scan_cache(tHalHandle hal_handle, tSirBssDescription first_ap_profile; if (NULL == mac_ctx) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("mac_ctx is NULL")); return QDF_STATUS_E_FAILURE; } scan_filter = cdf_mem_malloc(sizeof(tCsrScanResultFilter)); if (NULL == scan_filter) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("scan_filter mem alloc failed")); return QDF_STATUS_E_FAILURE; } else { @@ -3086,7 +3086,7 @@ QDF_STATUS sme_get_ap_channel_from_scan_cache(tHalHandle hal_handle, scan_filter->bOSENAssociation = 0; } } else { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Preparing the profile filter failed")); cdf_mem_free(scan_filter); return QDF_STATUS_E_FAILURE; @@ -3102,7 +3102,7 @@ QDF_STATUS sme_get_ap_channel_from_scan_cache(tHalHandle hal_handle, *scan_cache = filtered_scan_result; if (0 != first_ap_profile.channelId) { *ap_chnl_id = first_ap_profile.channelId; - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Found best AP & its on chnl[%d]"), first_ap_profile.channelId); @@ -3113,20 +3113,20 @@ QDF_STATUS sme_get_ap_channel_from_scan_cache(tHalHandle hal_handle, * take of zero channel id case. */ *ap_chnl_id = 0; - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Scan is empty, set chnl to 0")); status = QDF_STATUS_E_FAILURE; } } else { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Failed to get scan get result")); status = QDF_STATUS_E_FAILURE; } csr_free_scan_filter(mac_ctx, scan_filter); sme_release_global_lock(&mac_ctx->sme); } else { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Aquiring lock failed")); status = QDF_STATUS_E_FAILURE; } @@ -3160,7 +3160,7 @@ bool sme_store_joinreq_param(tHalHandle hal_handle, QDF_STATUS status = QDF_STATUS_E_FAILURE; bool ret_status = true; - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_STORE_JOIN_REQ, session_id, 0)); status = sme_acquire_global_lock(&mac_ctx->sme); @@ -3195,7 +3195,7 @@ bool sme_clear_joinreq_param(tHalHandle hal_handle, QDF_STATUS status = QDF_STATUS_E_FAILURE; bool ret_status = true; - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_CLEAR_JOIN_REQ, session_id, 0)); status = sme_acquire_global_lock(&mac_ctx->sme); @@ -3232,7 +3232,7 @@ QDF_STATUS sme_issue_stored_joinreq(tHalHandle hal_handle, QDF_STATUS status = QDF_STATUS_E_FAILURE; QDF_STATUS ret_status = QDF_STATUS_SUCCESS; - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_ISSUE_JOIN_REQ, session_id, 0)); status = sme_acquire_global_lock(&mac_ctx->sme); @@ -3261,7 +3261,7 @@ QDF_STATUS sme_scan_flush_result(tHalHandle hHal) QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_MSG_SCAN_FLUSH_RESULTS, 0, 0)); status = sme_acquire_global_lock(&pMac->sme); @@ -3286,7 +3286,7 @@ QDF_STATUS sme_filter_scan_results(tHalHandle hHal, uint8_t sessionId) QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_MSG_SCAN_FLUSH_RESULTS, sessionId, 0)); status = sme_acquire_global_lock(&pMac->sme); @@ -3303,7 +3303,7 @@ QDF_STATUS sme_scan_flush_p2p_result(tHalHandle hHal, uint8_t sessionId) QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_MSG_SCAN_FLUSH_P2PRESULTS, sessionId, 0)); status = sme_acquire_global_lock(&pMac->sme); @@ -3330,7 +3330,7 @@ tCsrScanResultInfo *sme_scan_result_get_first(tHalHandle hHal, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); tCsrScanResultInfo *pRet = NULL; - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_MSG_SCAN_RESULT_GETFIRST, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); @@ -3358,7 +3358,7 @@ tCsrScanResultInfo *sme_scan_result_get_next(tHalHandle hHal, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); tCsrScanResultInfo *pRet = NULL; - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_MSG_SCAN_RESULT_GETNEXT, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); @@ -3385,7 +3385,7 @@ QDF_STATUS sme_scan_result_purge(tHalHandle hHal, tScanResultHandle hScanResult) QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_MSG_SCAN_RESULT_PURGE, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); @@ -3491,7 +3491,7 @@ QDF_STATUS sme_roam_connect(tHalHandle hHal, uint8_t sessionId, return QDF_STATUS_E_FAILURE; } - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_MSG_CONNECT, sessionId, 0)); sms_log(pMac, LOG2, FL("enter")); status = sme_acquire_global_lock(&pMac->sme); @@ -3531,7 +3531,7 @@ QDF_STATUS sme_set_phy_mode(tHalHandle hHal, eCsrPhyMode phyMode) tpAniSirGlobal pMac = PMAC_STRUCT(hHal); if (NULL == pMac) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: invalid context", __func__); return QDF_STATUS_E_FAILURE; } @@ -3566,7 +3566,7 @@ QDF_STATUS sme_roam_reassoc(tHalHandle hHal, uint8_t sessionId, QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_ROAM_REASSOC, sessionId, 0)); sms_log(pMac, LOG2, FL("enter")); status = sme_acquire_global_lock(&pMac->sme); @@ -3603,7 +3603,7 @@ QDF_STATUS sme_roam_connect_to_last_profile(tHalHandle hHal, uint8_t sessionId) QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_ROAM_GET_CONNECTPROFILE, sessionId, 0)); status = sme_acquire_global_lock(&pMac->sme); @@ -3633,7 +3633,7 @@ QDF_STATUS sme_roam_disconnect(tHalHandle hHal, uint8_t sessionId, QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_ROAM_DISCONNECT, sessionId, reason)); sms_log(pMac, LOG2, FL("enter")); @@ -3733,7 +3733,7 @@ QDF_STATUS sme_roam_deauth_sta(tHalHandle hHal, uint8_t sessionId, return status; } - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_MSG_DEAUTH_STA, sessionId, pDelStaParams->reason_code)); status = sme_acquire_global_lock(&pMac->sme); @@ -3792,7 +3792,7 @@ QDF_STATUS sme_roam_tkip_counter_measures(tHalHandle hHal, uint8_t sessionId, \param sessionId - sessionId of SoftAP \param modId - Module from whom list of associtated stations is to be probed. If an invalid module is passed then - by default CDF_MODULE_ID_PE will be probed. + by default QDF_MODULE_ID_PE will be probed. \param pUsrContext - Opaque HDD context \param pfnSapEventCallback - Sap event callback in HDD \param pAssocBuf - Caller allocated memory to be filled with associatd @@ -3800,7 +3800,7 @@ QDF_STATUS sme_roam_tkip_counter_measures(tHalHandle hHal, uint8_t sessionId, \return QDF_STATUS -------------------------------------------------------------------------------*/ QDF_STATUS sme_roam_get_associated_stas(tHalHandle hHal, uint8_t sessionId, - CDF_MODULE_ID modId, void *pUsrContext, + QDF_MODULE_ID modId, void *pUsrContext, void *pfnSapEventCallback, uint8_t *pAssocStasBuf) { @@ -3842,7 +3842,7 @@ QDF_STATUS sme_roam_get_associated_stas(tHalHandle hHal, uint8_t sessionId, QDF_STATUS sme_roam_get_wps_session_overlap(tHalHandle hHal, uint8_t sessionId, void *pUsrContext, void *pfnSapEventCallback, - struct cdf_mac_addr pRemoveMac) + struct qdf_mac_addr pRemoveMac) { QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); @@ -3912,7 +3912,7 @@ QDF_STATUS sme_roam_get_connect_profile(tHalHandle hHal, uint8_t sessionId, QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_ROAM_GET_CONNECTPROFILE, sessionId, 0)); status = sme_acquire_global_lock(&pMac->sme); @@ -3939,7 +3939,7 @@ QDF_STATUS sme_roam_get_connect_profile(tHalHandle hHal, uint8_t sessionId, */ void sme_roam_free_connect_profile(tCsrRoamConnectedProfile *profile) { - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_ROAM_FREE_CONNECTPROFILE, NO_SESSION, 0)); csr_roam_free_connect_profile(profile); @@ -3970,7 +3970,7 @@ QDF_STATUS sme_roam_set_pmkid_cache(tHalHandle hHal, uint8_t sessionId, QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_ROAM_SET_PMKIDCACHE, sessionId, numItems)); status = sme_acquire_global_lock(&pMac->sme); @@ -3994,7 +3994,7 @@ QDF_STATUS sme_roam_del_pmkid_from_cache(tHalHandle hHal, uint8_t sessionId, QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_ROAM_DEL_PMKIDCACHE, sessionId, flush_cache)); status = sme_acquire_global_lock(&pMac->sme); @@ -4158,7 +4158,7 @@ QDF_STATUS sme_roam_get_pmkid_cache(tHalHandle hHal, uint8_t sessionId, QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_ROAM_GET_PMKIDCACHE, sessionId, 0)); status = sme_acquire_global_lock(&pMac->sme); @@ -4189,7 +4189,7 @@ QDF_STATUS sme_get_config_param(tHalHandle hHal, tSmeConfigParams *pParam) QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_GET_CONFIGPARAM, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { @@ -4319,7 +4319,7 @@ QDF_STATUS sme_get_modify_profile_fields(tHalHandle hHal, uint8_t sessionId, QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_GET_MODPROFFIELDS, sessionId, 0)); status = sme_acquire_global_lock(&pMac->sme); @@ -4347,7 +4347,7 @@ void sme_set_dhcp_till_power_active_flag(tHalHandle hal, uint8_t flag) tpAniSirGlobal mac = PMAC_STRUCT(hal); struct ps_global_info *ps_global_info = &mac->sme.ps_global_info; - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_SET_DHCP_FLAG, NO_SESSION, flag)); /* Set/Clear the DHCP flag which will disable/enable auto PS */ @@ -4494,7 +4494,7 @@ QDF_STATUS sme_wow_add_pattern(tHalHandle hal, struct wow_add_pattern *ptrn; tSirRetStatus ret_code = eSIR_SUCCESS; tSirMsgQ msg_q; - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_WOWL_ADDBCAST_PATTERN, session_id, 0)); ptrn = cdf_mem_malloc(sizeof(*ptrn)); @@ -4535,7 +4535,7 @@ QDF_STATUS sme_wow_delete_pattern(tHalHandle hal, struct wow_delete_pattern *delete_ptrn; tSirRetStatus ret_code = eSIR_SUCCESS; tSirMsgQ msg_q; - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_WOWL_DELBCAST_PATTERN, sessionId, 0)); delete_ptrn = cdf_mem_malloc(sizeof(*delete_ptrn)); @@ -4612,7 +4612,7 @@ QDF_STATUS sme_enter_wowl(tHalHandle hal_ctx, QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal_ctx); struct ps_global_info *ps_global_info = &mac_ctx->sme.ps_global_info; - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_ENTER_WOWL, session_id, 0)); /* cache the WOWL information */ @@ -4651,7 +4651,7 @@ QDF_STATUS sme_exit_wowl(tHalHandle hal_ctx, QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal_ctx); uint8_t session_id; - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_EXIT_WOWL, NO_SESSION, 0)); session_id = wowl_exit_params->sessionId; status = sme_ps_process_command(mac_ctx, session_id, SME_PS_WOWL_EXIT); @@ -4681,7 +4681,7 @@ QDF_STATUS sme_roam_set_key(tHalHandle hal, uint8_t session_id, tCsrRoamSession *session = NULL; struct ps_global_info *ps_global_info = &mac_ctx->sme.ps_global_info; - MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_SET_KEY, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_SET_KEY, session_id, 0)); if (set_key->keyLength > CSR_MAX_KEY_LEN) { sms_log(mac_ctx, LOGE, FL("Invalid key length %d"), @@ -4749,13 +4749,13 @@ QDF_STATUS sme_roam_set_key(tHalHandle hal, uint8_t session_id, ---------------------------------------------------------------------------*/ QDF_STATUS sme_get_rssi(tHalHandle hHal, tCsrRssiCallback callback, - uint8_t staId, struct cdf_mac_addr bssId, int8_t lastRSSI, + uint8_t staId, struct qdf_mac_addr bssId, int8_t lastRSSI, void *pContext, void *p_cds_context) { QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_GET_RSSI, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { @@ -4780,7 +4780,7 @@ QDF_STATUS sme_get_rssi(tHalHandle hHal, ---------------------------------------------------------------------------*/ QDF_STATUS sme_get_snr(tHalHandle hHal, tCsrSnrCallback callback, - uint8_t staId, struct cdf_mac_addr bssId, void *pContext) + uint8_t staId, struct qdf_mac_addr bssId, void *pContext) { QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); @@ -4806,7 +4806,7 @@ QDF_STATUS sme_get_snr(tHalHandle hHal, ---------------------------------------------------------------------------*/ QDF_STATUS sme_get_tsm_stats(tHalHandle hHal, tCsrTsmStatsCallback callback, - uint8_t staId, struct cdf_mac_addr bssId, + uint8_t staId, struct qdf_mac_addr bssId, void *pContext, void *p_cds_context, uint8_t tid) { QDF_STATUS status = QDF_STATUS_E_FAILURE; @@ -4849,7 +4849,7 @@ QDF_STATUS sme_get_statistics(tHalHandle hHal, QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_GET_STATS, NO_SESSION, periodicity)); status = sme_acquire_global_lock(&pMac->sme); @@ -4878,7 +4878,7 @@ QDF_STATUS sme_get_link_status(tHalHandle hHal, if (QDF_IS_STATUS_SUCCESS(status)) { pMsg = cdf_mem_malloc(sizeof(tAniGetLinkStatus)); if (NULL == pMsg) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for link status", __func__); sme_release_global_lock(&pMac->sme); @@ -4896,8 +4896,8 @@ QDF_STATUS sme_get_link_status(tHalHandle hHal, cds_message.reserved = 0; if (!QDF_IS_STATUS_SUCCESS - (cds_mq_post_message(CDF_MODULE_ID_WMA, &cds_message))) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + (cds_mq_post_message(QDF_MODULE_ID_WMA, &cds_message))) { + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Post LINK STATUS MSG fail", __func__); cdf_mem_free(pMsg); pMac->sme.linkStatusContext = NULL; @@ -4938,7 +4938,7 @@ QDF_STATUS sme_get_country_code(tHalHandle hHal, uint8_t *pBuf, uint8_t *pbLen) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_GET_CNTRYCODE, NO_SESSION, 0)); return csr_get_country_code(pMac, pBuf, pbLen); @@ -5012,7 +5012,7 @@ QDF_STATUS sme_change_country_code(tHalHandle hHal, cds_msg_t msg; tAniChangeCountryCodeReq *pMsg; - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_CHANGE_CNTRYCODE, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); @@ -5093,7 +5093,7 @@ QDF_STATUS sme_generic_change_country_code(tHalHandle hHal, tAniGenericChangeCountryCodeReq *pMsg; if (NULL == pMac) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, "%s: pMac is null", __func__); return status; } @@ -5176,7 +5176,7 @@ QDF_STATUS sme_dhcp_start_ind(tHalHandle hHal, pMsg = (tAniDHCPInd *) cdf_mem_malloc(sizeof(tAniDHCPInd)); if (NULL == pMsg) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for dhcp start", __func__); sme_release_global_lock(&pMac->sme); @@ -5186,7 +5186,7 @@ QDF_STATUS sme_dhcp_start_ind(tHalHandle hHal, pMsg->msgLen = (uint16_t) sizeof(tAniDHCPInd); pMsg->device_mode = device_mode; cdf_mem_copy(pMsg->adapterMacAddr.bytes, macAddr, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); cdf_copy_macaddr(&pMsg->peerMacAddr, &pSession->connectedProfile.bssid); @@ -5196,7 +5196,7 @@ QDF_STATUS sme_dhcp_start_ind(tHalHandle hHal, qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Post DHCP Start MSG fail", __func__); cdf_mem_free(pMsg); status = QDF_STATUS_E_FAILURE; @@ -5246,7 +5246,7 @@ QDF_STATUS sme_dhcp_stop_ind(tHalHandle hHal, pMsg = (tAniDHCPInd *) cdf_mem_malloc(sizeof(tAniDHCPInd)); if (NULL == pMsg) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for dhcp stop", __func__); sme_release_global_lock(&pMac->sme); @@ -5257,7 +5257,7 @@ QDF_STATUS sme_dhcp_stop_ind(tHalHandle hHal, pMsg->msgLen = (uint16_t) sizeof(tAniDHCPInd); pMsg->device_mode = device_mode; cdf_mem_copy(pMsg->adapterMacAddr.bytes, macAddr, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); cdf_copy_macaddr(&pMsg->peerMacAddr, &pSession->connectedProfile.bssid); @@ -5267,7 +5267,7 @@ QDF_STATUS sme_dhcp_stop_ind(tHalHandle hHal, qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Post DHCP Stop MSG fail", __func__); cdf_mem_free(pMsg); status = QDF_STATUS_E_FAILURE; @@ -5291,7 +5291,7 @@ void sme_set_cfg_privacy(tHalHandle hHal, tCsrRoamProfile *pProfile, bool fPrivacy) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_SET_CFGPRIVACY, NO_SESSION, 0)); if (QDF_STATUS_SUCCESS == sme_acquire_global_lock(&pMac->sme)) { csr_set_cfg_privacy(pMac, pProfile, fPrivacy); @@ -5317,7 +5317,7 @@ QDF_STATUS sme_neighbor_report_request(tHalHandle hHal, uint8_t sessionId, { QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_NEIGHBOR_REPORTREQ, NO_SESSION, 0)); @@ -5585,7 +5585,7 @@ QDF_STATUS sme_open_session(tHalHandle hHal, csr_roam_completeCallback callback, QDF_STATUS status; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "%s: type=%d, subType=%d", __func__, type, subType); if (NULL == pbSessionId) { @@ -5602,7 +5602,7 @@ QDF_STATUS sme_open_session(tHalHandle hHal, csr_roam_completeCallback callback, } } if (NULL != pbSessionId) - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_OPEN_SESSION, *pbSessionId, 0)); @@ -5633,7 +5633,7 @@ QDF_STATUS sme_close_session(tHalHandle hHal, uint8_t sessionId, QDF_STATUS status; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_CLOSE_SESSION, sessionId, 0)); status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { @@ -5753,7 +5753,7 @@ QDF_STATUS sme_set_host_offload(tHalHandle hHal, uint8_t sessionId, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); QDF_STATUS status = QDF_STATUS_E_FAILURE; - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_SET_HOSTOFFLOAD, sessionId, 0)); status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { @@ -5791,19 +5791,19 @@ QDF_STATUS sme_set_gtk_offload(tHalHandle hHal, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: KeyReplayCounter: %lld", __func__, pGtkOffload->ullKeyReplayCounter); if (NULL == pSession) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Session not found ", __func__); return QDF_STATUS_E_FAILURE; } request_buf = cdf_mem_malloc(sizeof(*request_buf)); if (NULL == request_buf) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to allocate memory for GTK offload request")); return QDF_STATUS_E_NOMEM; } @@ -5817,8 +5817,8 @@ QDF_STATUS sme_set_gtk_offload(tHalHandle hHal, msg.reserved = 0; msg.bodyptr = request_buf; if (!QDF_IS_STATUS_SUCCESS - (cds_mq_post_message(CDF_MODULE_ID_WMA, &msg))) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + (cds_mq_post_message(QDF_MODULE_ID_WMA, &msg))) { + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to post SIR_HAL_SET_GTK_OFFLOAD message to HAL")); cdf_mem_free(request_buf); return QDF_STATUS_E_FAILURE; @@ -5845,18 +5845,18 @@ QDF_STATUS sme_get_gtk_offload(tHalHandle hHal, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, session_id); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: Entered", + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: Entered", __func__); if (NULL == pSession) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Session not found", __func__); return QDF_STATUS_E_FAILURE; } request_buf = cdf_mem_malloc(sizeof(*request_buf)); if (NULL == request_buf) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to allocate memory for Get GTK offload request")); return QDF_STATUS_E_NOMEM; } @@ -5884,8 +5884,8 @@ QDF_STATUS sme_get_gtk_offload(tHalHandle hHal, pMac->sme.gtk_offload_get_info_cb_context = callback_context; if (!QDF_IS_STATUS_SUCCESS - (cds_mq_post_message(CDF_MODULE_ID_WMA, &msg))) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + (cds_mq_post_message(QDF_MODULE_ID_WMA, &msg))) { + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to post WMA_GTK_OFFLOAD_GETINFO_REQ message to WMA")); cdf_mem_free(request_buf); return QDF_STATUS_E_FAILURE; @@ -5910,17 +5910,17 @@ QDF_STATUS sme_set_keep_alive(tHalHandle hHal, uint8_t session_id, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, session_id); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_LOW, FL("WMA_SET_KEEP_ALIVE message")); if (pSession == NULL) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Session not Found")); return QDF_STATUS_E_FAILURE; } request_buf = cdf_mem_malloc(sizeof(tSirKeepAliveReq)); if (NULL == request_buf) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to allocate memory for keep alive request")); return QDF_STATUS_E_NOMEM; } @@ -5928,7 +5928,7 @@ QDF_STATUS sme_set_keep_alive(tHalHandle hHal, uint8_t session_id, cdf_copy_macaddr(&request->bssid, &pSession->connectedProfile.bssid); cdf_mem_copy(request_buf, request, sizeof(tSirKeepAliveReq)); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_LOW, "buff TP %d input TP %d ", request_buf->timePeriod, request->timePeriod); request_buf->sessionId = session_id; @@ -5937,8 +5937,8 @@ QDF_STATUS sme_set_keep_alive(tHalHandle hHal, uint8_t session_id, msg.reserved = 0; msg.bodyptr = request_buf; if (QDF_STATUS_SUCCESS != - cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) { + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to post WMA_SET_KEEP_ALIVE message to WMA")); cdf_mem_free(request_buf); return QDF_STATUS_E_FAILURE; @@ -5966,7 +5966,7 @@ QDF_STATUS sme_set_preferred_network_list(tHalHandle hHal, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); QDF_STATUS status; - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_PREF_NET_LIST, sessionId, request->ucNetworksCount)); status = sme_acquire_global_lock(&pMac->sme); @@ -5997,7 +5997,7 @@ QDF_STATUS sme_abort_mac_scan(tHalHandle hHal, uint8_t sessionId, QDF_STATUS status; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_ABORT_MACSCAN, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { @@ -6101,7 +6101,7 @@ QDF_STATUS sme_register_mgmt_frame(tHalHandle hHal, uint8_t sessionId, QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_REGISTER_MGMTFR, sessionId, 0)); status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { @@ -6117,7 +6117,7 @@ QDF_STATUS sme_register_mgmt_frame(tHalHandle hHal, uint8_t sessionId, } if (!CSR_IS_SESSION_ANY(sessionId) && !pSession->sessionActive) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s Invalid Sessionid", __func__); sme_release_global_lock(&pMac->sme); return QDF_STATUS_E_FAILURE; @@ -6162,7 +6162,7 @@ QDF_STATUS sme_deregister_mgmt_frame(tHalHandle hHal, uint8_t sessionId, QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_DEREGISTER_MGMTFR, sessionId, 0)); status = sme_acquire_global_lock(&pMac->sme); @@ -6179,7 +6179,7 @@ QDF_STATUS sme_deregister_mgmt_frame(tHalHandle hHal, uint8_t sessionId, } if (!CSR_IS_SESSION_ANY(sessionId) && !pSession->sessionActive) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s Invalid Sessionid", __func__); sme_release_global_lock(&pMac->sme); return QDF_STATUS_E_FAILURE; @@ -6233,7 +6233,7 @@ QDF_STATUS sme_remain_on_channel(tHalHandle hHal, uint8_t session_id, cds_msg_t msg; - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_REMAIN_ONCHAN, session_id, 0)); scan_count = csr_ll_count(&mac_ctx->sme.smeScanCmdActiveList); @@ -6322,7 +6322,7 @@ QDF_STATUS sme_update_p2p_ie(tHalHandle hHal, void *p2pIe, uint32_t p2pIeLength) QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_UPDATE_P2P_IE, NO_SESSION, 0)); /* acquire the lock for the sme object */ status = sme_acquire_global_lock(&pMac->sme); @@ -6373,7 +6373,7 @@ QDF_STATUS sme_send_action(tHalHandle hHal, uint8_t sessionId, QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_SEND_ACTION, sessionId, 0)); /* acquire the lock for the sme object */ status = sme_acquire_global_lock(&pMac->sme); @@ -6395,7 +6395,7 @@ QDF_STATUS sme_cancel_remain_on_channel(tHalHandle hHal, QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_CANCEL_REMAIN_ONCHAN, sessionId, 0)); status = sme_acquire_global_lock(&pMac->sme); @@ -6451,7 +6451,7 @@ QDF_STATUS sme_configure_rxp_filter(tHalHandle hHal, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t cds_message; - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_CONFIG_RXPFIL, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { @@ -6498,7 +6498,7 @@ QDF_STATUS sme_configure_suspend_ind(tHalHandle hHal, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t cds_message; - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_CONFIG_SUSPENDIND, NO_SESSION, 0)); @@ -6547,7 +6547,7 @@ QDF_STATUS sme_configure_resume_req(tHalHandle hHal, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t cds_message; - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_CONFIG_RESUMEREQ, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); @@ -6589,7 +6589,7 @@ QDF_STATUS sme_configure_ext_wow(tHalHandle hHal, if (!MsgPtr) return QDF_STATUS_E_NOMEM; - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_CONFIG_EXTWOW, NO_SESSION, 0)); pMac->readyToExtWoWCallback = callback; @@ -6647,7 +6647,7 @@ QDF_STATUS sme_configure_app_type1_params(tHalHandle hHal, if (!MsgPtr) return QDF_STATUS_E_NOMEM; - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_CONFIG_APP_TYPE1, NO_SESSION, 0)); @@ -6698,7 +6698,7 @@ QDF_STATUS sme_configure_app_type2_params(tHalHandle hHal, if (!MsgPtr) return QDF_STATUS_E_NOMEM; - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_CONFIG_APP_TYPE2, NO_SESSION, 0)); @@ -6791,7 +6791,7 @@ uint8_t sme_get_concurrent_operation_channel(tHalHandle hHal) if (QDF_IS_STATUS_SUCCESS(status)) { channel = csr_get_concurrent_operation_channel(pMac); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: " + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: " " Other Concurrent Channel = %d", __func__, channel); sme_release_global_lock(&pMac->sme); } @@ -7077,7 +7077,7 @@ QDF_STATUS sme_handle_change_country_code(tpAniSirGlobal pMac, void *pMsgBuf) FL ("Clearing currentCountryBssid, countryCode11d")); cdf_mem_zero(&pMac->scan.currentCountryBssid, - sizeof(struct cdf_mac_addr)); + sizeof(struct qdf_mac_addr)); cdf_mem_zero(pMac->scan.countryCode11d, sizeof(pMac->scan.countryCode11d)); } @@ -7177,7 +7177,7 @@ sme_handle_generic_change_country_code(tpAniSirGlobal mac_ctx, sms_log(mac_ctx, LOGW, FL("Clearing currentCountryBssid, countryCode11d")); cdf_mem_zero(&mac_ctx->scan.currentCountryBssid, - sizeof(struct cdf_mac_addr)); + sizeof(struct qdf_mac_addr)); cdf_mem_zero(mac_ctx->scan.countryCode11d, sizeof(mac_ctx->scan.countryCode11d)); } @@ -7268,7 +7268,7 @@ QDF_STATUS sme_8023_multicast_list(tHalHandle hHal, uint8_t sessionId, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); tCsrRoamSession *pSession = NULL; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: " + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: " "ulMulticastAddrCnt=%d, multicastAddr[0]=%p", __func__, pMulticastAddrs->ulMulticastAddrCnt, pMulticastAddrs->multicastAddr[0].bytes); @@ -7282,7 +7282,7 @@ QDF_STATUS sme_8023_multicast_list(tHalHandle hHal, uint8_t sessionId, } if (pSession == NULL) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, "%s: Unable to find the session Id: %d", __func__, sessionId); return QDF_STATUS_E_FAILURE; @@ -7290,7 +7290,7 @@ QDF_STATUS sme_8023_multicast_list(tHalHandle hHal, uint8_t sessionId, request_buf = cdf_mem_malloc(sizeof(tSirRcvFltMcAddrList)); if (NULL == request_buf) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to " "allocate memory for 8023 Multicast List request", __func__); @@ -7298,7 +7298,7 @@ QDF_STATUS sme_8023_multicast_list(tHalHandle hHal, uint8_t sessionId, } if (!csr_is_conn_state_connected_infra(pMac, sessionId)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Ignoring the " "indication as we are not connected", __func__); cdf_mem_free(request_buf); @@ -7315,8 +7315,8 @@ QDF_STATUS sme_8023_multicast_list(tHalHandle hHal, uint8_t sessionId, msg.type = WMA_8023_MULTICAST_LIST_REQ; msg.reserved = 0; msg.bodyptr = request_buf; - if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) { + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to " "post WMA_8023_MULTICAST_LIST message to WMA", __func__); @@ -7338,7 +7338,7 @@ QDF_STATUS sme_receive_filter_set_filter(tHalHandle hHal, tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); uint8_t idx = 0; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: filterType=%d, " + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: filterType=%d, " "filterId = %d", __func__, pRcvPktFilterCfg->filterType, pRcvPktFilterCfg->filterId); @@ -7347,7 +7347,7 @@ QDF_STATUS sme_receive_filter_set_filter(tHalHandle hHal, request_buf = cdf_mem_malloc(allocSize); if (NULL == request_buf) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to " "allocate memory for Receive Filter Set Filter request", __func__); @@ -7355,7 +7355,7 @@ QDF_STATUS sme_receive_filter_set_filter(tHalHandle hHal, } if (NULL == pSession) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Session Not found ", __func__); cdf_mem_free(request_buf); return QDF_STATUS_E_FAILURE; @@ -7371,27 +7371,27 @@ QDF_STATUS sme_receive_filter_set_filter(tHalHandle hHal, msg.reserved = 0; msg.bodyptr = request_buf; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "Pkt Flt Req : " + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "Pkt Flt Req : " "FT %d FID %d ", request_buf->filterType, request_buf->filterId); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "Pkt Flt Req : " + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "Pkt Flt Req : " "params %d CT %d", request_buf->numFieldParams, request_buf->coalesceTime); for (idx = 0; idx < request_buf->numFieldParams; idx++) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "Proto %d Comp Flag %d ", request_buf->paramsData[idx].protocolLayer, request_buf->paramsData[idx].cmpFlag); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "Data Offset %d Data Len %d", request_buf->paramsData[idx].dataOffset, request_buf->paramsData[idx].dataLength); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "CData: %d:%d:%d:%d:%d:%d", request_buf->paramsData[idx].compareData[0], request_buf->paramsData[idx].compareData[1], @@ -7400,7 +7400,7 @@ QDF_STATUS sme_receive_filter_set_filter(tHalHandle hHal, request_buf->paramsData[idx].compareData[4], request_buf->paramsData[idx].compareData[5]); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "MData: %d:%d:%d:%d:%d:%d", request_buf->paramsData[idx].dataMask[0], request_buf->paramsData[idx].dataMask[1], @@ -7411,8 +7411,8 @@ QDF_STATUS sme_receive_filter_set_filter(tHalHandle hHal, } - if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) { + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to post " "WMA_RECEIVE_FILTER_SET_FILTER message to WMA", __func__); @@ -7432,18 +7432,18 @@ QDF_STATUS sme_receive_filter_clear_filter(tHalHandle hHal, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: filterId = %d", + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: filterId = %d", __func__, pRcvFltPktClearParam->filterId); if (NULL == pSession) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Session Not found", __func__); return QDF_STATUS_E_FAILURE; } request_buf = cdf_mem_malloc(sizeof(tSirRcvFltPktClearParam)); if (NULL == request_buf) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for Receive Filter " "Clear Filter request", __func__); return QDF_STATUS_E_NOMEM; @@ -7460,8 +7460,8 @@ QDF_STATUS sme_receive_filter_clear_filter(tHalHandle hHal, msg.type = WMA_RECEIVE_FILTER_CLEAR_FILTER_REQ; msg.reserved = 0; msg.bodyptr = request_buf; - if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) { + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to post " "WMA_RECEIVE_FILTER_CLEAR_FILTER message to WMA", __func__); @@ -7563,7 +7563,7 @@ QDF_STATUS sme_set_max_tx_power_per_band(eCsrBand band, int8_t dB) pMaxTxPowerPerBandParams = cdf_mem_malloc(sizeof(tMaxTxPowerPerBandParams)); if (NULL == pMaxTxPowerPerBandParams) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s:Not able to allocate memory for pMaxTxPowerPerBandParams", __func__); return QDF_STATUS_E_NOMEM; @@ -7576,8 +7576,8 @@ QDF_STATUS sme_set_max_tx_power_per_band(eCsrBand band, int8_t dB) msg.reserved = 0; msg.bodyptr = pMaxTxPowerPerBandParams; - if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) { + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s:Not able to post WMA_SET_MAX_TX_POWER_PER_BAND_REQ", __func__); cdf_mem_free(pMaxTxPowerPerBandParams); @@ -7601,17 +7601,17 @@ QDF_STATUS sme_set_max_tx_power_per_band(eCsrBand band, int8_t dB) \- return QDF_STATUS -------------------------------------------------------------------------------*/ -QDF_STATUS sme_set_max_tx_power(tHalHandle hHal, struct cdf_mac_addr pBssid, - struct cdf_mac_addr pSelfMacAddress, int8_t dB) +QDF_STATUS sme_set_max_tx_power(tHalHandle hHal, struct qdf_mac_addr pBssid, + struct qdf_mac_addr pSelfMacAddress, int8_t dB) { cds_msg_t msg; tpMaxTxPowerParams pMaxTxParams = NULL; - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_SET_MAXTXPOW, NO_SESSION, 0)); pMaxTxParams = cdf_mem_malloc(sizeof(tMaxTxPowerParams)); if (NULL == pMaxTxParams) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for pMaxTxParams", __func__); return QDF_STATUS_E_NOMEM; @@ -7625,8 +7625,8 @@ QDF_STATUS sme_set_max_tx_power(tHalHandle hHal, struct cdf_mac_addr pBssid, msg.reserved = 0; msg.bodyptr = pMaxTxParams; - if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) { + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to post WMA_SET_MAX_TX_POWER_REQ message to WMA", __func__); cdf_mem_free(pMaxTxParams); @@ -7653,7 +7653,7 @@ QDF_STATUS sme_set_custom_mac_addr(tSirMacAddr customMacAddr) pBaseMacAddr = cdf_mem_malloc(sizeof(tSirMacAddr)); if (NULL == pBaseMacAddr) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to allocate memory for pBaseMacAddr")); return QDF_STATUS_E_NOMEM; } @@ -7664,8 +7664,8 @@ QDF_STATUS sme_set_custom_mac_addr(tSirMacAddr customMacAddr) msg.reserved = 0; msg.bodyptr = pBaseMacAddr; - if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) { + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL ("Not able to post SIR_HAL_SET_BASE_MACADDR_IND message to WMA")); cdf_mem_free(pBaseMacAddr); @@ -7686,26 +7686,26 @@ QDF_STATUS sme_set_custom_mac_addr(tSirMacAddr customMacAddr) \- return QDF_STATUS ---------------------------------------------------------------------------*/ QDF_STATUS sme_set_tx_power(tHalHandle hHal, uint8_t sessionId, - struct cdf_mac_addr pBSSId, - enum tCDF_ADAPTER_MODE dev_mode, int dBm) + struct qdf_mac_addr pBSSId, + enum tQDF_ADAPTER_MODE dev_mode, int dBm) { cds_msg_t msg; tpMaxTxPowerParams pTxParams = NULL; int8_t power = (int8_t) dBm; - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_SET_TXPOW, sessionId, 0)); /* make sure there is no overflow */ if ((int)power != dBm) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: error, invalid power = %d", __func__, dBm); return QDF_STATUS_E_FAILURE; } pTxParams = cdf_mem_malloc(sizeof(tMaxTxPowerParams)); if (NULL == pTxParams) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for pTxParams", __func__); return QDF_STATUS_E_NOMEM; @@ -7718,8 +7718,8 @@ QDF_STATUS sme_set_tx_power(tHalHandle hHal, uint8_t sessionId, msg.reserved = 0; msg.bodyptr = pTxParams; - if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) { + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: failed to post WMA_SET_TX_POWER_REQ to WMA", __func__); cdf_mem_free(pTxParams); @@ -7799,7 +7799,7 @@ QDF_STATUS sme_set_tm_level(tHalHandle hHal, uint16_t newTMLevel, uint16_t tmMod cds_msg_t cds_message; tAniSetTmLevelReq *setTmLevelReq = NULL; - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_SET_TMLEVEL, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { @@ -7807,7 +7807,7 @@ QDF_STATUS sme_set_tm_level(tHalHandle hHal, uint16_t newTMLevel, uint16_t tmMod (tAniSetTmLevelReq *) cdf_mem_malloc(sizeof(tAniSetTmLevelReq)); if (NULL == setTmLevelReq) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for sme_set_tm_level", __func__); sme_release_global_lock(&pMac->sme); @@ -7822,7 +7822,7 @@ QDF_STATUS sme_set_tm_level(tHalHandle hHal, uint16_t newTMLevel, uint16_t tmMod cds_message.type = WMA_SET_TM_LEVEL_REQ; qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Post Set TM Level MSG fail", __func__); cdf_mem_free(setTmLevelReq); status = QDF_STATUS_E_FAILURE; @@ -7845,7 +7845,7 @@ QDF_STATUS sme_set_tm_level(tHalHandle hHal, uint16_t newTMLevel, uint16_t tmMod void sme_feature_caps_exchange(tHalHandle hHal) { MTRACE(cdf_trace - (CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_CAPS_EXCH, NO_SESSION, + (QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_CAPS_EXCH, NO_SESSION, 0)); } @@ -7872,7 +7872,7 @@ void sme_disable_feature_capablity(uint8_t feature_index) void sme_reset_power_values_for5_g(tHalHandle hHal) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_RESET_PW5G, NO_SESSION, 0)); csr_save_channel_power_for_band(pMac, true); csr_apply_power2_current(pMac); /* Store the channel+power info in the global place: Cfg */ @@ -7893,11 +7893,11 @@ QDF_STATUS sme_update_roam_prefer5_g_hz(tHalHandle hHal, bool nRoamPrefer5GHz) tpAniSirGlobal pMac = PMAC_STRUCT(hHal); QDF_STATUS status = QDF_STATUS_SUCCESS; - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_UPDATE_RP5G, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: gRoamPrefer5GHz is changed from %d to %d", __func__, pMac->roam.configParam.nRoamPrefer5GHz, nRoamPrefer5GHz); @@ -7922,11 +7922,11 @@ QDF_STATUS sme_set_roam_intra_band(tHalHandle hHal, const bool nRoamIntraBand) tpAniSirGlobal pMac = PMAC_STRUCT(hHal); QDF_STATUS status = QDF_STATUS_SUCCESS; - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_SET_ROAMIBAND, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: gRoamIntraBand is changed from %d to %d", __func__, pMac->roam.configParam.nRoamIntraBand, nRoamIntraBand); @@ -7953,12 +7953,12 @@ QDF_STATUS sme_update_roam_scan_n_probes(tHalHandle hHal, uint8_t sessionId, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); QDF_STATUS status = QDF_STATUS_SUCCESS; - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_UPDATE_ROAM_SCAN_N_PROBES, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: gRoamScanNProbes is changed from %d to %d", __func__, pMac->roam.configParam.nProbes, nProbes); pMac->roam.configParam.nProbes = nProbes; @@ -7992,12 +7992,12 @@ QDF_STATUS sme_update_roam_scan_home_away_time(tHalHandle hHal, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); QDF_STATUS status = QDF_STATUS_SUCCESS; - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_UPDATE_ROAM_SCAN_HOME_AWAY_TIME, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: gRoamScanHomeAwayTime is changed from %d to %d", __func__, pMac->roam.configParam.nRoamScanHomeAwayTime, @@ -8062,7 +8062,7 @@ QDF_STATUS sme_ext_change_channel(tHalHandle h_hal, uint32_t channel, bool sme_get_roam_intra_band(tHalHandle hHal) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_GET_ROAMIBAND, NO_SESSION, 0)); return pMac->roam.configParam.nRoamIntraBand; } @@ -8112,7 +8112,7 @@ QDF_STATUS sme_update_roam_rssi_diff(tHalHandle hHal, uint8_t sessionId, status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "LFR runtime successfully set roam rssi diff to %d - old value is %d - roam state is %s", RoamRssiDiff, pMac->roam.configParam.RoamRssiDiff, @@ -8149,12 +8149,12 @@ QDF_STATUS sme_update_fast_transition_enabled(tHalHandle hHal, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); QDF_STATUS status = QDF_STATUS_SUCCESS; - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_UPDATE_FTENABLED, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: FastTransitionEnabled is changed from %d to %d", __func__, pMac->roam.configParam.isFastTransitionEnabled, @@ -8187,7 +8187,7 @@ QDF_STATUS sme_update_wes_mode(tHalHandle hHal, bool isWESModeEnabled, status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "LFR runtime successfully set WES Mode to %d - old value is %d - roam state is %s", isWESModeEnabled, pMac->roam.configParam.isWESModeEnabled, @@ -8219,11 +8219,11 @@ QDF_STATUS sme_set_roam_scan_control(tHalHandle hHal, uint8_t sessionId, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); QDF_STATUS status = QDF_STATUS_SUCCESS; - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_SET_SCANCTRL, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "LFR runtime successfully set roam scan control to %d - old value is %d - roam state is %s", roamScanControl, pMac->roam.configParam.nRoamScanControl, @@ -8233,7 +8233,7 @@ QDF_STATUS sme_set_roam_scan_control(tHalHandle hHal, uint8_t sessionId, neighborRoamState)); pMac->roam.configParam.nRoamScanControl = roamScanControl; if (0 == roamScanControl) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "LFR runtime successfully cleared roam scan cache"); csr_flush_cfg_bg_scan_roam_channel_list(pMac, sessionId); if (pMac->roam.configParam.isRoamOffloadScanEnabled) { @@ -8267,7 +8267,7 @@ QDF_STATUS sme_update_is_fast_roam_ini_feature_enabled if (pMac->roam.configParam.isFastRoamIniFeatureEnabled == isFastRoamIniFeatureEnabled) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "%s: FastRoam is already enabled or disabled, nothing to do (returning) old(%d) new(%d)", __func__, pMac->roam.configParam.isFastRoamIniFeatureEnabled, @@ -8275,7 +8275,7 @@ QDF_STATUS sme_update_is_fast_roam_ini_feature_enabled return QDF_STATUS_SUCCESS; } - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "%s: FastRoamEnabled is changed from %d to %d", __func__, pMac->roam.configParam.isFastRoamIniFeatureEnabled, isFastRoamIniFeatureEnabled); @@ -8306,7 +8306,7 @@ QDF_STATUS sme_update_is_mawc_ini_feature_enabled(tHalHandle hHal, status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: MAWCEnabled is changed from %d to %d", __func__, pMac->roam.configParam.MAWCEnabled, MAWCEnabled); pMac->roam.configParam.MAWCEnabled = MAWCEnabled; @@ -8417,7 +8417,7 @@ QDF_STATUS sme_update_is_ese_feature_enabled if (pMac->roam.configParam.isEseIniFeatureEnabled == isEseIniFeatureEnabled) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: ESE Mode is already enabled or disabled, nothing to do (returning) old(%d) new(%d)", __func__, pMac->roam.configParam.isEseIniFeatureEnabled, @@ -8425,7 +8425,7 @@ QDF_STATUS sme_update_is_ese_feature_enabled return QDF_STATUS_SUCCESS; } - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: EseEnabled is changed from %d to %d", __func__, pMac->roam.configParam.isEseIniFeatureEnabled, isEseIniFeatureEnabled); @@ -8466,7 +8466,7 @@ QDF_STATUS sme_update_config_fw_rssi_monitoring(tHalHandle hHal, if (sme_cfg_set_int (hHal, WNI_CFG_PS_ENABLE_RSSI_MONITOR, fEnableFwRssiMonitoring) == QDF_STATUS_E_FAILURE) { cdf_ret_status = QDF_STATUS_E_FAILURE; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "Could not pass on WNI_CFG_PS_RSSI_MONITOR to CFG"); } @@ -8499,7 +8499,7 @@ QDF_STATUS sme_set_roam_opportunistic_scan_threshold_diff(tHalHandle hHal, sessionId, nOpportunisticThresholdDiff); if (QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "LFR runtime successfully set " "opportunistic threshold diff to %d" " - old value is %d - roam state is %d", @@ -8556,7 +8556,7 @@ QDF_STATUS sme_set_roam_rescan_rssi_diff(tHalHandle hHal, status = csr_neighbor_roam_set_roam_rescan_rssi_diff(pMac, sessionId, nRoamRescanRssiDiff); if (QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "LFR runtime successfully set " "opportunistic threshold diff to %d" " - old value is %d - roam state is %d", @@ -8611,7 +8611,7 @@ QDF_STATUS sme_set_roam_bmiss_first_bcnt(tHalHandle hHal, status = csr_neighbor_roam_set_roam_bmiss_first_bcnt(pMac, sessionId, nRoamBmissFirstBcnt); if (QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "LFR runtime successfully set " "beacon miss first beacon count to %d" " - old value is %d - roam state is %d", @@ -8664,7 +8664,7 @@ QDF_STATUS sme_set_roam_bmiss_final_bcnt(tHalHandle hHal, status = csr_neighbor_roam_set_roam_bmiss_final_bcnt(pMac, sessionId, nRoamBmissFinalBcnt); if (QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "LFR runtime successfully set " "beacon miss final beacon count to %d" " - old value is %d - roam state is %d", @@ -8719,7 +8719,7 @@ QDF_STATUS sme_set_roam_beacon_rssi_weight(tHalHandle hHal, status = csr_neighbor_roam_set_roam_beacon_rssi_weight(pMac, sessionId, nRoamBeaconRssiWeight); if (QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "LFR runtime successfully set " "beacon miss final beacon count to %d" " - old value is %d - roam state is %d", @@ -8770,7 +8770,7 @@ QDF_STATUS sme_set_neighbor_lookup_rssi_threshold status = csr_neighbor_roam_set_lookup_rssi_threshold(pMac, sessionId, neighborLookupRssiThreshold); if (QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "LFR runtime successfully set Lookup threshold to %d - old value is %d - roam state is %s", neighborLookupRssiThreshold, pMac->roam.configParam.neighborRoamConfig. @@ -8806,7 +8806,7 @@ QDF_STATUS sme_set_delay_before_vdev_stop(tHalHandle hal, QDF_STATUS status = QDF_STATUS_SUCCESS; status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, FL("LFR param delay_before_vdev_stop changed from %d to %d"), pMac->roam.configParam.neighborRoamConfig. @@ -8860,7 +8860,7 @@ QDF_STATUS sme_set_neighbor_scan_refresh_period pNeighborRoamConfig = &pMac->roam.configParam.neighborRoamConfig; pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[sessionId]; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "LFR runtime successfully set roam scan refresh period to %d- old value is %d - roam state is %s", neighborScanResultsRefreshPeriod, pMac->roam.configParam.neighborRoamConfig. @@ -8904,7 +8904,7 @@ QDF_STATUS sme_update_roam_scan_offload_enabled(tHalHandle hHal, status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, FL ("gRoamScanOffloadEnabled is changed from %d to %d"), pMac->roam.configParam.isRoamOffloadScanEnabled, @@ -8973,7 +8973,7 @@ QDF_STATUS sme_update_empty_scan_refresh_period(tHalHandle hHal, uint8_t session pNeighborRoamConfig = &pMac->roam.configParam.neighborRoamConfig; pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[sessionId]; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "LFR runtime successfully set roam scan period to %d -old value is %d - roam state is %s", nEmptyScanRefreshPeriod, pMac->roam.configParam.neighborRoamConfig. @@ -9018,7 +9018,7 @@ QDF_STATUS sme_set_neighbor_scan_min_chan_time(tHalHandle hHal, status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "LFR runtime successfully set channel min dwell time to %d - old value is %d - roam state is %s", nNeighborScanMinChanTime, pMac->roam.configParam.neighborRoamConfig. @@ -9064,7 +9064,7 @@ QDF_STATUS sme_set_neighbor_scan_max_chan_time(tHalHandle hHal, uint8_t sessionI pNeighborRoamConfig = &pMac->roam.configParam.neighborRoamConfig; pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[sessionId]; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "LFR runtime successfully set channel max dwell time to %d - old value is %d - roam state is %s", nNeighborScanMaxChanTime, pMac->roam.configParam.neighborRoamConfig. @@ -9247,7 +9247,7 @@ QDF_STATUS sme_set_neighbor_scan_period(tHalHandle hHal, uint8_t sessionId, pNeighborRoamConfig = &pMac->roam.configParam.neighborRoamConfig; pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[sessionId]; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "LFR runtime successfully set neighbor scan period to %d" " - old value is %d - roam state is %s", nNeighborScanPeriod, @@ -9364,7 +9364,7 @@ QDF_STATUS sme_change_roam_scan_channel_list(tHalHandle hHal, uint8_t sessionId, break; } } - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, FL("LFR runtime successfully set roam scan channels to %s - old value is %s - roam state is %d"), newChannelList, oldChannelList, pMac->roam.neighborRoamInfo[sessionId].neighborRoamState); @@ -9432,7 +9432,7 @@ QDF_STATUS sme_set_ese_roam_scan_channel_list(tHalHandle hHal, curchnl_list_info->ChannelList[i]); } } - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "ESE roam scan chnl list successfully set to %s-old value is %s-roam state is %d", newChannelList, oldChannelList, pNeighborRoamInfo->neighborRoamState); @@ -9472,7 +9472,7 @@ QDF_STATUS sme_get_roam_scan_channel_list(tHalHandle hHal, if (!QDF_IS_STATUS_SUCCESS(status)) return status; if (NULL == pNeighborRoamInfo->cfgParams.channelInfo.ChannelList) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, FL("Roam Scan channel list is NOT yet initialized")); *pNumChannels = 0; sme_release_global_lock(&pMac->sme); @@ -9592,7 +9592,7 @@ QDF_STATUS sme_send_tdls_link_establish_params(tHalHandle hHal, QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_TDLS_LINK_ESTABLISH_PARAM, sessionId, tdlsLinkEstablishParams->isOffChannelSupported)); @@ -9631,7 +9631,7 @@ QDF_STATUS sme_send_tdls_mgmt_frame(tHalHandle hHal, uint8_t sessionId, tCsrTdlsSendMgmt sendTdlsReq = { {0} }; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_TDLS_SEND_MGMT_FRAME, sessionId, statusCode)); status = sme_acquire_global_lock(&pMac->sme); @@ -9670,11 +9670,11 @@ QDF_STATUS sme_change_tdls_peer_sta(tHalHandle hHal, uint8_t sessionId, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); if (NULL == pstaParams) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s :pstaParams is NULL", __func__); return QDF_STATUS_E_FAILURE; } - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_TDLS_CHANGE_PEER_STA, sessionId, pstaParams->capability)); status = sme_acquire_global_lock(&pMac->sme); @@ -9702,7 +9702,7 @@ QDF_STATUS sme_add_tdls_peer_sta(tHalHandle hHal, uint8_t sessionId, QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_TDLS_ADD_PEER_STA, sessionId, 0)); status = sme_acquire_global_lock(&pMac->sme); @@ -9729,7 +9729,7 @@ QDF_STATUS sme_delete_tdls_peer_sta(tHalHandle hHal, uint8_t sessionId, QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_TDLS_DEL_PEER_STA, sessionId, 0)); status = sme_acquire_global_lock(&pMac->sme); @@ -9835,7 +9835,7 @@ QDF_STATUS sme_update_tdls_peer_state(tHalHandle hHal, return status; pTdlsPeerStateParams = cdf_mem_malloc(sizeof(*pTdlsPeerStateParams)); if (NULL == pTdlsPeerStateParams) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("failed to allocate mem for tdls peer state param")); sme_release_global_lock(&pMac->sme); return QDF_STATUS_E_NOMEM; @@ -9872,7 +9872,7 @@ QDF_STATUS sme_update_tdls_peer_state(tHalHandle hHal, break; default: - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("invalid peer state param (%d)"), peerStateParams->peerState); cdf_mem_free(pTdlsPeerStateParams); @@ -9958,7 +9958,7 @@ QDF_STATUS sme_send_tdls_chan_switch_req(tHalHandle hal, tdls_chan_switch_params *chan_switch_params = NULL; cds_msg_t cds_message; - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_TDLS_CHAN_SWITCH_REQ, NO_SESSION, ch_switch_params->tdls_off_channel)); status = sme_acquire_global_lock(&mac->sme); @@ -9966,7 +9966,7 @@ QDF_STATUS sme_send_tdls_chan_switch_req(tHalHandle hal, return status; chan_switch_params = cdf_mem_malloc(sizeof(*chan_switch_params)); if (NULL == chan_switch_params) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("fail to alloc mem for tdls chan switch param")); sme_release_global_lock(&mac->sme); return QDF_STATUS_E_FAILURE; @@ -9983,7 +9983,7 @@ QDF_STATUS sme_send_tdls_chan_switch_req(tHalHandle hal, break; default: - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("invalid off channel command (%d)"), ch_switch_params->tdls_off_ch_mode); cdf_mem_free(chan_switch_params); @@ -10000,7 +10000,7 @@ QDF_STATUS sme_send_tdls_chan_switch_req(tHalHandle hal, chan_switch_params->is_responder = ch_switch_params->is_responder; chan_switch_params->oper_class = ch_switch_params->opclass; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("Country Code=%s, Req offset=%d, Selected Operate Class=%d"), mac->scan.countryCodeCurrent, chan_switch_params->tdls_off_ch_bw_offset, @@ -10012,7 +10012,7 @@ QDF_STATUS sme_send_tdls_chan_switch_req(tHalHandle hal, qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Message Post failed status=%d"), qdf_status); cdf_mem_free(chan_switch_params); @@ -10038,7 +10038,7 @@ QDF_STATUS sme_get_link_speed(tHalHandle hHal, tSirLinkSpeedInfo *lsReq, if (QDF_STATUS_SUCCESS == status) { if ((NULL == pCallbackfn) && (NULL == pMac->sme.pLinkSpeedIndCb)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Indication Call back did not registered", __func__); sme_release_global_lock(&pMac->sme); @@ -10052,7 +10052,7 @@ QDF_STATUS sme_get_link_speed(tHalHandle hHal, tSirLinkSpeedInfo *lsReq, cds_message.type = WMA_GET_LINK_SPEED; qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Post Link Speed msg fail", __func__); status = QDF_STATUS_E_FAILURE; } @@ -10072,7 +10072,7 @@ void sme_update_enable_ssr(tHalHandle hHal, bool enableSSR) status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "SSR level is changed %d", enableSSR); /* not serializing this messsage, as this is only going * to set a variable in WMA/WDI @@ -10200,7 +10200,7 @@ QDF_STATUS sme_set_ch_params(tHalHandle hHal, eCsrPhyMode eCsrPhyMode, if (!CSR_IS_PHY_MODE_11n(eCsrPhyMode) || ch_params->ch_width == CH_WIDTH_20MHZ || QDF_STATUS_SUCCESS != csr_is_valid_channel(mac_ctx, channel)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Invalid Channel/phymode config: CB Mode disabled", __func__); ch_params->ch_width = CH_WIDTH_20MHZ; @@ -10289,7 +10289,7 @@ ePhyChanBondState sme_get_cb_phy_state_from_cb_ini_value(uint32_t cb_ini_value) --------------------------------------------------------------------------*/ void sme_set_curr_device_mode(tHalHandle hHal, - enum tCDF_ADAPTER_MODE currDeviceMode) + enum tQDF_ADAPTER_MODE currDeviceMode) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); pMac->sme.currDeviceMode = currDeviceMode; @@ -10318,7 +10318,7 @@ QDF_STATUS sme_handoff_request(tHalHandle hHal, status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: invoked", __func__); status = csr_handoff_request(pMac, sessionId, pHandoffInfo); sme_release_global_lock(&pMac->sme); @@ -10348,7 +10348,7 @@ QDF_STATUS sme_ipa_offload_enable_disable(tHalHandle hal, uint8_t session_id, if (QDF_STATUS_SUCCESS == status) { request_buf = cdf_mem_malloc(sizeof(*request_buf)); if (NULL == request_buf) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to allocate memory for \ IPA_OFFLOAD_ENABLE_DISABLE")); sme_release_global_lock(&pMac->sme); @@ -10364,7 +10364,7 @@ QDF_STATUS sme_ipa_offload_enable_disable(tHalHandle hal, uint8_t session_id, msg.bodyptr = request_buf; if (!QDF_IS_STATUS_SUCCESS( cds_mq_post_message(CDS_MQ_ID_WMA, &msg))) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to post WMA_IPA_OFFLOAD_\ ENABLE_DISABLE message to WMA")); cdf_mem_free(request_buf); @@ -10411,14 +10411,14 @@ QDF_STATUS sme_lphb_config_req tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t cds_message; - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_LPHB_CONFIG_REQ, NO_SESSION, lphdReq->cmd)); status = sme_acquire_global_lock(&pMac->sme); if (QDF_STATUS_SUCCESS == status) { if ((LPHB_SET_EN_PARAMS_INDID == lphdReq->cmd) && (NULL == pCallbackfn) && (NULL == pMac->sme.pLphbIndCb)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Indication Call back did not registered", __func__); sme_release_global_lock(&pMac->sme); @@ -10432,7 +10432,7 @@ QDF_STATUS sme_lphb_config_req cds_message.type = WMA_LPHB_CONF_REQ; qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Post Config LPHB MSG fail", __func__); status = QDF_STATUS_E_FAILURE; } @@ -10458,7 +10458,7 @@ void sme_enable_disable_split_scan(tHalHandle hHal, uint8_t nNumStaChan, pMac->roam.configParam.nNumStaChanCombinedConc = nNumStaChan; pMac->roam.configParam.nNumP2PChanCombinedConc = nNumP2PChan; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: SCAN nNumStaChanCombinedConc : %d," "nNumP2PChanCombinedConc : %d ", __func__, nNumStaChan, nNumP2PChan); @@ -10505,7 +10505,7 @@ sme_add_periodic_tx_ptrn(tHalHandle hal, /* Serialize the req through MC thread */ msg.bodyptr = req_msg; msg.type = WMA_ADD_PERIODIC_TX_PTRN_IND; - status = cds_mq_post_message(CDF_MODULE_ID_WMA, &msg); + status = cds_mq_post_message(QDF_MODULE_ID_WMA, &msg); if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac, LOGE, FL("cds_mq_post_message failed!(err=%d)"), @@ -10554,7 +10554,7 @@ sme_del_periodic_tx_ptrn(tHalHandle hal, /* Serialize the req through MC thread */ msg.bodyptr = req_msg; msg.type = WMA_DEL_PERIODIC_TX_PTRN_IND; - status = cds_mq_post_message(CDF_MODULE_ID_WMA, &msg); + status = cds_mq_post_message(QDF_MODULE_ID_WMA, &msg); if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac, LOGE, FL("cds_mq_post_message failed!(err=%d)"), @@ -10572,7 +10572,7 @@ void sme_get_command_q_status(tHalHandle hHal) tpAniSirGlobal pMac = PMAC_STRUCT(hHal); if (NULL == pMac) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: pMac is NULL", __func__); return; } @@ -10703,9 +10703,9 @@ QDF_STATUS sme_ocb_set_config(tHalHandle hHal, void *context, pMac->sme.ocb_set_config_callback = callback; pMac->sme.ocb_set_config_context = context; - status = cds_mq_post_message(CDF_MODULE_ID_WMA, &msg); + status = cds_mq_post_message(QDF_MODULE_ID_WMA, &msg); if (!QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Error posting message to WDA: %d"), status); pMac->sme.ocb_set_config_callback = callback; pMac->sme.ocb_set_config_context = context; @@ -10740,7 +10740,7 @@ QDF_STATUS sme_ocb_set_utc_time(tHalHandle hHal, struct sir_ocb_utc *utc) sme_utc = cdf_mem_malloc(sizeof(*sme_utc)); if (!sme_utc) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Malloc failed")); status = QDF_STATUS_E_NOMEM; goto end; @@ -10750,9 +10750,9 @@ QDF_STATUS sme_ocb_set_utc_time(tHalHandle hHal, struct sir_ocb_utc *utc) msg.type = WMA_OCB_SET_UTC_TIME_CMD; msg.reserved = 0; msg.bodyptr = sme_utc; - status = cds_mq_post_message(CDF_MODULE_ID_WMA, &msg); + status = cds_mq_post_message(QDF_MODULE_ID_WMA, &msg); if (!QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to post message to WDA")); cdf_mem_free(utc); goto end; @@ -10788,7 +10788,7 @@ QDF_STATUS sme_ocb_start_timing_advert(tHalHandle hHal, buf = cdf_mem_malloc(sizeof(*sme_timing_advert) + timing_advert->template_length); if (!buf) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to allocate memory for start TA")); status = QDF_STATUS_E_NOMEM; goto end; @@ -10803,9 +10803,9 @@ QDF_STATUS sme_ocb_start_timing_advert(tHalHandle hHal, msg.type = WMA_OCB_START_TIMING_ADVERT_CMD; msg.reserved = 0; msg.bodyptr = buf; - status = cds_mq_post_message(CDF_MODULE_ID_WMA, &msg); + status = cds_mq_post_message(QDF_MODULE_ID_WMA, &msg); if (!QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to post msg to WDA")); goto end; } @@ -10838,7 +10838,7 @@ QDF_STATUS sme_ocb_stop_timing_advert(tHalHandle hHal, sme_timing_advert = cdf_mem_malloc(sizeof(*timing_advert)); if (!sme_timing_advert) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to allocate memory for stop TA")); status = QDF_STATUS_E_NOMEM; goto end; @@ -10848,9 +10848,9 @@ QDF_STATUS sme_ocb_stop_timing_advert(tHalHandle hHal, msg.type = WMA_OCB_STOP_TIMING_ADVERT_CMD; msg.reserved = 0; msg.bodyptr = sme_timing_advert; - status = cds_mq_post_message(CDF_MODULE_ID_WMA, &msg); + status = cds_mq_post_message(QDF_MODULE_ID_WMA, &msg); if (!QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to post msg to WDA")); goto end; } @@ -10923,9 +10923,9 @@ QDF_STATUS sme_ocb_get_tsf_timer(tHalHandle hHal, void *context, pMac->sme.ocb_get_tsf_timer_context = context; /* Post the message to WDA */ - status = cds_mq_post_message(CDF_MODULE_ID_WMA, &msg); + status = cds_mq_post_message(QDF_MODULE_ID_WMA, &msg); if (!QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Error posting message to WDA: %d"), status); pMac->sme.ocb_get_tsf_timer_callback = NULL; pMac->sme.ocb_get_tsf_timer_context = NULL; @@ -10981,9 +10981,9 @@ QDF_STATUS sme_dcc_get_stats(tHalHandle hHal, void *context, pMac->sme.dcc_get_stats_callback = callback; pMac->sme.dcc_get_stats_context = context; - status = cds_mq_post_message(CDF_MODULE_ID_WMA, &msg); + status = cds_mq_post_message(QDF_MODULE_ID_WMA, &msg); if (!QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Error posting message to WDA: %d"), status); pMac->sme.dcc_get_stats_callback = callback; pMac->sme.dcc_get_stats_context = context; @@ -11020,7 +11020,7 @@ QDF_STATUS sme_dcc_clear_stats(tHalHandle hHal, uint32_t vdev_id, request = cdf_mem_malloc(sizeof(struct sir_dcc_clear_stats)); if (!request) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to allocate memory")); status = QDF_STATUS_E_NOMEM; goto end; @@ -11033,9 +11033,9 @@ QDF_STATUS sme_dcc_clear_stats(tHalHandle hHal, uint32_t vdev_id, msg.type = WMA_DCC_CLEAR_STATS_CMD; msg.bodyptr = request; - status = cds_mq_post_message(CDF_MODULE_ID_WMA, &msg); + status = cds_mq_post_message(QDF_MODULE_ID_WMA, &msg); if (!QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to post msg to WDA")); cdf_mem_free(request); goto end; @@ -11075,7 +11075,7 @@ QDF_STATUS sme_dcc_update_ndl(tHalHandle hHal, void *context, request->dcc_ndl_chan_list_len + request->dcc_ndl_active_state_list_len); if (!msg_body) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Failed to allocate memory")); status = QDF_STATUS_E_NOMEM; goto end; @@ -11099,9 +11099,9 @@ QDF_STATUS sme_dcc_update_ndl(tHalHandle hHal, void *context, pMac->sme.dcc_update_ndl_callback = callback; pMac->sme.dcc_update_ndl_context = context; - status = cds_mq_post_message(CDF_MODULE_ID_WMA, &msg); + status = cds_mq_post_message(QDF_MODULE_ID_WMA, &msg); if (!QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Error posting message to WDA: %d"), status); pMac->sme.dcc_update_ndl_callback = NULL; pMac->sme.dcc_update_ndl_context = NULL; @@ -11142,12 +11142,12 @@ void sme_get_recovery_stats(tHalHandle hHal) { uint8_t i; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "Self Recovery Stats"); for (i = 0; i < MAX_ACTIVE_CMD_STATS; i++) { if (eSmeNoCommand != g_self_recovery_stats.activeCmdStats[i].command) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "timestamp %llu: command 0x%0X: reason %d: session %d", g_self_recovery_stats.activeCmdStats[i]. timestamp, @@ -11176,7 +11176,7 @@ void sme_save_active_cmd_stats(tHalHandle hHal) tActiveCmdStats *actv_cmd_stat = NULL; if (NULL == pMac) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("pMac is NULL")); return; } @@ -11212,7 +11212,7 @@ void active_list_cmd_timeout_handle(void *userData) { if (NULL == userData) return; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Active List command timeout Cmd List Count %d", __func__, csr_ll_count(&((tpAniSirGlobal) userData)->sme. smeCmdActiveList)); @@ -11238,7 +11238,7 @@ QDF_STATUS sme_notify_modem_power_state(tHalHandle hHal, uint32_t value) request_buf = cdf_mem_malloc(sizeof(tSirModemPowerStateInd)); if (NULL == request_buf) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for MODEM POWER STATE IND", __func__); return QDF_STATUS_E_NOMEM; @@ -11250,8 +11250,8 @@ QDF_STATUS sme_notify_modem_power_state(tHalHandle hHal, uint32_t value) msg.reserved = 0; msg.bodyptr = request_buf; if (!QDF_IS_STATUS_SUCCESS - (cds_mq_post_message(CDF_MODULE_ID_WMA, &msg))) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + (cds_mq_post_message(QDF_MODULE_ID_WMA, &msg))) { + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to post WMA_MODEM_POWER_STATE_IND message" " to WMA", __func__); cdf_mem_free(request_buf); @@ -11263,7 +11263,7 @@ QDF_STATUS sme_notify_modem_power_state(tHalHandle hHal, uint32_t value) #ifdef QCA_HT_2040_COEX QDF_STATUS sme_notify_ht2040_mode(tHalHandle hHal, uint16_t staId, - struct cdf_mac_addr macAddrSTA, + struct qdf_mac_addr macAddrSTA, uint8_t sessionId, uint8_t channel_type) { @@ -11277,7 +11277,7 @@ QDF_STATUS sme_notify_ht2040_mode(tHalHandle hHal, uint16_t staId, pHtOpMode = cdf_mem_malloc(sizeof(tUpdateVHTOpMode)); if (NULL == pHtOpMode) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for setting OP mode", __func__); return QDF_STATUS_E_NOMEM; @@ -11294,7 +11294,7 @@ QDF_STATUS sme_notify_ht2040_mode(tHalHandle hHal, uint16_t staId, break; default: - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Invalid OP mode", __func__); return QDF_STATUS_E_FAILURE; } @@ -11308,15 +11308,15 @@ QDF_STATUS sme_notify_ht2040_mode(tHalHandle hHal, uint16_t staId, msg.reserved = 0; msg.bodyptr = pHtOpMode; if (!QDF_IS_STATUS_SUCCESS - (cds_mq_post_message(CDF_MODULE_ID_WMA, &msg))) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + (cds_mq_post_message(QDF_MODULE_ID_WMA, &msg))) { + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to post WMA_UPDATE_OP_MODE message" " to WMA", __func__); cdf_mem_free(pHtOpMode); return QDF_STATUS_E_FAILURE; } - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: Notifed FW about OP mode: %d for staId=%d", __func__, pHtOpMode->opMode, staId); @@ -11343,7 +11343,7 @@ QDF_STATUS sme_set_ht2040_mode(tHalHandle hHal, uint8_t sessionId, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); ePhyChanBondState cbMode; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: Update HT operation beacon IE, channel_type=%d", __func__, channel_type); @@ -11358,7 +11358,7 @@ QDF_STATUS sme_set_ht2040_mode(tHalHandle hHal, uint8_t sessionId, cbMode = PHY_DOUBLE_CHANNEL_LOW_PRIMARY; break; default: - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s:Error!!! Invalid HT20/40 mode !", __func__); return QDF_STATUS_E_FAILURE; } @@ -11389,7 +11389,7 @@ QDF_STATUS sme_set_phy_cb_mode24_g(tHalHandle hHal, ePhyChanBondState phyCBMode) tpAniSirGlobal pMac = PMAC_STRUCT(hHal); if (NULL == pMac) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: invalid context", __func__); return QDF_STATUS_E_FAILURE; } @@ -11408,20 +11408,20 @@ QDF_STATUS sme_set_phy_cb_mode24_g(tHalHandle hHal, ePhyChanBondState phyCBMode) QDF_STATUS sme_set_idle_powersave_config(void *cds_context, tHalHandle hHal, uint32_t value) { - void *wmaContext = cds_get_context(CDF_MODULE_ID_WMA); + void *wmaContext = cds_get_context(QDF_MODULE_ID_WMA); tpAniSirGlobal pMac = PMAC_STRUCT(hHal); if (NULL == wmaContext) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: wmaContext is NULL", __func__); return QDF_STATUS_E_FAILURE; } - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, " Idle Ps Set Value %d", value); pMac->imps_enabled = false; if (QDF_STATUS_SUCCESS != wma_set_idle_ps_config(wmaContext, value)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, " Failed to Set Idle Ps Value %d", value); return QDF_STATUS_E_FAILURE; } @@ -11436,7 +11436,7 @@ int16_t sme_get_ht_config(tHalHandle hHal, uint8_t session_id, uint16_t ht_capab tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, session_id); if (NULL == pSession) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: pSession is NULL", __func__); return -EIO; } @@ -11451,7 +11451,7 @@ int16_t sme_get_ht_config(tHalHandle hHal, uint8_t session_id, uint16_t ht_capab case WNI_CFG_HT_CAP_INFO_SHORT_GI_40MHZ: return pSession->htConfig.ht_sgi; default: - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "invalid ht capability"); return -EIO; } @@ -11464,13 +11464,13 @@ int sme_update_ht_config(tHalHandle hHal, uint8_t sessionId, uint16_t htCapab, tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (NULL == pSession) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: pSession is NULL", __func__); return -EIO; } if (QDF_STATUS_SUCCESS != wma_set_htconfig(sessionId, htCapab, value)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "Failed to set ht capability in target"); return -EIO; } @@ -11511,7 +11511,7 @@ QDF_STATUS sme_send_rate_update_ind(tHalHandle hHal, tSirRateUpdateInd *rate_upd = cdf_mem_malloc(sizeof(tSirRateUpdateInd)); if (rate_upd == NULL) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "Rate update struct alloc failed"); return QDF_STATUS_E_FAILURE; } @@ -11531,8 +11531,8 @@ QDF_STATUS sme_send_rate_update_ind(tHalHandle hHal, msg.bodyptr = rate_upd; if (!QDF_IS_STATUS_SUCCESS - (cds_mq_post_message(CDF_MODULE_ID_WMA, &msg))) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + (cds_mq_post_message(QDF_MODULE_ID_WMA, &msg))) { + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able " "to post WMA_SET_RMC_RATE_IND to WMA!", __func__); @@ -11605,7 +11605,7 @@ QDF_STATUS sme_set_auto_shutdown_cb(tHalHandle hHal, void (*pCallbackfn)(void) QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Plug in Auto shutdown event callback", __func__); status = sme_acquire_global_lock(&pMac->sme); @@ -11639,7 +11639,7 @@ QDF_STATUS sme_set_auto_shutdown_timer(tHalHandle hHal, uint32_t timer_val) auto_sh_cmd = (tSirAutoShutdownCmdParams *) cdf_mem_malloc(sizeof(tSirAutoShutdownCmdParams)); if (auto_sh_cmd == NULL) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s Request Buffer Alloc Fail", __func__); sme_release_global_lock(&pMac->sme); return QDF_STATUS_E_NOMEM; @@ -11652,13 +11652,13 @@ QDF_STATUS sme_set_auto_shutdown_timer(tHalHandle hHal, uint32_t timer_val) cds_message.type = WMA_SET_AUTO_SHUTDOWN_TIMER_REQ; qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Post Auto shutdown MSG fail", __func__); cdf_mem_free(auto_sh_cmd); sme_release_global_lock(&pMac->sme); return QDF_STATUS_E_FAILURE; } - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: Posted Auto shutdown MSG", __func__); sme_release_global_lock(&pMac->sme); } @@ -11683,7 +11683,7 @@ QDF_STATUS sme_add_ch_avoid_callback QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Plug in CH AVOID CB", __func__); status = sme_acquire_global_lock(&pMac->sme); @@ -11717,7 +11717,7 @@ QDF_STATUS sme_ch_avoid_update_req(tHalHandle hHal) cauReq = (tSirChAvoidUpdateReq *) cdf_mem_malloc(sizeof(tSirChAvoidUpdateReq)); if (NULL == cauReq) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s Request Buffer Alloc Fail", __func__); sme_release_global_lock(&pMac->sme); return QDF_STATUS_E_NOMEM; @@ -11730,14 +11730,14 @@ QDF_STATUS sme_ch_avoid_update_req(tHalHandle hHal) cds_message.type = WMA_CH_AVOID_UPDATE_REQ; qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Post Ch Avoid Update MSG fail", __func__); cdf_mem_free(cauReq); sme_release_global_lock(&pMac->sme); return QDF_STATUS_E_FAILURE; } - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: Posted Ch Avoid Update MSG", __func__); sme_release_global_lock(&pMac->sme); } @@ -11765,7 +11765,7 @@ QDF_STATUS sme_set_miracast(tHalHandle hal, uint8_t filter_type) val = cdf_mem_malloc(sizeof(*val)); if (NULL == val || NULL == mac_ptr) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Invalid pointer", __func__); return QDF_STATUS_E_NOMEM; } @@ -11777,8 +11777,8 @@ QDF_STATUS sme_set_miracast(tHalHandle hal, uint8_t filter_type) msg.bodyptr = val; if (!QDF_IS_STATUS_SUCCESS( - cds_mq_post_message(CDF_MODULE_ID_WMA, &msg))) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + cds_mq_post_message(QDF_MODULE_ID_WMA, &msg))) { + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to post WDA_SET_MAS_ENABLE_DISABLE to WMA!", __func__); cdf_mem_free(val); @@ -11806,7 +11806,7 @@ QDF_STATUS sme_set_mas(uint32_t val) ptr_val = cdf_mem_malloc(sizeof(*ptr_val)); if (NULL == ptr_val) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: could not allocate ptr_val", __func__); return QDF_STATUS_E_NOMEM; } @@ -11818,8 +11818,8 @@ QDF_STATUS sme_set_mas(uint32_t val) msg.bodyptr = ptr_val; if (!QDF_IS_STATUS_SUCCESS( - cds_mq_post_message(CDF_MODULE_ID_WMA, &msg))) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + cds_mq_post_message(QDF_MODULE_ID_WMA, &msg))) { + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to post WDA_SET_MAS_ENABLE_DISABLE to WMA!", __func__); cdf_mem_free(ptr_val); @@ -11840,7 +11840,7 @@ QDF_STATUS sme_set_mas(uint32_t val) * Return: QDF_STATUS */ QDF_STATUS sme_roam_channel_change_req(tHalHandle hHal, - struct cdf_mac_addr bssid, chan_params_t *ch_params, + struct qdf_mac_addr bssid, chan_params_t *ch_params, tCsrRoamProfile *profile) { QDF_STATUS status = QDF_STATUS_E_FAILURE; @@ -11887,14 +11887,14 @@ QDF_STATUS sme_process_channel_change_resp(tpAniSirGlobal pMac, pChnlParams->ch_width; if (pChnlParams->status == QDF_STATUS_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, "sapdfs: Received success eWNI_SME_CHANNEL_CHANGE_RSP for sessionId[%d]", SessionId); proam_info.channelChangeRespEvent->channelChangeStatus = 1; roamResult = eCSR_ROAM_RESULT_CHANNEL_CHANGE_SUCCESS; } else { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, "sapdfs: Received failure eWNI_SME_CHANNEL_CHANGE_RSP for sessionId[%d]", SessionId); proam_info.channelChangeRespEvent->channelChangeStatus = @@ -11924,7 +11924,7 @@ QDF_STATUS sme_process_channel_change_resp(tpAniSirGlobal pMac, \param dfsCacWaitStatus - CAC WAIT status flag \return QDF_STATUS ---------------------------------------------------------------------------*/ -QDF_STATUS sme_roam_start_beacon_req(tHalHandle hHal, struct cdf_mac_addr bssid, +QDF_STATUS sme_roam_start_beacon_req(tHalHandle hHal, struct qdf_mac_addr bssid, uint8_t dfsCacWaitStatus) { QDF_STATUS status = QDF_STATUS_E_FAILURE; @@ -11948,7 +11948,7 @@ QDF_STATUS sme_roam_start_beacon_req(tHalHandle hHal, struct cdf_mac_addr bssid, * * Return: QDF_STATUS */ -QDF_STATUS sme_roam_csa_ie_request(tHalHandle hHal, struct cdf_mac_addr bssid, +QDF_STATUS sme_roam_csa_ie_request(tHalHandle hHal, struct qdf_mac_addr bssid, uint8_t targetChannel, uint8_t csaIeReqd, chan_params_t *ch_params) { @@ -11978,7 +11978,7 @@ QDF_STATUS sme_init_thermal_info(tHalHandle hHal, tSmeThermalParams thermalParam pWmaParam = (t_thermal_mgmt *) cdf_mem_malloc(sizeof(t_thermal_mgmt)); if (NULL == pWmaParam) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: could not allocate tThermalMgmt", __func__); return QDF_STATUS_E_NOMEM; } @@ -12009,8 +12009,8 @@ QDF_STATUS sme_init_thermal_info(tHalHandle hHal, tSmeThermalParams thermalParam msg.bodyptr = pWmaParam; if (!QDF_IS_STATUS_SUCCESS - (cds_mq_post_message(CDF_MODULE_ID_WMA, &msg))) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + (cds_mq_post_message(QDF_MODULE_ID_WMA, &msg))) { + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to post WMA_SET_THERMAL_INFO_CMD to WMA!", __func__); cdf_mem_free(pWmaParam); @@ -12059,9 +12059,9 @@ QDF_STATUS sme_set_thermal_level(tHalHandle hal, uint8_t level) msg.type = WMA_SET_THERMAL_LEVEL; msg.bodyval = level; - qdf_status = cds_mq_post_message(CDF_MODULE_ID_WMA, &msg); + qdf_status = cds_mq_post_message(QDF_MODULE_ID_WMA, &msg); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to post WMA_SET_THERMAL_LEVEL to WMA!", __func__); sme_release_global_lock(&pMac->sme); @@ -12090,7 +12090,7 @@ QDF_STATUS sme_txpower_limit(tHalHandle hHal, tSirTxPowerLimit *psmetx) tx_power_limit = cdf_mem_malloc(sizeof(*tx_power_limit)); if (!tx_power_limit) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Memory allocation for TxPowerLimit failed!", __func__); return QDF_STATUS_E_FAILURE; @@ -12106,7 +12106,7 @@ QDF_STATUS sme_txpower_limit(tHalHandle hHal, tSirTxPowerLimit *psmetx) qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: not able to post WMA_TX_POWER_LIMIT", __func__); status = QDF_STATUS_E_FAILURE; @@ -12232,8 +12232,8 @@ QDF_STATUS sme_stats_ext_request(uint8_t session_id, tpStatsExtRequestReq input) msg.reserved = 0; msg.bodyptr = data; - if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) { + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to post WMA_STATS_EXT_REQUEST message to WMA", __func__); cdf_mem_free(data); @@ -12298,7 +12298,7 @@ QDF_STATUS sme_update_dfs_scan_mode(tHalHandle hHal, uint8_t sessionId, status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "LFR runtime successfully set AllowDFSChannelRoam Mode to " "%d - old value is %d - roam state is %s", allowDFSChannelRoam, @@ -12424,13 +12424,13 @@ QDF_STATUS sme_update_dsc_pto_up_mapping(tHalHandle hHal, return status; pCsrSession = CSR_GET_SESSION(pMac, sessionId); if (pCsrSession == NULL) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Session lookup fails for CSR session")); sme_release_global_lock(&pMac->sme); return QDF_STATUS_E_FAILURE; } if (!CSR_IS_SESSION_VALID(pMac, sessionId)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Invalid session Id %u"), sessionId); sme_release_global_lock(&pMac->sme); return QDF_STATUS_E_FAILURE; @@ -12441,14 +12441,14 @@ QDF_STATUS sme_update_dsc_pto_up_mapping(tHalHandle hHal, &peSessionId); if (pSession == NULL) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL(" Session lookup fails for BSSID")); sme_release_global_lock(&pMac->sme); return QDF_STATUS_E_FAILURE; } if (!pSession->QosMapSet.present) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, FL("QOS Mapping IE not present")); sme_release_global_lock(&pMac->sme); return QDF_STATUS_E_FAILURE; @@ -12461,7 +12461,7 @@ QDF_STATUS sme_update_dsc_pto_up_mapping(tHalHandle hHal, && (pSession->QosMapSet.dscp_range[i][1] == 255)) { dscpmapping[j] = 0; - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("User Priority %d isn't used"), i); break; @@ -13149,18 +13149,18 @@ QDF_STATUS sme_ll_stats_clear_req(tHalHandle hHal, cds_msg_t cds_message; tSirLLStatsClearReq *clear_stats_req; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "staId = %u", pclearStatsReq->staId); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "statsClearReqMask = 0x%X", pclearStatsReq->statsClearReqMask); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "stopReq = %u", pclearStatsReq->stopReq); clear_stats_req = cdf_mem_malloc(sizeof(*clear_stats_req)); if (!clear_stats_req) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for WMA_LL_STATS_CLEAR_REQ", __func__); return QDF_STATUS_E_NOMEM; @@ -13174,7 +13174,7 @@ QDF_STATUS sme_ll_stats_clear_req(tHalHandle hHal, cds_message.type = WMA_LINK_LAYER_STATS_CLEAR_REQ; qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: not able to post WMA_LL_STATS_CLEAR_REQ", __func__); cdf_mem_free(clear_stats_req); @@ -13182,7 +13182,7 @@ QDF_STATUS sme_ll_stats_clear_req(tHalHandle hHal, } sme_release_global_lock(&pMac->sme); } else { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: " + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: " "sme_acquire_global_lock error", __func__); cdf_mem_free(clear_stats_req); status = QDF_STATUS_E_FAILURE; @@ -13206,17 +13206,17 @@ QDF_STATUS sme_ll_stats_set_req(tHalHandle hHal, tSirLLStatsSetReq *psetStatsReq cds_msg_t cds_message; tSirLLStatsSetReq *set_stats_req; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: MPDU Size = %u", __func__, psetStatsReq->mpduSizeThreshold); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, " Aggressive Stats Collections = %u", psetStatsReq->aggressiveStatisticsGathering); set_stats_req = cdf_mem_malloc(sizeof(*set_stats_req)); if (!set_stats_req) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for WMA_LL_STATS_SET_REQ", __func__); return QDF_STATUS_E_NOMEM; @@ -13230,7 +13230,7 @@ QDF_STATUS sme_ll_stats_set_req(tHalHandle hHal, tSirLLStatsSetReq *psetStatsReq cds_message.type = WMA_LINK_LAYER_STATS_SET_REQ; qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: not able to post WMA_LL_STATS_SET_REQ", __func__); cdf_mem_free(set_stats_req); @@ -13238,7 +13238,7 @@ QDF_STATUS sme_ll_stats_set_req(tHalHandle hHal, tSirLLStatsSetReq *psetStatsReq } sme_release_global_lock(&pMac->sme); } else { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: " + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: " "sme_acquire_global_lock error", __func__); cdf_mem_free(set_stats_req); status = QDF_STATUS_E_FAILURE; @@ -13262,17 +13262,17 @@ QDF_STATUS sme_ll_stats_get_req(tHalHandle hHal, tSirLLStatsGetReq *pgetStatsReq cds_msg_t cds_message; tSirLLStatsGetReq *get_stats_req; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "reqId = %u", pgetStatsReq->reqId); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "staId = %u", pgetStatsReq->staId); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "Stats Type = %u", pgetStatsReq->paramIdMask); get_stats_req = cdf_mem_malloc(sizeof(*get_stats_req)); if (!get_stats_req) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for WMA_LL_STATS_GET_REQ", __func__); return QDF_STATUS_E_NOMEM; @@ -13286,7 +13286,7 @@ QDF_STATUS sme_ll_stats_get_req(tHalHandle hHal, tSirLLStatsGetReq *pgetStatsReq cds_message.type = WMA_LINK_LAYER_STATS_GET_REQ; qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: not able to post WMA_LL_STATS_GET_REQ", __func__); @@ -13296,7 +13296,7 @@ QDF_STATUS sme_ll_stats_get_req(tHalHandle hHal, tSirLLStatsGetReq *pgetStatsReq } sme_release_global_lock(&pMac->sme); } else { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: " + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: " "sme_acquire_global_lock error", __func__); cdf_mem_free(get_stats_req); status = QDF_STATUS_E_FAILURE; @@ -13325,7 +13325,7 @@ QDF_STATUS sme_set_link_layer_stats_ind_cb pMac->sme.pLinkLayerStatsIndCallback = callback_routine; sme_release_global_lock(&pMac->sme); } else { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: " + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: " "sme_acquire_global_lock error", __func__); } @@ -13357,7 +13357,7 @@ QDF_STATUS sme_fw_mem_dump_register_cb(tHalHandle hal, pmac->sme.fw_dump_callback = callback_routine; sme_release_global_lock(&pmac->sme); } else { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("sme_acquire_global_lock error")); } @@ -13392,7 +13392,7 @@ QDF_STATUS sme_fw_mem_dump_unregister_cb(tHalHandle hal) pmac->sme.fw_dump_callback = NULL; sme_release_global_lock(&pmac->sme); } else { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("sme_acquire_global_lock error")); } @@ -13424,7 +13424,7 @@ QDF_STATUS sme_update_roam_offload_enabled(tHalHandle hHal, status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: LFR3:gRoamOffloadEnabled is changed from %d to %d", __func__, pMac->roam.configParam.isRoamOffloadEnabled, nRoamOffloadEnabled); @@ -13458,7 +13458,7 @@ QDF_STATUS sme_update_roam_key_mgmt_offload_enabled(tHalHandle hHal, status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { if (CSR_IS_SESSION_VALID(pMac, sessionId)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: LFR3: KeyMgmtOffloadEnabled changed to %d", __func__, nRoamKeyMgmtOffloadEnabled); status = csr_roam_set_key_mgmt_offload(pMac, @@ -13496,7 +13496,7 @@ QDF_STATUS sme_get_temperature(tHalHandle hHal, if (QDF_STATUS_SUCCESS == status) { if ((NULL == pCallbackfn) && (NULL == pMac->sme.pGetTemperatureCb)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL ("Indication Call back did not registered")); sme_release_global_lock(&pMac->sme); @@ -13510,7 +13510,7 @@ QDF_STATUS sme_get_temperature(tHalHandle hHal, cds_message.type = WMA_GET_TEMPERATURE_REQ; qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Post Get Temperature msg fail")); status = QDF_STATUS_E_FAILURE; } @@ -13540,7 +13540,7 @@ QDF_STATUS sme_set_scanning_mac_oui(tHalHandle hHal, tSirScanMacOui *pScanMacOui cds_message.type = WMA_SET_SCAN_MAC_OUI_REQ; qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Msg post Set Scan Mac OUI failed")); status = QDF_STATUS_E_FAILURE; } @@ -13568,7 +13568,7 @@ QDF_STATUS sme_set_dhcp_srv_offload(tHalHandle hHal, pSmeDhcpSrvInfo = cdf_mem_malloc(sizeof(*pSmeDhcpSrvInfo)); if (!pSmeDhcpSrvInfo) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for WMA_SET_DHCP_SERVER_OFFLOAD_CMD", __func__); return QDF_STATUS_E_NOMEM; @@ -13583,8 +13583,8 @@ QDF_STATUS sme_set_dhcp_srv_offload(tHalHandle hHal, cds_message.bodyptr = pSmeDhcpSrvInfo; if (!QDF_IS_STATUS_SUCCESS - (cds_mq_post_message(CDF_MODULE_ID_WMA, &cds_message))) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + (cds_mq_post_message(QDF_MODULE_ID_WMA, &cds_message))) { + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to post WMA_SET_DHCP_SERVER_OFFLOAD_CMD to WMA!", __func__); cdf_mem_free(pSmeDhcpSrvInfo); @@ -13592,7 +13592,7 @@ QDF_STATUS sme_set_dhcp_srv_offload(tHalHandle hHal, } sme_release_global_lock(&pMac->sme); } else { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: sme_acquire_global_lock error!", __func__); cdf_mem_free(pSmeDhcpSrvInfo); } @@ -13620,7 +13620,7 @@ QDF_STATUS sme_set_led_flashing(tHalHandle hHal, uint8_t type, ledflashing = cdf_mem_malloc(sizeof(*ledflashing)); if (!ledflashing) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL ("Not able to allocate memory for WMA_LED_TIMING_REQ")); return QDF_STATUS_E_NOMEM; @@ -13702,7 +13702,7 @@ bool sme_validate_sap_channel_switch(tHalHandle hal, cc_switch_mode); sme_release_global_lock(&mac->sme); } else { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("sme_acquire_global_lock error!")); session->ch_switch_in_progress = false; return false; @@ -13734,7 +13734,7 @@ QDF_STATUS sme_configure_stats_avg_factor(tHalHandle hal, uint8_t session_id, stats_factor = cdf_mem_malloc(sizeof(*stats_factor)); if (!stats_factor) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for SIR_HAL_CONFIG_STATS_FACTOR", __func__); return QDF_STATUS_E_NOMEM; @@ -13752,8 +13752,8 @@ QDF_STATUS sme_configure_stats_avg_factor(tHalHandle hal, uint8_t session_id, msg.bodyptr = stats_factor; if (!QDF_IS_STATUS_SUCCESS( - cds_mq_post_message(CDF_MODULE_ID_WMA, &msg))) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + cds_mq_post_message(QDF_MODULE_ID_WMA, &msg))) { + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to post SIR_HAL_CONFIG_STATS_FACTOR to WMA!", __func__); cdf_mem_free(stats_factor); @@ -13761,7 +13761,7 @@ QDF_STATUS sme_configure_stats_avg_factor(tHalHandle hal, uint8_t session_id, } sme_release_global_lock(&mac->sme); } else { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: sme_acquire_global_lock error!", __func__); cdf_mem_free(stats_factor); @@ -13791,7 +13791,7 @@ QDF_STATUS sme_configure_guard_time(tHalHandle hal, uint8_t session_id, g_time = cdf_mem_malloc(sizeof(*g_time)); if (!g_time) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for SIR_HAL_CONFIG_GUARD_TIME", __func__); return QDF_STATUS_E_NOMEM; @@ -13809,8 +13809,8 @@ QDF_STATUS sme_configure_guard_time(tHalHandle hal, uint8_t session_id, msg.bodyptr = g_time; if (!QDF_IS_STATUS_SUCCESS( - cds_mq_post_message(CDF_MODULE_ID_WMA, &msg))) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + cds_mq_post_message(QDF_MODULE_ID_WMA, &msg))) { + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to post SIR_HAL_CONFIG_GUARD_TIME to WMA!", __func__); cdf_mem_free(g_time); @@ -13818,7 +13818,7 @@ QDF_STATUS sme_configure_guard_time(tHalHandle hal, uint8_t session_id, } sme_release_global_lock(&mac->sme); } else { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: sme_acquire_global_lock error!", __func__); cdf_mem_free(g_time); @@ -13847,7 +13847,7 @@ QDF_STATUS sme_configure_modulated_dtim(tHalHandle h_hal, uint8_t session_id, iwcmd = cdf_mem_malloc(sizeof(*iwcmd)); if (NULL == iwcmd) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, "%s: cdf_mem_alloc failed", __func__); return QDF_STATUS_E_NOMEM; @@ -13867,8 +13867,8 @@ QDF_STATUS sme_configure_modulated_dtim(tHalHandle h_hal, uint8_t session_id, msg.bodyptr = (void *)iwcmd; if (!QDF_IS_STATUS_SUCCESS( - cds_mq_post_message(CDF_MODULE_ID_WMA, &msg))) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + cds_mq_post_message(QDF_MODULE_ID_WMA, &msg))) { + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to post GEN_PARAM_DYNAMIC_DTIM to WMA!", __func__); cdf_mem_free(iwcmd); @@ -13876,7 +13876,7 @@ QDF_STATUS sme_configure_modulated_dtim(tHalHandle h_hal, uint8_t session_id, } sme_release_global_lock(&mac->sme); } else { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: sme_acquire_global_lock error!", __func__); cdf_mem_free(iwcmd); @@ -14025,14 +14025,14 @@ QDF_STATUS sme_enable_uapsd_for_ac(void *cds_ctx, uint8_t sta_id, enum uapsd_ac access_category; if (!psb) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "No need to configure auto trigger:psb is 0"); return QDF_STATUS_SUCCESS; } - wma_handle = cds_get_context(CDF_MODULE_ID_WMA); + wma_handle = cds_get_context(QDF_MODULE_ID_WMA); if (!wma_handle) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "wma_handle is NULL"); return QDF_STATUS_E_FAILURE; } @@ -14062,7 +14062,7 @@ QDF_STATUS sme_enable_uapsd_for_ac(void *cds_ctx, uint8_t sta_id, if (QDF_STATUS_SUCCESS != wma_trigger_uapsd_params(wma_handle, sessionId, &uapsd_params)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "Failed to Trigger Uapsd params for sessionId %d", sessionId); return QDF_STATUS_E_FAILURE; @@ -14103,15 +14103,15 @@ QDF_STATUS sme_disable_uapsd_for_ac(void *cds_ctx, uint8_t sta_id, return QDF_STATUS_E_FAILURE; } - wma_handle = cds_get_context(CDF_MODULE_ID_WMA); + wma_handle = cds_get_context(QDF_MODULE_ID_WMA); if (!wma_handle) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "wma handle is NULL"); return QDF_STATUS_E_FAILURE; } if (QDF_STATUS_SUCCESS != wma_disable_uapsd_per_ac(wma_handle, sessionId, access_category)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "Failed to disable uapsd for ac %d for sessionId %d", ac, sessionId); return QDF_STATUS_E_FAILURE; @@ -14291,26 +14291,26 @@ QDF_STATUS sme_fw_mem_dump(tHalHandle hHal, void *recvd_req) send_req = cdf_mem_malloc(sizeof(*send_req)); if (!send_req) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Memory allocation failed for WDA_FW_MEM_DUMP")); return QDF_STATUS_E_FAILURE; } cdf_mem_copy(send_req, recvd_req, sizeof(*send_req)); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("request_id:%d num_seg:%d"), send_req->request_id, send_req->num_seg); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("Segment Information")); for (loop = 0; loop < send_req->num_seg; loop++) { seg_req = send_req->segment[loop]; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("seg_number:%d"), loop); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("seg_id:%d start_addr_lo:0x%x start_addr_hi:0x%x"), seg_req.seg_id, seg_req.seg_start_addr_lo, seg_req.seg_start_addr_hi); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("seg_length:%d dst_addr_lo:0x%x dst_addr_hi:0x%x"), seg_req.seg_length, seg_req.dst_addr_lo, seg_req.dst_addr_hi); @@ -14321,16 +14321,16 @@ QDF_STATUS sme_fw_mem_dump(tHalHandle hHal, void *recvd_req) msg.type = WMA_FW_MEM_DUMP_REQ; msg.reserved = 0; - qdf_status = cds_mq_post_message(CDF_MODULE_ID_WMA, &msg); + qdf_status = cds_mq_post_message(QDF_MODULE_ID_WMA, &msg); if (QDF_STATUS_SUCCESS != qdf_status) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to post WMA_FW_MEM_DUMP")); cdf_mem_free(send_req); status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&pMac->sme); } else { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Failed to acquire SME Global Lock")); cdf_mem_free(send_req); status = QDF_STATUS_E_FAILURE; @@ -14570,7 +14570,7 @@ QDF_STATUS sme_gateway_param_update(tHalHandle Hal, request_buf = cdf_mem_malloc(sizeof(*request_buf)); if (NULL == request_buf) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to allocate memory for gw param update request")); return QDF_STATUS_E_NOMEM; } @@ -14582,7 +14582,7 @@ QDF_STATUS sme_gateway_param_update(tHalHandle Hal, cds_message.bodyptr = request_buf; qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to post WMA_GW_PARAM_UPDATE_REQ message to HAL")); cdf_mem_free(request_buf); return QDF_STATUS_E_FAILURE; @@ -14606,9 +14606,9 @@ QDF_STATUS sme_set_peer_authorized(uint8_t *peer_addr, { void *wma_handle; - wma_handle = cds_get_context(CDF_MODULE_ID_WMA); + wma_handle = cds_get_context(QDF_MODULE_ID_WMA); if (!wma_handle) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "wma handle is NULL"); return QDF_STATUS_E_FAILURE; } @@ -14687,7 +14687,7 @@ QDF_STATUS sme_update_roam_scan_hi_rssi_scan_params(tHalHandle hal_handle, nr_info = &mac_ctx->roam.neighborRoamInfo[session_id]; switch (notify_id) { case eCSR_HI_RSSI_SCAN_MAXCOUNT_ID: - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: gRoamScanHirssiMaxCount %d => %d", __func__, nr_config->nhi_rssi_scan_max_count, val); @@ -14697,7 +14697,7 @@ QDF_STATUS sme_update_roam_scan_hi_rssi_scan_params(tHalHandle hal_handle, break; case eCSR_HI_RSSI_SCAN_RSSI_DELTA_ID: - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("gRoamScanHiRssiDelta %d => %d"), nr_config->nhi_rssi_scan_rssi_delta, val); @@ -14707,7 +14707,7 @@ QDF_STATUS sme_update_roam_scan_hi_rssi_scan_params(tHalHandle hal_handle, break; case eCSR_HI_RSSI_SCAN_DELAY_ID: - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("gRoamScanHiRssiDelay %d => %d"), nr_config->nhi_rssi_scan_delay, val); @@ -14717,7 +14717,7 @@ QDF_STATUS sme_update_roam_scan_hi_rssi_scan_params(tHalHandle hal_handle, break; case eCSR_HI_RSSI_SCAN_RSSI_UB_ID: - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("gRoamScanHiRssiUpperBound %d => %d"), nr_config->nhi_rssi_scan_rssi_ub, val); @@ -14727,7 +14727,7 @@ QDF_STATUS sme_update_roam_scan_hi_rssi_scan_params(tHalHandle hal_handle, break; default: - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("invalid parameter notify_id %d"), notify_id); status = QDF_STATUS_E_INVAL; @@ -14762,7 +14762,7 @@ void sme_update_tgt_services(tHalHandle hal, struct wma_tgt_services *cfg) mac_ctx->lteCoexAntShare = cfg->lte_coex_ant_share; mac_ctx->beacon_offload = cfg->beacon_offload; mac_ctx->pmf_offload = cfg->pmf_offload; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("mac_ctx->pmf_offload: %d"), mac_ctx->pmf_offload); return; @@ -14833,7 +14833,7 @@ QDF_STATUS sme_send_egap_conf_params(uint32_t enable, uint32_t inactivity_time, egap_params = cdf_mem_malloc(sizeof(*egap_params)); if (NULL == egap_params) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: fail to alloc egap_params", __func__); return QDF_STATUS_E_NOMEM; } @@ -14845,9 +14845,9 @@ QDF_STATUS sme_send_egap_conf_params(uint32_t enable, uint32_t inactivity_time, message.type = WMA_SET_EGAP_CONF_PARAMS; message.bodyptr = egap_params; - status = cds_mq_post_message(CDF_MODULE_ID_WMA, &message); + status = cds_mq_post_message(QDF_MODULE_ID_WMA, &message); if (!QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to post msg to WMA!", __func__); cdf_mem_free(egap_params); diff --git a/core/sme/src/common/sme_ft_api.c b/core/sme/src/common/sme_ft_api.c index 76bf27333a..55f16d851f 100644 --- a/core/sme/src/common/sme_ft_api.c +++ b/core/sme/src/common/sme_ft_api.c @@ -55,7 +55,7 @@ void sme_ft_open(tHalHandle hHal, uint32_t sessionId) status = cdf_mc_timer_init(&pSession->ftSmeContext. preAuthReassocIntvlTimer, - CDF_TIMER_TYPE_SW, + QDF_TIMER_TYPE_SW, sme_preauth_reassoc_intvl_timer_callback, (void *)pSession->ftSmeContext.pUsrCtx); @@ -449,7 +449,7 @@ void sme_get_ft_pre_auth_response(tHalHandle hHal, uint32_t sessionId, return; /* All or nothing - proceed only if both BSSID and FT IE fit */ - if ((CDF_MAC_ADDR_SIZE + + if ((QDF_MAC_ADDR_SIZE + pSession->ftSmeContext.psavedFTPreAuthRsp->ft_ies_length) > ft_ies_ip_len) { sme_release_global_lock(&pMac->sme); @@ -458,14 +458,14 @@ void sme_get_ft_pre_auth_response(tHalHandle hHal, uint32_t sessionId, /* hdd needs to pack the bssid also along with the */ /* auth response to supplicant */ cdf_mem_copy(ft_ies, pSession->ftSmeContext.preAuthbssId, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); /* Copy the auth resp FTIEs */ - cdf_mem_copy(&(ft_ies[CDF_MAC_ADDR_SIZE]), + cdf_mem_copy(&(ft_ies[QDF_MAC_ADDR_SIZE]), pSession->ftSmeContext.psavedFTPreAuthRsp->ft_ies, pSession->ftSmeContext.psavedFTPreAuthRsp->ft_ies_length); - *ft_ies_length = CDF_MAC_ADDR_SIZE + + *ft_ies_length = QDF_MAC_ADDR_SIZE + pSession->ftSmeContext.psavedFTPreAuthRsp->ft_ies_length; pSession->ftSmeContext.FTState = eFT_REASSOC_REQ_WAIT; @@ -548,7 +548,7 @@ void sme_ft_reset(tHalHandle hHal, uint32_t sessionId) tCsrRoamSession *pSession = NULL; if (pMac == NULL) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("pMac is NULL")); return; } @@ -584,7 +584,7 @@ void sme_ft_reset(tHalHandle hHal, uint32_t sessionId) pSession->ftSmeContext.setFTPTKState = false; cdf_mem_zero(pSession->ftSmeContext.preAuthbssId, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); pSession->ftSmeContext.FTState = eFT_START_READY; } } diff --git a/core/sme/src/common/sme_power_save.c b/core/sme/src/common/sme_power_save.c index 50731edac0..7dbc3dfa51 100644 --- a/core/sme/src/common/sme_power_save.c +++ b/core/sme/src/common/sme_power_save.c @@ -29,7 +29,7 @@ #include "sme_power_save_api.h" #include "sms_debug.h" #include "cdf_memory.h" -#include "cdf_types.h" +#include "qdf_types.h" #include "wma_types.h" #include "wmm_apsd.h" #include "cfg_api.h" @@ -52,8 +52,8 @@ QDF_STATUS sme_post_ps_msg_to_wma(uint16_t type, void *body) msg.bodyval = 0; if (QDF_STATUS_SUCCESS != cds_mq_post_message( - CDF_MODULE_ID_WMA, &msg)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_MODULE_ID_WMA, &msg)) { + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Posting message %d failed", __func__, type); cdf_mem_free(body); @@ -87,7 +87,7 @@ QDF_STATUS sme_ps_enable_ps_req_params(tpAniSirGlobal mac_ctx, status = sme_post_ps_msg_to_wma(WMA_ENTER_PS_REQ, enable_ps_req_params); if (!QDF_IS_STATUS_SUCCESS(status)) return QDF_STATUS_E_FAILURE; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("Message WMA_ENTER_PS_REQ Successfully sent to WMA")); return QDF_STATUS_SUCCESS; } @@ -118,7 +118,7 @@ QDF_STATUS sme_ps_disable_ps_req_params(tpAniSirGlobal mac_ctx, status = sme_post_ps_msg_to_wma(WMA_EXIT_PS_REQ, disable_ps_req_params); if (!QDF_IS_STATUS_SUCCESS(status)) return QDF_STATUS_E_FAILURE; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("Message WMA_EXIT_PS_REQ Successfully sent to WMA")); return QDF_STATUS_SUCCESS; } @@ -190,7 +190,7 @@ QDF_STATUS sme_ps_enable_uapsd_req_params(tpAniSirGlobal mac_ctx, if (!QDF_IS_STATUS_SUCCESS(status)) return QDF_STATUS_E_FAILURE; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("Msg WMA_ENABLE_UAPSD_REQ Successfully sent to WMA")); return QDF_STATUS_SUCCESS; } @@ -222,7 +222,7 @@ QDF_STATUS sme_ps_disable_uapsd_req_params(tpAniSirGlobal mac_ctx, if (!QDF_IS_STATUS_SUCCESS(status)) return QDF_STATUS_E_FAILURE; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("Message WMA_DISABLE_UAPSD_REQ Successfully sent to WMA")); return QDF_STATUS_SUCCESS; } @@ -329,7 +329,7 @@ QDF_STATUS sme_ps_enter_wowl_req_params(tpAniSirGlobal mac_ctx, if (QDF_STATUS_SUCCESS == sme_post_ps_msg_to_wma(WMA_WOWL_ENTER_REQ, hal_wowl_params)){ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("Msg WMA_WOWL_ENTER_REQ Successfully sent to WMA")); return QDF_STATUS_SUCCESS; } else @@ -364,7 +364,7 @@ QDF_STATUS sme_ps_exit_wowl_req_params(tpAniSirGlobal mac_ctx, if (QDF_STATUS_SUCCESS == sme_post_ps_msg_to_wma(WMA_WOWL_EXIT_REQ, hal_wowl_msg)){ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("Msg WMA_WOWL_EXIT_REQ Successfully sent to WMA")); return QDF_STATUS_SUCCESS; } @@ -391,7 +391,7 @@ QDF_STATUS sme_ps_process_command(tpAniSirGlobal mac_ctx, uint32_t session_id, sms_log(mac_ctx, LOGE, "Invalid Session_id %x", session_id); return eSIR_FAILURE; } - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("Power Save command %d"), command); switch (command) { case SME_PS_ENABLE: @@ -420,7 +420,7 @@ QDF_STATUS sme_ps_process_command(tpAniSirGlobal mac_ctx, uint32_t session_id, break; } if (status != QDF_STATUS_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to enter in PS, Command: %d"), command); } return status; @@ -699,14 +699,14 @@ sme_prepare_probe_req_template(tpAniSirGlobal mac_ctx, */ status = dot11f_get_packed_probe_request_size(mac_ctx, &pr, &payload); if (DOT11F_FAILED(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Failed to calculate the packed size for a Probe Request (0x%08x)."), status); /* We'll fall back on the worst case scenario: */ payload = sizeof(tDot11fProbeRequest); } else if (DOT11F_WARNED(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("There were warnings while calculating the packed size for a Probe Request (0x%08x)."), status); } @@ -722,7 +722,7 @@ sme_prepare_probe_req_template(tpAniSirGlobal mac_ctx, self_mac_addr); if (eSIR_SUCCESS != sir_status) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Failed to populate the buffer descriptor for a Probe Request (%d)."), sir_status); return sir_status; /* allocated! */ @@ -732,11 +732,11 @@ sme_prepare_probe_req_template(tpAniSirGlobal mac_ctx, sizeof(tSirMacMgmtHdr), payload, &payload); if (DOT11F_FAILED(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "Failed to pack a Probe Request (0x%08x).", status); return eSIR_FAILURE; /* allocated! */ } else if (DOT11F_WARNED(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "There were warnings while packing a Probe Request"); } @@ -764,11 +764,11 @@ void sme_set_pno_channel_prediction(tpSirPNOScanReq request_buf, mac_ctx->roam.configParam.stationary_thresh; request_buf->channel_prediction_full_scan = mac_ctx->roam.configParam.channel_prediction_full_scan; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, FL("channel_prediction: %d, top_k_num_of_channels: %d"), request_buf->pno_channel_prediction, request_buf->top_k_num_of_channels); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, FL("stationary_thresh: %d, ch_predict_full_scan: %d"), request_buf->stationary_thresh, request_buf->channel_prediction_full_scan); @@ -786,11 +786,11 @@ QDF_STATUS sme_set_ps_preferred_network_list(tHalHandle hal_ctx, uint8_t uc_dot11_mode; if (NULL == session) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: session is NULL", __func__); return QDF_STATUS_E_FAILURE; } - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: SSID = 0x%08x%08x%08x%08x%08x%08x%08x%08x, 0x%08x%08x%08x%08x%08x%08x%08x%08x", __func__, *((uint32_t *) &request->aNetworks[0].ssId.ssId[0]), *((uint32_t *) &request->aNetworks[0].ssId.ssId[4]), @@ -810,14 +810,14 @@ QDF_STATUS sme_set_ps_preferred_network_list(tHalHandle hal_ctx, *((uint32_t *) &request->aNetworks[1].ssId.ssId[28])); if (!session) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: session is NULL", __func__); return QDF_STATUS_E_FAILURE; } request_buf = cdf_mem_malloc(sizeof(tSirPNOScanReq)); if (NULL == request_buf) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to allocate memory for PNO request")); return QDF_STATUS_E_NOMEM; } @@ -854,12 +854,12 @@ QDF_STATUS sme_set_ps_preferred_network_list(tHalHandle hal_ctx, request->us24GProbeTemplateLen); request_buf->us24GProbeTemplateLen += request->us24GProbeTemplateLen; - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("request->us24GProbeTemplateLen = %d"), request->us24GProbeTemplateLen); } else { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("Extra ie discarded on 2.4G, IE len = %d"), request->us24GProbeTemplateLen); @@ -887,11 +887,11 @@ QDF_STATUS sme_set_ps_preferred_network_list(tHalHandle hal_ctx, request->us5GProbeTemplateLen); request_buf->us5GProbeTemplateLen += request->us5GProbeTemplateLen; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("request_buf->us5GProbeTemplateLen = %d"), request->us5GProbeTemplateLen); } else { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("Extra IE discarded on 5G, IE length = %d"), request->us5GProbeTemplateLen); } @@ -932,8 +932,8 @@ QDF_STATUS sme_set_ps_preferred_network_list(tHalHandle hal_ctx, msg.reserved = 0; msg.bodyptr = request_buf; if (!QDF_IS_STATUS_SUCCESS - (cds_mq_post_message(CDF_MODULE_ID_WMA, &msg))) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + (cds_mq_post_message(QDF_MODULE_ID_WMA, &msg))) { + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to post WMA_SET_PNO_REQ message to WMA")); cdf_mem_free(request_buf); return QDF_STATUS_E_FAILURE; @@ -945,7 +945,7 @@ QDF_STATUS sme_set_ps_preferred_network_list(tHalHandle hal_ctx, mac_ctx->sme.preferred_network_found_ind_cb_ctx = callback_context; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "-%s", __func__); + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "-%s", __func__); return QDF_STATUS_SUCCESS; } @@ -969,7 +969,7 @@ QDF_STATUS sme_set_ps_host_offload(tHalHandle hal_ctx, tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal_ctx); tCsrRoamSession *session = CSR_GET_SESSION(mac_ctx, session_id); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: IP address = %d.%d.%d.%d", __func__, request->params.hostIpv4Addr[0], request->params.hostIpv4Addr[1], @@ -977,14 +977,14 @@ QDF_STATUS sme_set_ps_host_offload(tHalHandle hal_ctx, request->params.hostIpv4Addr[3]); if (NULL == session) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: SESSION not Found", __func__); return QDF_STATUS_E_FAILURE; } request_buf = cdf_mem_malloc(sizeof(tSirHostOffloadReq)); if (NULL == request_buf) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to allocate memory for host offload request")); return QDF_STATUS_E_NOMEM; } @@ -997,8 +997,8 @@ QDF_STATUS sme_set_ps_host_offload(tHalHandle hal_ctx, msg.reserved = 0; msg.bodyptr = request_buf; if (QDF_STATUS_SUCCESS != - cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) { + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to post WMA_SET_HOST_OFFLOAD msg to WMA")); cdf_mem_free(request_buf); return QDF_STATUS_E_FAILURE; @@ -1035,7 +1035,7 @@ QDF_STATUS sme_set_ps_ns_offload(tHalHandle hal_ctx, request_buf = cdf_mem_malloc(sizeof(*request_buf)); if (NULL == request_buf) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to allocate memory for NS offload request")); return QDF_STATUS_E_NOMEM; } @@ -1045,8 +1045,8 @@ QDF_STATUS sme_set_ps_ns_offload(tHalHandle hal_ctx, msg.reserved = 0; msg.bodyptr = request_buf; if (QDF_STATUS_SUCCESS != - cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) { + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to post SIR_HAL_SET_HOST_OFFLOAD message to HAL")); cdf_mem_free(request_buf); return QDF_STATUS_E_FAILURE; @@ -1173,7 +1173,7 @@ QDF_STATUS sme_ps_open_per_session(tHalHandle hal_ctx, uint32_t session_id) /* Allocate a timer to enable ps automatically */ if (!QDF_IS_STATUS_SUCCESS(cdf_mc_timer_init( &ps_param->auto_ps_enable_timer, - CDF_TIMER_TYPE_SW, + QDF_TIMER_TYPE_SW, sme_auto_ps_entry_timer_expired, ps_param))) { sms_log(mac_ctx, LOGE, diff --git a/core/sme/src/common/sme_trace.c b/core/sme/src/common/sme_trace.c index 07562c601e..fd7d617e75 100644 --- a/core/sme/src/common/sme_trace.c +++ b/core/sme/src/common/sme_trace.c @@ -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. * @@ -219,6 +219,6 @@ static void sme_trace_dump(tpAniSirGlobal pMac, tp_cdf_trace_record pRecord, void sme_trace_init(tpAniSirGlobal pMac) { - cdf_trace_register(CDF_MODULE_ID_SME, (tp_cdf_trace_cb) & sme_trace_dump); + cdf_trace_register(QDF_MODULE_ID_SME, (tp_cdf_trace_cb) &sme_trace_dump); } #endif diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index 15913d61f4..b1924db12a 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -213,7 +213,7 @@ static QDF_STATUS csr_roam_free_connected_info(tpAniSirGlobal pMac, tCsrRoamConnectedInfo * pConnectedInfo); QDF_STATUS csr_send_mb_set_context_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, - struct cdf_mac_addr peer_macaddr, + struct qdf_mac_addr peer_macaddr, uint8_t numKeys, tAniEdType edType, bool fUnicast, tAniKeyDirection aniKeyDirection, @@ -227,7 +227,7 @@ static QDF_STATUS csr_roam_issue_reassociate(tpAniSirGlobal pMac, tCsrRoamProfile *pProfile); void csr_roamStatisticsTimerHandler(void *pv); void csr_roamStatsGlobalClassDTimerHandler(void *pv); -static void csr_roam_link_up(tpAniSirGlobal pMac, struct cdf_mac_addr bssid); +static void csr_roam_link_up(tpAniSirGlobal pMac, struct qdf_mac_addr bssid); static void csr_roam_link_down(tpAniSirGlobal pMac, uint32_t sessionId); void csr_roam_vcc_trigger(tpAniSirGlobal pMac); QDF_STATUS csr_send_mb_stats_req_msg(tpAniSirGlobal pMac, uint32_t statsMask, @@ -264,7 +264,7 @@ tListElem *csr_roam_find_in_pe_stats_req_list(tpAniSirGlobal pMac, uint32_t stat QDF_STATUS csr_roam_dereg_statistics_req(tpAniSirGlobal pMac); static uint32_t csr_find_ibss_session(tpAniSirGlobal pMac); static uint32_t csr_find_session_by_type(tpAniSirGlobal, - enum tCDF_ADAPTER_MODE); + enum tQDF_ADAPTER_MODE); static bool csr_is_conn_allow_2g_band(tpAniSirGlobal pMac, uint32_t chnl); static bool csr_is_conn_allow_5g_band(tpAniSirGlobal pMac, uint32_t chnl); static QDF_STATUS csr_roam_start_wds(tpAniSirGlobal pMac, uint32_t sessionId, @@ -592,7 +592,7 @@ void csr_roam_sort_channel_for_early_stop(tpAniSirGlobal mac_ctx, chan_list_greedy = cdf_mem_malloc(buf_size); chan_list_non_greedy = cdf_mem_malloc(buf_size); if (!chan_list_greedy || !chan_list_non_greedy) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "Failed to allocate memory for tSirUpdateChanList"); return; } @@ -646,11 +646,11 @@ void csr_roam_sort_channel_for_early_stop(tpAniSirGlobal mac_ctx, } } } - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_DEBUG, "greedy=%d, non-greedy=%d, tot=%d", num_greedy_chan, num_non_greedy_chan, num_channel); if ((num_greedy_chan + num_non_greedy_chan) != num_channel) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "incorrect sorting of channels"); goto scan_list_sort_error; } @@ -698,7 +698,7 @@ QDF_STATUS csr_update_channel_list(tpAniSirGlobal pMac) csr_init_operating_classes((tHalHandle) pMac); pChanList = (tSirUpdateChanList *) cdf_mem_malloc(bufLen); if (!pChanList) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "Failed to allocate memory for tSirUpdateChanList"); return QDF_STATUS_E_NOMEM; } @@ -730,7 +730,7 @@ QDF_STATUS csr_update_channel_list(tpAniSirGlobal pMac) else pChanList->chanParam[num_channel].dfsSet = true; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "channel:%d, pwr=%d, DFS=%d\n", pChanList->chanParam[num_channel].chanId, pChanList->chanParam[num_channel].pwr, @@ -757,7 +757,7 @@ QDF_STATUS csr_update_channel_list(tpAniSirGlobal pMac) csr_roam_sort_channel_for_early_stop(pMac, pChanList, num_channel); else - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("Early Stop Scan Feature not supported")); msg.type = WMA_UPDATE_CHAN_LIST_REQ; @@ -765,8 +765,8 @@ QDF_STATUS csr_update_channel_list(tpAniSirGlobal pMac) msg.bodyptr = pChanList; pChanList->numChan = num_channel; - if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) { + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, "%s: Failed to post msg to WMA", __func__); cdf_mem_free(pChanList); return QDF_STATUS_E_FAILURE; @@ -805,7 +805,7 @@ QDF_STATUS csr_start(tpAniSirGlobal pMac) break; } - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "Scan offload is enabled, update default chan list"); status = csr_update_channel_list(pMac); } while (0); @@ -919,7 +919,7 @@ QDF_STATUS csr_roam_open(tpAniSirGlobal pMac) CSR_SESSION_ID_INVALID; status = cdf_mc_timer_init(&pMac->roam.hTimerWaitForKey, - CDF_TIMER_TYPE_SW, + QDF_TIMER_TYPE_SW, csr_roam_wait_for_key_time_out_handler, &pMac->roam.WaitForKeyTimerInfo); if (!QDF_IS_STATUS_SUCCESS(status)) { @@ -930,7 +930,7 @@ QDF_STATUS csr_roam_open(tpAniSirGlobal pMac) } status = cdf_mc_timer_init(&pMac->roam.tlStatsReqInfo.hTlStatsTimer, - CDF_TIMER_TYPE_SW, + QDF_TIMER_TYPE_SW, csr_roam_tl_stats_timer_handler, pMac); if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, @@ -1020,7 +1020,7 @@ QDF_STATUS csr_roam_copy_connect_profile(tpAniSirGlobal pMac, pProfile->operationChannel = connected_prof->operationChannel; pProfile->CBMode = connected_prof->CBMode; cdf_mem_copy(&pProfile->bssid, &connected_prof->bssid, - sizeof(struct cdf_mac_addr)); + sizeof(struct qdf_mac_addr)); cdf_mem_copy(&pProfile->SSID, &connected_prof->SSID, sizeof(tSirMacSSid)); if (connected_prof->MDID.mdiePresent) { @@ -1528,7 +1528,7 @@ QDF_STATUS csr_create_roam_scan_channel_list(tpAniSirGlobal pMac, } } } else { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, "Invalid band, No operation carried out (Band %d)", eBand); return QDF_STATUS_E_INVAL; @@ -1560,7 +1560,7 @@ QDF_STATUS csr_create_roam_scan_channel_list(tpAniSirGlobal pMac, currChannelListInfo->ChannelList = cdf_mem_malloc(outNumChannels * sizeof(uint8_t)); if (NULL == currChannelListInfo->ChannelList) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, "Failed to allocate memory for roam scan channel list"); currChannelListInfo->numOfChannels = 0; return QDF_STATUS_E_NOMEM; @@ -1579,7 +1579,7 @@ QDF_STATUS csr_set_band(tHalHandle hHal, uint8_t sessionId, eCsrBand eBand) if (CSR_IS_PHY_MODE_A_ONLY(pMac) && (eBand == eCSR_BAND_24)) { /* DOT11 mode configured to 11a only and received request to change the band to 2.4 GHz */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "failed to set band cfg80211 = %u, band = %u", pMac->roam.configParam.uCfgDot11Mode, eBand); return QDF_STATUS_E_INVAL; @@ -1588,12 +1588,12 @@ QDF_STATUS csr_set_band(tHalHandle hHal, uint8_t sessionId, eCsrBand eBand) CSR_IS_PHY_MODE_G_ONLY(pMac)) && (eBand == eCSR_BAND_5G)) { /* DOT11 mode configured to 11b/11g only and received request to change the band to 5 GHz */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "failed to set band dot11mode = %u, band = %u", pMac->roam.configParam.uCfgDot11Mode, eBand); return QDF_STATUS_E_INVAL; } - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "Band changed to %u (0 - ALL, 1 - 2.4 GHZ, 2 - 5GHZ)", eBand); pMac->roam.configParam.eBand = eBand; pMac->roam.configParam.bandCapability = eBand; @@ -2462,7 +2462,7 @@ QDF_STATUS csr_is_valid_channel(tpAniSirGlobal pMac, uint8_t chnNum) if ((dfsChan->dfs_channel_number == chnNum) && (dfsChan->radar_status_flag == eSAP_DFS_CHANNEL_UNAVAILABLE)) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("channel %d is in dfs nol"), chnNum); @@ -2473,7 +2473,7 @@ QDF_STATUS csr_is_valid_channel(tpAniSirGlobal pMac, uint8_t chnNum) } if (QDF_STATUS_SUCCESS != status) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("channel %d is not available"), chnNum); } @@ -2605,7 +2605,7 @@ static QDF_STATUS csr_init11d_info(tpAniSirGlobal pMac, tCsr11dinfo *ps11dinfo) pChanInfo->numChannels = ps11dinfo->ChnPower[index].numChannels; pChanInfo->maxTxPower = - CDF_MIN(ps11dinfo->ChnPower[index].maxtxPower, + QDF_MIN(ps11dinfo->ChnPower[index].maxtxPower, pMac->roam.configParam.nTxPowerCap); pChanInfo++; count++; @@ -2667,7 +2667,7 @@ QDF_STATUS csr_init_channel_power_list(tpAniSirGlobal pMac, tCsr11dinfo *ps11din pChanInfo->numChannels = ps11dinfo->ChnPower[index].numChannels; pChanInfo->maxTxPower = - CDF_MIN(ps11dinfo->ChnPower[index].maxtxPower, + QDF_MIN(ps11dinfo->ChnPower[index].maxtxPower, pMac->roam.configParam.nTxPowerCap); pChanInfo++; count++; @@ -2722,7 +2722,7 @@ void csr_roam_remove_duplicate_command(tpAniSirGlobal pMac, uint32_t sessionId, (cdf_mem_compare (pDupCommand->u.roamCmd.peerMac, pCommand->u.roamCmd.peerMac, - CDF_MAC_ADDR_SIZE)) + QDF_MAC_ADDR_SIZE)) && (pCommand->u.roamCmd.roamReason == pDupCommand->u.roamCmd.roamReason || eCsrForcedDisassoc == @@ -3024,7 +3024,7 @@ QDF_STATUS csr_roam_issue_disassociate(tpAniSirGlobal pMac, uint32_t sessionId, bool fMICFailure) { QDF_STATUS status = QDF_STATUS_SUCCESS; - struct cdf_mac_addr bssId = CDF_MAC_ADDR_BROADCAST_INITIALIZER; + struct qdf_mac_addr bssId = QDF_MAC_ADDR_BROADCAST_INITIALIZER; uint16_t reasonCode; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); @@ -3040,7 +3040,7 @@ QDF_STATUS csr_roam_issue_disassociate(tpAniSirGlobal pMac, uint32_t sessionId, } else if (eCSR_ROAM_SUBSTATE_DISASSOC_STA_HAS_LEFT == NewSubstate) { reasonCode = eSIR_MAC_DISASSOC_LEAVING_BSS_REASON; NewSubstate = eCSR_ROAM_SUBSTATE_DISASSOC_FORCED; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL ("set to reason code eSIR_MAC_DISASSOC_LEAVING_BSS_REASON" " and set back NewSubstate")); @@ -3056,7 +3056,7 @@ QDF_STATUS csr_roam_issue_disassociate(tpAniSirGlobal pMac, uint32_t sessionId, bssid); } else if (pSession->pConnectBssDesc) { cdf_mem_copy(&bssId.bytes, pSession->pConnectBssDesc->bssId, - sizeof(struct cdf_mac_addr)); + sizeof(struct qdf_mac_addr)); } sms_log(pMac, LOG2, @@ -3172,7 +3172,7 @@ QDF_STATUS csr_roam_issue_deauth_sta_cmd(tpAniSirGlobal pMac, static QDF_STATUS csr_send_mb_tkip_counter_measures_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, bool bEnable, - struct cdf_mac_addr *bssId) + struct qdf_mac_addr *bssId) { QDF_STATUS status = QDF_STATUS_SUCCESS; tSirSmeTkipCntrMeasReq *pMsg; @@ -3201,7 +3201,7 @@ csr_roam_issue_tkip_counter_measures(tpAniSirGlobal pMac, uint32_t sessionId, bool bEnable) { QDF_STATUS status = QDF_STATUS_E_FAILURE; - struct cdf_mac_addr bssId = CDF_MAC_ADDR_BROADCAST_INITIALIZER; + struct qdf_mac_addr bssId = QDF_MAC_ADDR_BROADCAST_INITIALIZER; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (!pSession) { sms_log(pMac, LOGE, @@ -3210,7 +3210,7 @@ csr_roam_issue_tkip_counter_measures(tpAniSirGlobal pMac, uint32_t sessionId, } if (pSession->pConnectBssDesc) { cdf_mem_copy(bssId.bytes, pSession->pConnectBssDesc->bssId, - sizeof(struct cdf_mac_addr)); + sizeof(struct qdf_mac_addr)); } else { sms_log(pMac, LOGE, "csr_roam_issue_tkip_counter_measures:Connected BSS Description in CSR Session not found"); @@ -3227,11 +3227,11 @@ csr_roam_issue_tkip_counter_measures(tpAniSirGlobal pMac, uint32_t sessionId, QDF_STATUS csr_roam_get_associated_stas(tpAniSirGlobal pMac, uint32_t sessionId, - CDF_MODULE_ID modId, void *pUsrContext, + QDF_MODULE_ID modId, void *pUsrContext, void *pfnSapEventCallback, uint8_t *pAssocStasBuf) { QDF_STATUS status = QDF_STATUS_SUCCESS; - struct cdf_mac_addr bssId = CDF_MAC_ADDR_BROADCAST_INITIALIZER; + struct qdf_mac_addr bssId = QDF_MAC_ADDR_BROADCAST_INITIALIZER; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (!pSession) { sms_log(pMac, LOGE, @@ -3240,7 +3240,7 @@ csr_roam_get_associated_stas(tpAniSirGlobal pMac, uint32_t sessionId, } if (pSession->pConnectBssDesc) { cdf_mem_copy(bssId.bytes, pSession->pConnectBssDesc->bssId, - sizeof(struct cdf_mac_addr)); + sizeof(struct qdf_mac_addr)); } else { sms_log(pMac, LOGE, "csr_roam_get_associated_stas:Connected BSS Description in CSR Session not found"); @@ -3261,10 +3261,10 @@ csr_roam_get_associated_stas(tpAniSirGlobal pMac, uint32_t sessionId, QDF_STATUS csr_roam_get_wps_session_overlap(tpAniSirGlobal pMac, uint32_t sessionId, void *pUsrContext, void *pfnSapEventCallback, - struct cdf_mac_addr pRemoveMac) + struct qdf_mac_addr pRemoveMac) { QDF_STATUS status = QDF_STATUS_SUCCESS; - struct cdf_mac_addr bssId = CDF_MAC_ADDR_BROADCAST_INITIALIZER; + struct qdf_mac_addr bssId = QDF_MAC_ADDR_BROADCAST_INITIALIZER; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (!pSession) { @@ -3274,7 +3274,7 @@ csr_roam_get_wps_session_overlap(tpAniSirGlobal pMac, uint32_t sessionId, } if (pSession->pConnectBssDesc) { cdf_mem_copy(bssId.bytes, pSession->pConnectBssDesc->bssId, - sizeof(struct cdf_mac_addr)); + sizeof(struct qdf_mac_addr)); } else { sms_log(pMac, LOGE, "csr_roam_get_wps_session_overlap:Connected BSS Description in CSR Session not found"); @@ -3294,7 +3294,7 @@ QDF_STATUS csr_roam_issue_deauth(tpAniSirGlobal pMac, uint32_t sessionId, eCsrRoamSubState NewSubstate) { QDF_STATUS status = QDF_STATUS_SUCCESS; - struct cdf_mac_addr bssId = CDF_MAC_ADDR_BROADCAST_INITIALIZER; + struct qdf_mac_addr bssId = QDF_MAC_ADDR_BROADCAST_INITIALIZER; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (!pSession) { @@ -3304,7 +3304,7 @@ QDF_STATUS csr_roam_issue_deauth(tpAniSirGlobal pMac, uint32_t sessionId, if (pSession->pConnectBssDesc) { cdf_mem_copy(bssId.bytes, pSession->pConnectBssDesc->bssId, - sizeof(struct cdf_mac_addr)); + sizeof(struct qdf_mac_addr)); } sms_log(pMac, LOG2, "CSR Attempting to Deauth Bssid= " MAC_ADDRESS_STR, MAC_ADDR_ARRAY(bssId.bytes)); @@ -3475,7 +3475,7 @@ QDF_STATUS csr_roam_prepare_bss_config(tpAniSirGlobal pMac, if (pBssDesc->beaconInterval) /* Make sure it is bigger than the minimal */ pBssConfig->uJoinTimeOut = - CDF_MAX(10 * pBssDesc->beaconInterval, + QDF_MAX(10 * pBssDesc->beaconInterval, CSR_JOIN_FAILURE_TIMEOUT_MIN); else pBssConfig->uJoinTimeOut = @@ -3605,7 +3605,7 @@ static QDF_STATUS csr_roam_get_qos_info_from_bss(tpAniSirGlobal pMac, csr_get_parsed_bss_description_ies( pMac, pBssDesc, &pIes))) { /* err msg */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "csr_roam_get_qos_info_from_bss() failed"); break; } @@ -4155,7 +4155,7 @@ void csr_roam_ccm_cfg_set_callback(tpAniSirGlobal pMac, int32_t result) #ifdef WLAN_FEATURE_ROAM_OFFLOAD pSession = &pMac->roam.roamSession[sessionId]; if (pSession->roam_synch_in_progress) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "LFR3:csr_roam_cfg_set_callback"); } #endif @@ -4213,7 +4213,7 @@ QDF_STATUS csr_roam_set_bss_config_cfg(tpAniSirGlobal pMac, uint32_t sessionId, /* Make sure we have the domain info for the BSS we try to connect to. */ /* Do we need to worry about sequence for OSs that are not Windows?? */ if (pBssDesc) { - if ((CDF_SAP_MODE != + if ((QDF_SAP_MODE != csr_get_session_persona(pMac, sessionId)) && csr_learn_11dcountry_information( pMac, pBssDesc, pIes, true)) { @@ -5243,7 +5243,7 @@ void csr_roam_complete(tpAniSirGlobal pMac, eCsrRoamCompleteResult Result, tListElem *pEntry; tSmeCmd *pCommand; bool fReleaseCommand = true; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "%s: Roam Completion ...", __func__); pEntry = csr_ll_peek_head(&pMac->sme.smeCmdActiveList, LL_ACCESS_LOCK); if (pEntry) { @@ -5562,7 +5562,7 @@ bool csr_roam_is_fast_roam_enabled(tpAniSirGlobal pMac, uint32_t sessionId) pSession = CSR_GET_SESSION(pMac, sessionId); if (NULL != pSession->pCurRoamProfile) { if (pSession->pCurRoamProfile->csrPersona != - CDF_STA_MODE) { + QDF_STA_MODE) { return false; } } @@ -5654,14 +5654,14 @@ void csr_roam_synch_clean_up (tpAniSirGlobal mac, uint8_t session_id) tCsrRoamSession *session = &mac->roam.roamSession[session_id]; /* Clean up the roam synch in progress for LFR3 */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Roam Synch Failed, Clean Up", __func__); session->roam_synch_in_progress = false; roam_offload_failed = cdf_mem_malloc( sizeof(struct roam_offload_synch_fail)); if (NULL == roam_offload_failed) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: unable to allocate memory for roam synch fail" , __func__); return; @@ -5671,9 +5671,9 @@ void csr_roam_synch_clean_up (tpAniSirGlobal mac, uint8_t session_id) msg.type = WMA_ROAM_OFFLOAD_SYNCH_FAIL; msg.reserved = 0; msg.bodyptr = roam_offload_failed; - if (!QDF_IS_STATUS_SUCCESS(cds_mq_post_message(CDF_MODULE_ID_WMA, + if (!QDF_IS_STATUS_SUCCESS(cds_mq_post_message(QDF_MODULE_ID_WMA, &msg))) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "%s: Unable to post WMA_ROAM_OFFLOAD_SYNCH_FAIL to WMA", __func__); cdf_mem_free(roam_offload_failed); @@ -5762,7 +5762,7 @@ static void csr_roam_process_results_default(tpAniSirGlobal mac_ctx, roam_info.reasonCode = session->joinFailStatusCode.reasonCode; cdf_mem_copy(&roam_info.bssid, &session->joinFailStatusCode.bssId, - sizeof(struct cdf_mac_addr)); + sizeof(struct qdf_mac_addr)); /* * If Join fails while Handoff is in progress, indicate @@ -5987,7 +5987,7 @@ static void csr_roam_process_start_bss_success(tpAniSirGlobal mac_ctx, csr_roam_save_connected_infomation(mac_ctx, session_id, profile, bss_desc, ies_ptr); cdf_mem_copy(&roam_info.bssid, &bss_desc->bssId, - sizeof(struct cdf_mac_addr)); + sizeof(struct qdf_mac_addr)); } /* We are done with the IEs so free it */ cdf_mem_free(ies_ptr); @@ -6009,7 +6009,7 @@ static void csr_roam_process_start_bss_success(tpAniSirGlobal mac_ctx, } if (bss_desc) { cdf_mem_copy(ibss_log->bssid.bytes, - bss_desc->bssId, CDF_MAC_ADDR_SIZE); + bss_desc->bssId, QDF_MAC_ADDR_SIZE); ibss_log->operatingChannel = bss_desc->channelId; } @@ -6071,7 +6071,7 @@ static void csr_roam_process_start_bss_success(tpAniSirGlobal mac_ctx, roam_info.pBssDesc = bss_desc; roam_info.staId = (uint8_t) start_bss_rsp->staId; cdf_mem_copy(roam_info.bssid.bytes, bss_desc->bssId, - sizeof(struct cdf_mac_addr)); + sizeof(struct qdf_mac_addr)); if (!IS_FEATURE_SUPPORTED_BY_FW(SLM_SESSIONIZATION) && (csr_is_concurrent_session_running(mac_ctx))) { mac_ctx->roam.configParam.doBMPSWorkaround = 1; @@ -6171,7 +6171,7 @@ static void csr_roam_process_join_res(tpAniSirGlobal mac_ctx, bss_desc = session->pConnectBssDesc; if (bss_desc) cdf_mem_copy(&roam_info.bssid, &bss_desc->bssId, - sizeof(struct cdf_mac_addr)); + sizeof(struct qdf_mac_addr)); } else { if (cmd->u.roamCmd.pRoamBssEntry) { scan_res = GET_BASE_ADDR(cmd->u.roamCmd.pRoamBssEntry, @@ -6181,7 +6181,7 @@ static void csr_roam_process_join_res(tpAniSirGlobal mac_ctx, ies_ptr = (tDot11fBeaconIEs *) (scan_res->Result.pvIes); cdf_mem_copy(&roam_info.bssid, &bss_desc->bssId, - sizeof(struct cdf_mac_addr)); + sizeof(struct qdf_mac_addr)); } } } @@ -6259,7 +6259,7 @@ static void csr_roam_process_join_res(tpAniSirGlobal mac_ctx, if (session->roam_synch_in_progress && (roam_offload_params->authStatus == CSR_ROAM_AUTH_STATUS_AUTHENTICATED)) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, FL("LFR3:Don't start waitforkey timer")); csr_roam_substate_change(mac_ctx, @@ -6319,7 +6319,7 @@ static void csr_roam_process_join_res(tpAniSirGlobal mac_ctx, if (context) { #ifdef WLAN_FEATURE_ROAM_OFFLOAD if (session->roam_synch_in_progress) - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, FL("LFR3:Clear Connected info")); #endif @@ -6472,7 +6472,7 @@ static void csr_roam_process_join_res(tpAniSirGlobal mac_ctx, cdf_mem_copy(roam_info.replay_ctr, roam_offload_params->replay_ctr, SIR_REPLAY_CTR_LEN); - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, FL ("LFR3: Copy KCK, KEK and Replay Ctr")); @@ -6504,7 +6504,7 @@ static void csr_roam_process_join_res(tpAniSirGlobal mac_ctx, if (!CSR_IS_WAIT_FOR_KEY(mac_ctx, session_id)) { #ifdef WLAN_FEATURE_ROAM_OFFLOAD if (session->roam_synch_in_progress) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, FL ("NO CSR_IS_WAIT_FOR_KEY -> csr_roam_link_up")); @@ -6593,7 +6593,7 @@ static bool csr_roam_process_results(tpAniSirGlobal mac_ctx, tSmeCmd *cmd, if (roam_info.pBssDesc) cdf_mem_copy(&roam_info.bssid, &roam_info.pBssDesc->bssId, - sizeof(struct cdf_mac_addr)); + sizeof(struct qdf_mac_addr)); /* * Since there is no change in the current state, simply pass * back no result otherwise HDD may be mistakenly mark to @@ -6620,7 +6620,7 @@ static bool csr_roam_process_results(tpAniSirGlobal mac_ctx, tSmeCmd *cmd, if (roam_info.pBssDesc) cdf_mem_copy(&roam_info.bssid, &roam_info.pBssDesc->bssId, - sizeof(struct cdf_mac_addr)); + sizeof(struct qdf_mac_addr)); roam_info.statusCode = session->joinFailStatusCode.statusCode; roam_info.reasonCode = session->joinFailStatusCode.reasonCode; roam_info.nBeaconLength = session->connectedInfo.nBeaconLength; @@ -6671,7 +6671,7 @@ QDF_STATUS csr_roam_copy_profile(tpAniSirGlobal pMac, cdf_mem_set(pDstProfile, sizeof(tCsrRoamProfile), 0); if (pSrcProfile->BSSIDs.numOfBSSIDs) { - size = sizeof(struct cdf_mac_addr) * pSrcProfile->BSSIDs.numOfBSSIDs; + size = sizeof(struct qdf_mac_addr) * pSrcProfile->BSSIDs.numOfBSSIDs; pDstProfile->BSSIDs.bssid = cdf_mem_malloc(size); if (NULL == pDstProfile->BSSIDs.bssid) { status = QDF_STATUS_E_NOMEM; @@ -6850,7 +6850,7 @@ QDF_STATUS csr_roam_copy_connected_profile(tpAniSirGlobal pMac, cdf_mem_set(pDstProfile, sizeof(tCsrRoamProfile), 0); - pDstProfile->BSSIDs.bssid = cdf_mem_malloc(sizeof(struct cdf_mac_addr)); + pDstProfile->BSSIDs.bssid = cdf_mem_malloc(sizeof(struct qdf_mac_addr)); if (NULL == pDstProfile->BSSIDs.bssid) { status = QDF_STATUS_E_NOMEM; sms_log(pMac, LOGE, @@ -6968,7 +6968,7 @@ QDF_STATUS csr_roam_issue_connect(tpAniSirGlobal pMac, uint32_t sessionId, pCommand->u.roamCmd.roamProfile.EncryptionType. encryptionType[0] = eCSR_ENCRYPT_TYPE_NONE; pCommand->u.roamCmd.roamProfile.csrPersona = - CDF_STA_MODE; + QDF_STA_MODE; } else { /* make a copy of the profile */ status = @@ -6988,7 +6988,7 @@ QDF_STATUS csr_roam_issue_connect(tpAniSirGlobal pMac, uint32_t sessionId, /* We need to free the BssList when the command is done */ pCommand->u.roamCmd.fReleaseBssList = true; pCommand->u.roamCmd.fUpdateCurRoamProfile = true; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("CSR PERSONA=%d"), pCommand->u.roamCmd.roamProfile.csrPersona); status = csr_queue_sme_command(pMac, pCommand, fImediate); @@ -7255,8 +7255,8 @@ QDF_STATUS csr_roam_connect(tpAniSirGlobal pMac, uint32_t sessionId, if (QDF_IS_STATUS_SUCCESS(status)) { /* check if set hw mode needs to be done */ if ((pMac->policy_manager_enabled) && - ((pScanFilter->csrPersona == CDF_STA_MODE) || - (pScanFilter->csrPersona == CDF_P2P_CLIENT_MODE))) { + ((pScanFilter->csrPersona == QDF_STA_MODE) || + (pScanFilter->csrPersona == QDF_P2P_CLIENT_MODE))) { csr_get_bssdescr_from_scan_handle(hBSSList, &first_ap_profile); status = cds_handle_conc_multiport(sessionId, @@ -7553,7 +7553,7 @@ QDF_STATUS csr_roam_process_disassoc_deauth(tpAniSirGlobal pMac, tSmeCmd *pComma && (eSIR_MAC_DISASSOC_LEAVING_BSS_REASON == pCommand->u.roamCmd.reason)) { NewSubstate = eCSR_ROAM_SUBSTATE_DISASSOC_STA_HAS_LEFT; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL ("set to substate eCSR_ROAM_SUBSTATE_DISASSOC_STA_HAS_LEFT")); } @@ -7698,7 +7698,7 @@ QDF_STATUS csr_roam_issue_disassociate_cmd(tpAniSirGlobal pMac, uint32_t session pCommand->u.roamCmd.roamReason = eCsrForcedDisassoc; pCommand->u.roamCmd.reason = eSIR_MAC_DISASSOC_LEAVING_BSS_REASON; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL ("SME convert to internal reason code eCsrStaHasLeft")); break; @@ -7811,7 +7811,7 @@ QDF_STATUS csr_roam_save_connected_infomation(tpAniSirGlobal pMac, pSession = CSR_GET_SESSION(pMac, sessionId); if (NULL == pSession) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("session %d not found"), sessionId); return QDF_STATUS_E_FAILURE; } @@ -7977,12 +7977,12 @@ static void csr_roam_join_rsp_processor(tpAniSirGlobal pMac, if (pSmeJoinRsp) { session_ptr = CSR_GET_SESSION(pMac, pSmeJoinRsp->sessionId); } else { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Sme Join Response is NULL")); return; } if (!session_ptr) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("session %d not found"), pSmeJoinRsp->sessionId); return; } @@ -8055,12 +8055,12 @@ static void csr_roam_join_rsp_processor(tpAniSirGlobal pMac, * ***************************************************/ if (session_ptr->join_bssid_count >= CSR_MAX_BSSID_COUNT) - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Excessive Join Req Failures")); if (is_dis_pending) - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("disconnect is pending, complete roam")); @@ -8097,7 +8097,7 @@ static QDF_STATUS csr_roam_issue_reassociate(tpAniSirGlobal pMac, csr_roam_state_change(pMac, eCSR_ROAMING_STATE_JOINING, sessionId); /* Set the roaming substate to 'join attempt'... */ csr_roam_substate_change(pMac, eCSR_ROAM_SUBSTATE_REASSOC_REQ, sessionId); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL(" calling csr_send_join_req_msg (eWNI_SME_REASSOC_REQ)")); /* attempt to Join this BSS... */ return csr_send_join_req_msg(pMac, sessionId, pSirBssDesc, pProfile, pIes, @@ -8539,7 +8539,7 @@ static void csr_roam_roaming_state_reassoc_rsp_processor(tpAniSirGlobal pMac, uint32_t roamId = 0; if (eSIR_SME_SUCCESS == pSmeJoinRsp->statusCode) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, FL("CSR SmeReassocReq Successful")); result = eCsrReassocSuccess; /* @@ -8786,7 +8786,7 @@ void csr_roam_roaming_state_disassoc_rsp_processor(tpAniSirGlobal pMac, csr_ser_des_unpack_diassoc_rsp((uint8_t *) pSmeRsp, &SmeDisassocRsp); sessionId = SmeDisassocRsp.sessionId; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, FL("sessionId %d"), + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, FL("sessionId %d"), sessionId); if (csr_is_conn_state_infra(pMac, sessionId)) { @@ -8815,7 +8815,7 @@ void csr_roam_roaming_state_disassoc_rsp_processor(tpAniSirGlobal pMac, } csr_roam_complete(pMac, eCsrNothingToJoin, NULL); } else if (CSR_IS_ROAM_SUBSTATE_DISASSOC_HO(pMac, sessionId)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, FL("CSR SmeDisassocReq due to HO on session %d"), sessionId); pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[sessionId]; @@ -9014,7 +9014,7 @@ void csr_roaming_state_msg_processor(tpAniSirGlobal pMac, void *pMsgBuf) pSmeRsp->sessionId) || CSR_IS_ROAM_SUBSTATE_DISASSOC_HO(pMac, pSmeRsp->sessionId)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, FL("eWNI_SME_DISASSOC_RSP subState = %s"), mac_trace_getcsr_roam_sub_state( pMac->roam.curSubState[pSmeRsp->sessionId])); @@ -9101,7 +9101,7 @@ void csr_roam_joined_state_msg_processor(tpAniSirGlobal pMac, void *pMsgBuf) (tSirSmeAssocIndToUpperLayerCnf *) pMsgBuf; status = csr_roam_get_session_id_from_bssid(pMac, - (struct cdf_mac_addr *) + (struct qdf_mac_addr *) pUpperLayerAssocCnf-> bssId, &sessionId); pSession = CSR_GET_SESSION(pMac, sessionId); @@ -9136,7 +9136,7 @@ void csr_roam_joined_state_msg_processor(tpAniSirGlobal pMac, void *pMsgBuf) sizeof(tSirMacAddr)); cdf_mem_copy(&pRoamInfo->bssid, pUpperLayerAssocCnf->bssId, - sizeof(struct cdf_mac_addr)); + sizeof(struct qdf_mac_addr)); pRoamInfo->wmmEnabledSta = pUpperLayerAssocCnf->wmmEnabledSta; pRoamInfo->timingMeasCap = @@ -9192,7 +9192,7 @@ QDF_STATUS csr_roam_issue_set_context_req(tpAniSirGlobal pMac, tCsrRoamSetKey setKey; setKey.encType = EncryptType; setKey.keyDirection = aniKeyDirection; - cdf_mem_copy(&setKey.peerMac, bssId, sizeof(struct cdf_mac_addr)); + cdf_mem_copy(&setKey.peerMac, bssId, sizeof(struct qdf_mac_addr)); /* 0 for supplicant */ setKey.paeRole = paeRole; /* Key index */ @@ -9378,7 +9378,7 @@ static QDF_STATUS csr_roam_issue_set_key_command(tpAniSirGlobal pMac, #if defined(FEATURE_WLAN_ESE) || defined (FEATURE_WLAN_WAPI) tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (NULL == pSession) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("session %d not found"), sessionId); return QDF_STATUS_E_FAILURE; } @@ -9484,7 +9484,7 @@ QDF_STATUS csr_roam_process_set_key_command(tpAniSirGlobal pMac, tSmeCmd *pComma } cdf_mem_copy(setKeyEvent.bssid, pSession->connectedProfile.bssid.bytes, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); if (CSR_IS_ENC_TYPE_STATIC(pCommand->u.setKeyCmd.encType)) { uint32_t defKeyId; /* It has to be static WEP here */ @@ -9584,7 +9584,7 @@ csr_roam_prepare_filter_from_profile(tpAniSirGlobal mac_ctx, roam_params = &mac_ctx->roam.configParam.roam_params; if (profile->BSSIDs.numOfBSSIDs) { - size = sizeof(struct cdf_mac_addr) * profile->BSSIDs.numOfBSSIDs; + size = sizeof(struct qdf_mac_addr) * profile->BSSIDs.numOfBSSIDs; scan_fltr->BSSIDs.bssid = cdf_mem_malloc(size); if (NULL == scan_fltr->BSSIDs.bssid) { status = QDF_STATUS_E_NOMEM; @@ -9597,7 +9597,7 @@ csr_roam_prepare_filter_from_profile(tpAniSirGlobal mac_ctx, if (profile->SSIDs.numOfSSIDs) { scan_fltr->SSIDs.numOfSSIDs = profile->SSIDs.numOfSSIDs; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, FL("No of Allowed List:%d"), roam_params->num_ssid_allowed_list); if (scan_fltr->scan_filter_for_roam @@ -9776,16 +9776,16 @@ static QDF_STATUS csr_send_snr_request(void *pGetRssiReq) { void *wma_handle; - wma_handle = cds_get_context(CDF_MODULE_ID_WMA); + wma_handle = cds_get_context(QDF_MODULE_ID_WMA); if (!wma_handle) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "wma_handle is NULL"); return QDF_STATUS_E_FAILURE; } if (QDF_STATUS_SUCCESS != wma_send_snr_request(wma_handle, pGetRssiReq)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "Failed to Trigger wma stats request"); return QDF_STATUS_E_FAILURE; } @@ -9918,7 +9918,7 @@ void csr_send_ese_adjacent_ap_rep_ind(tpAniSirGlobal pMac, tCsrRoamSession *pSes #endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */ static QDF_STATUS csr_send_reset_ap_caps_changed(tpAniSirGlobal pMac, - struct cdf_mac_addr *bssId) + struct qdf_mac_addr *bssId) { tpSirResetAPCapsChange pMsg; uint16_t len; @@ -9961,7 +9961,7 @@ csr_roam_chk_lnk_assoc_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) sms_log(mac_ctx, LOG1, FL("Receive WNI_SME_ASSOC_IND from SME")); pAssocInd = (tSirSmeAssocInd *) msg_ptr; status = csr_roam_get_session_id_from_bssid(mac_ctx, - (struct cdf_mac_addr *) pAssocInd->bssId, &sessionId); + (struct qdf_mac_addr *) pAssocInd->bssId, &sessionId); if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac_ctx, LOG1, FL("Couldn't find session_id for given BSSID")); @@ -9994,7 +9994,7 @@ csr_roam_chk_lnk_assoc_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) sizeof(tSirMacAddr)); cdf_mem_copy(roam_info_ptr->bssid.bytes, pAssocInd->bssId, - sizeof(struct cdf_mac_addr)); + sizeof(struct qdf_mac_addr)); roam_info_ptr->wmmEnabledSta = pAssocInd->wmmEnabledSta; roam_info_ptr->timingMeasCap = pAssocInd->timingMeasCap; cdf_mem_copy(&roam_info_ptr->chan_info, @@ -10129,7 +10129,7 @@ csr_roam_chk_lnk_disassoc_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) cmd.u.roamCmd.roamReason = eCsrForcedDeauthSta; cdf_mem_copy(cmd.u.roamCmd.peerMac, pDisassocInd->peer_macaddr.bytes, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); csr_roam_remove_duplicate_command(mac_ctx, sessionId, &cmd, eCsrForcedDeauthSta); } @@ -10325,7 +10325,7 @@ csr_roam_diag_mic_fail(tpAniSirGlobal mac_ctx, uint32_t sessionId) (uint8_t) diag_auth_type_from_csr_type( session->connectedProfile.AuthType); cdf_mem_copy(secEvent.bssid, session->connectedProfile.bssid.bytes, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); WLAN_HOST_DIAG_EVENT_REPORT(&secEvent, EVENT_WLAN_SECURITY); } #endif /* FEATURE_WLAN_DIAG_SUPPORT_CSR */ @@ -10442,7 +10442,7 @@ csr_roam_chk_lnk_wm_status_change_ntf(tpAniSirGlobal mac_ctx, if (session->pConnectBssDesc) { cdf_mem_copy(&roam_info.bssid, session->pConnectBssDesc->bssId, - sizeof(struct cdf_mac_addr)); + sizeof(struct qdf_mac_addr)); roam_info.u.pConnectedProfile = &session->connectedProfile; roam_info_ptr = &roam_info; @@ -10504,12 +10504,12 @@ csr_roam_chk_lnk_wm_status_change_ntf(tpAniSirGlobal mac_ctx, result = eCSR_ROAM_RESULT_IBSS_COALESCED; roamStatus = eCSR_ROAM_IBSS_IND; cdf_mem_copy(&roam_info.bssid, &pNewBss->bssId, - sizeof(struct cdf_mac_addr)); + sizeof(struct qdf_mac_addr)); roam_info_ptr = &roam_info; /* This BSSID is the real BSSID, save it */ if (session->pConnectBssDesc) cdf_mem_copy(session->pConnectBssDesc->bssId, - &pNewBss->bssId, sizeof(struct cdf_mac_addr)); + &pNewBss->bssId, sizeof(struct qdf_mac_addr)); break; /* @@ -10608,7 +10608,7 @@ csr_roam_chk_lnk_ibss_new_peer_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) } cdf_copy_macaddr(&roam_info.peerMac, &pIbssPeerInd->peer_addr); cdf_mem_copy(&roam_info.bssid, session->pConnectBssDesc->bssId, - sizeof(struct cdf_mac_addr)); + sizeof(struct qdf_mac_addr)); if (pIbssPeerInd->mesgLen > sizeof(tSmeIbssPeerInd)) { roam_info.pbFrames = cdf_mem_malloc((pIbssPeerInd->mesgLen - sizeof(tSmeIbssPeerInd))); @@ -10734,7 +10734,7 @@ csr_roam_diag_set_ctx_rsp(tpAniSirGlobal mac_ctx, (uint8_t) diag_enc_type_from_csr_type( session->connectedProfile.EncryptionType); cdf_mem_copy(setKeyEvent.bssid, session->connectedProfile.bssid.bytes, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); setKeyEvent.authMode = (uint8_t) diag_auth_type_from_csr_type( session->connectedProfile.AuthType); @@ -10990,7 +10990,7 @@ bool csr_roam_complete_roaming(tpAniSirGlobal pMac, uint32_t sessionId, bool fCompleted = true; uint32_t roamTime = (uint32_t) (pMac->roam.configParam.nRoamingTime * - CDF_TICKS_PER_SECOND); + QDF_TICKS_PER_SECOND); uint32_t curTime = (uint32_t) cdf_mc_timer_get_system_ticks(); tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (!pSession) { @@ -11859,7 +11859,7 @@ int8_t csr_get_cfg_max_tx_power(tpAniSirGlobal pMac, uint8_t channel) else status = QDF_STATUS_SUCCESS; if (status != QDF_STATUS_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("%s: failed to allocate memory, status = %d"), __FUNCTION__, status); goto error; @@ -12352,11 +12352,11 @@ csr_roam_get_bss_start_parms(tpAniSirGlobal pMac, pParam->uCfgDot11Mode = csr_roam_get_phy_mode_band_for_bss(pMac, pProfile, tmp_opr_ch, &band); - if (((pProfile->csrPersona == CDF_P2P_CLIENT_MODE) - || (pProfile->csrPersona == CDF_P2P_GO_MODE)) + if (((pProfile->csrPersona == QDF_P2P_CLIENT_MODE) + || (pProfile->csrPersona == QDF_P2P_GO_MODE)) && (pParam->uCfgDot11Mode == eCSR_CFG_DOT11_MODE_11B)) { /* This should never happen */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, FL("For P2P (persona %d) dot11_mode is 11B"), pProfile->csrPersona); CDF_ASSERT(0); @@ -12399,8 +12399,8 @@ csr_roam_get_bss_start_parms(tpAniSirGlobal pMac, break; case eSIR_11G_NW_TYPE: /* For P2P Client and P2P GO, disable 11b rates */ - if ((pProfile->csrPersona == CDF_P2P_CLIENT_MODE) - || (pProfile->csrPersona == CDF_P2P_GO_MODE) + if ((pProfile->csrPersona == QDF_P2P_CLIENT_MODE) + || (pProfile->csrPersona == QDF_P2P_GO_MODE) || (eCSR_CFG_DOT11_MODE_11G_ONLY == pParam->uCfgDot11Mode)) { csr_populate_basic_rates(opr_rates, true, true); @@ -12440,7 +12440,7 @@ csr_roam_get_bss_start_parms_from_bss_desc(tpAniSirGlobal pMac, pParam->sirNwType = pBssDesc->nwType; pParam->cbMode = PHY_SINGLE_CHANNEL_CENTERED; pParam->operationChn = pBssDesc->channelId; - cdf_mem_copy(&pParam->bssid, pBssDesc->bssId, sizeof(struct cdf_mac_addr)); + cdf_mem_copy(&pParam->bssid, pBssDesc->bssId, sizeof(struct qdf_mac_addr)); if (!pIes) { pParam->ssId.length = 0; @@ -12525,7 +12525,7 @@ QDF_STATUS csr_roam_issue_start_bss(tpAniSirGlobal pMac, uint32_t sessionId, pIbssLog->eventId = WLAN_IBSS_EVENT_JOIN_IBSS_REQ; cdf_mem_copy(pIbssLog->bssid.bytes, - pBssDesc->bssId, CDF_MAC_ADDR_SIZE); + pBssDesc->bssId, QDF_MAC_ADDR_SIZE); } else { pIbssLog->eventId = WLAN_IBSS_EVENT_START_IBSS_REQ; @@ -12634,10 +12634,10 @@ static void csr_roam_prepare_bss_params(tpAniSirGlobal pMac, uint32_t sessionId, /* Use the first BSSID */ cdf_mem_copy(&pSession->bssParams.bssid, pProfile->BSSIDs.bssid, - sizeof(struct cdf_mac_addr)); + sizeof(struct qdf_mac_addr)); else cdf_mem_set(&pSession->bssParams.bssid, - sizeof(struct cdf_mac_addr), 0); + sizeof(struct qdf_mac_addr), 0); } Channel = pSession->bssParams.operationChn; /* Set operating channel in pProfile which will be used */ @@ -12753,7 +12753,7 @@ static void csr_roam_update_connected_profile_from_new_bss(tpAniSirGlobal pMac, pNewBss->channelNumber; /* move the BSSId from the BSS description into the connected state information. */ cdf_mem_copy(&pSession->connectedProfile.bssid.bytes, - &(pNewBss->bssId), sizeof(struct cdf_mac_addr)); + &(pNewBss->bssId), sizeof(struct qdf_mac_addr)); } return; } @@ -12790,7 +12790,7 @@ csr_roam_diag_set_pmkid(tCsrRoamSession *pSession) pSession->connectedProfile.EncryptionType); cdf_mem_copy(secEvent.bssid, pSession->connectedProfile.bssid.bytes, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); secEvent.authMode = (uint8_t) diag_auth_type_from_csr_type( pSession->connectedProfile.AuthType); WLAN_HOST_DIAG_EVENT_REPORT(&secEvent, EVENT_WLAN_SECURITY); @@ -12892,7 +12892,7 @@ QDF_STATUS csr_roam_del_pmkid_from_cache(tpAniSirGlobal pMac, /* !flush_cache - so look up in the cache */ for (Index = 0; Index < CSR_MAX_PMKID_ALLOWED; Index++) { if (cdf_mem_compare(pSession->PmkidCacheInfo[Index].BSSID.bytes, - pBSSId, CDF_MAC_ADDR_SIZE)) { + pBSSId, QDF_MAC_ADDR_SIZE)) { fMatchFound = 1; /* Clear this - the matched entry */ @@ -13139,13 +13139,13 @@ csr_roam_remove_connected_bss_from_scan_cache(tpAniSirGlobal pMac, return QDF_STATUS_E_NOMEM; cdf_mem_set(pScanFilter, sizeof(tCsrScanResultFilter), 0); - pScanFilter->BSSIDs.bssid = cdf_mem_malloc(sizeof(struct cdf_mac_addr)); + pScanFilter->BSSIDs.bssid = cdf_mem_malloc(sizeof(struct qdf_mac_addr)); if (NULL == pScanFilter->BSSIDs.bssid) { cdf_mem_free(pScanFilter); return QDF_STATUS_E_NOMEM; } cdf_mem_copy(pScanFilter->BSSIDs.bssid, - &pConnProfile->bssid, sizeof(struct cdf_mac_addr)); + &pConnProfile->bssid, sizeof(struct qdf_mac_addr)); pScanFilter->BSSIDs.numOfBSSIDs = 1; if (!csr_is_nullssid(pConnProfile->SSID.ssId, pConnProfile->SSID.length)) { @@ -13446,7 +13446,7 @@ QDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, #endif csr_join_req->staPersona = (uint8_t) pProfile->csrPersona; csr_join_req->cbMode = (uint8_t) pSession->bssParams.cbMode; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("CSR PERSONA=%d CSR CbMode %d"), pProfile->csrPersona, pSession->bssParams.cbMode); csr_join_req->uapsdPerAcBitmask = pProfile->uapsd_mask; @@ -13824,11 +13824,11 @@ QDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, (uint8_t)pMac->roam.configParam.txBFCsnValue; if (IS_BSS_VHT_CAPABLE(pIes->VHTCaps) && pIes->VHTCaps.numSoundingDim) - txBFCsnValue = CDF_MIN(txBFCsnValue, + txBFCsnValue = QDF_MIN(txBFCsnValue, pIes->VHTCaps.numSoundingDim); else if (IS_BSS_VHT_CAPABLE(pIes->vendor2_ie.VHTCaps) && pIes->vendor2_ie.VHTCaps.numSoundingDim) - txBFCsnValue = CDF_MIN(txBFCsnValue, + txBFCsnValue = QDF_MIN(txBFCsnValue, pIes->vendor2_ie.VHTCaps.numSoundingDim); } csr_join_req->txBFCsnValue = txBFCsnValue; @@ -13926,7 +13926,7 @@ QDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, roam.configParam.is_sta_connection_in_5gz_enabled) && CDS_IS_CHANNEL_5GHZ(pBssDescription-> channelId)) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("STA-conn on 5G isn't allowed")); status = QDF_STATUS_E_FAILURE; @@ -13969,7 +13969,7 @@ QDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, if (eWNI_SME_JOIN_REQ == messageType) { /* Notify QoS module that join happening */ pSession->join_bssid_count++; - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "BSSID Count = %d", pSession->join_bssid_count); @@ -14015,15 +14015,15 @@ QDF_STATUS csr_send_mb_disassoc_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, && (CSR_IS_INFRA_AP(pSession->pCurRoamProfile))) { cdf_mem_copy(&pMsg->bssid.bytes, &pSession->selfMacAddr, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); cdf_mem_copy(&pMsg->peer_macaddr.bytes, bssId, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); } else { cdf_mem_copy(&pMsg->bssid.bytes, - bssId, CDF_MAC_ADDR_SIZE); + bssId, QDF_MAC_ADDR_SIZE); cdf_mem_copy(&pMsg->peer_macaddr.bytes, - bssId, CDF_MAC_ADDR_SIZE); + bssId, QDF_MAC_ADDR_SIZE); } pMsg->reasonCode = reasonCode; /* @@ -14041,8 +14041,8 @@ QDF_STATUS csr_send_mb_disassoc_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, QDF_STATUS csr_send_mb_get_associated_stas_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, - CDF_MODULE_ID modId, - struct cdf_mac_addr bssid, + QDF_MODULE_ID modId, + struct qdf_mac_addr bssid, void *pUsrContext, void *pfnSapEventCallback, uint8_t *pAssocStasBuf) @@ -14069,9 +14069,9 @@ csr_send_mb_get_associated_stas_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, QDF_STATUS csr_send_mb_get_wpspbc_sessions(tpAniSirGlobal pMac, uint32_t sessionId, - struct cdf_mac_addr bssid, void *pUsrContext, + struct qdf_mac_addr bssid, void *pUsrContext, void *pfnSapEventCallback, - struct cdf_mac_addr remove_mac) + struct qdf_mac_addr remove_mac) { QDF_STATUS status = QDF_STATUS_SUCCESS; tSirSmeGetWPSPBCSessionsReq *pMsg; @@ -14207,14 +14207,14 @@ QDF_STATUS csr_send_mb_deauth_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, && (CSR_IS_INFRA_AP(pSession->pCurRoamProfile))) { cdf_mem_copy(&pMsg->bssid, &pSession->selfMacAddr, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); } else { cdf_mem_copy(&pMsg->bssid, - bssId, CDF_MAC_ADDR_SIZE); + bssId, QDF_MAC_ADDR_SIZE); } /* Set the peer MAC address before sending the message to LIM */ - cdf_mem_copy(&pMsg->peer_macaddr.bytes, bssId, CDF_MAC_ADDR_SIZE); + cdf_mem_copy(&pMsg->peer_macaddr.bytes, bssId, QDF_MAC_ADDR_SIZE); pMsg->reasonCode = reasonCode; return cds_send_mb_message_to_mac(pMsg); @@ -14314,15 +14314,15 @@ QDF_STATUS csr_send_assoc_cnf_msg(tpAniSirGlobal pMac, tpSirSmeAssocInd pAssocIn pMsg->statusCode = eSIR_SME_ASSOC_REFUSED; /* bssId */ cdf_mem_copy(pMsg->bssid.bytes, pAssocInd->bssId, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); /* peerMacAddr */ cdf_mem_copy(pMsg->peer_macaddr.bytes, pAssocInd->peerMacAddr, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); /* aid */ pMsg->aid = pAssocInd->aid; /* alternateBssId */ cdf_mem_copy(pMsg->alternate_bssid.bytes, pAssocInd->bssId, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); /* alternateChannelId */ pMsg->alternateChannelId = 11; /* pMsg is freed by cds_send_mb_message_to_mac in anycase*/ @@ -14414,7 +14414,7 @@ QDF_STATUS csr_send_assoc_ind_to_upper_layer_cnf_msg(tpAniSirGlobal pMac, QDF_STATUS csr_send_mb_set_context_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, - struct cdf_mac_addr peer_macaddr, + struct qdf_mac_addr peer_macaddr, uint8_t numKeys, tAniEdType edType, bool fUnicast, tAniKeyDirection aniKeyDirection, @@ -14831,11 +14831,11 @@ QDF_STATUS csr_roam_open_session(tpAniSirGlobal pMac, pSession->callback = callback; pSession->pContext = pContext; cdf_mem_copy(&pSession->selfMacAddr, pSelfMacAddr, - sizeof(struct cdf_mac_addr)); + sizeof(struct qdf_mac_addr)); *pbSessionId = (uint8_t) i; status = cdf_mc_timer_init(&pSession->hTimerRoaming, - CDF_TIMER_TYPE_SW, + QDF_TIMER_TYPE_SW, csr_roam_roaming_timer_handler, &pSession->roamingTimerInfo); if (!QDF_IS_STATUS_SUCCESS(status)) { @@ -14847,7 +14847,7 @@ QDF_STATUS csr_roam_open_session(tpAniSirGlobal pMac, /* get the HT capability info */ if (wlan_cfg_get_int(pMac, WNI_CFG_HT_CAP_INFO, &value) != eSIR_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_CDF, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: could not get HT capability info", __func__); @@ -14855,7 +14855,7 @@ QDF_STATUS csr_roam_open_session(tpAniSirGlobal pMac, } #ifdef FEATURE_WLAN_BTAMP_UT_RF status = cdf_mc_timer_init(&pSession->hTimerJoinRetry, - CDF_TIMER_TYPE_SW, + QDF_TIMER_TYPE_SW, csr_roam_join_retry_timer_handler, &pSession-> joinRetryTimerInfo); @@ -15112,7 +15112,7 @@ static void csr_init_session(tpAniSirGlobal pMac, uint32_t sessionId) csr_roam_free_connected_info(pMac, &pSession->connectedInfo); csr_free_connect_bss_desc(pMac, sessionId); csr_scan_enable(pMac); - cdf_mem_set(&pSession->selfMacAddr, sizeof(struct cdf_mac_addr), 0); + cdf_mem_set(&pSession->selfMacAddr, sizeof(struct qdf_mac_addr), 0); if (pSession->pWpaRsnReqIE) { cdf_mem_free(pSession->pWpaRsnReqIE); pSession->pWpaRsnReqIE = NULL; @@ -15148,7 +15148,7 @@ static void csr_init_session(tpAniSirGlobal pMac, uint32_t sessionId) } QDF_STATUS csr_roam_get_session_id_from_bssid(tpAniSirGlobal pMac, - struct cdf_mac_addr *bssid, + struct qdf_mac_addr *bssid, uint32_t *pSessionId) { QDF_STATUS status = QDF_STATUS_E_FAILURE; @@ -15190,7 +15190,7 @@ static uint32_t csr_find_ibss_session(tpAniSirGlobal pMac) return nRet; } -static void csr_roam_link_up(tpAniSirGlobal pMac, struct cdf_mac_addr bssid) +static void csr_roam_link_up(tpAniSirGlobal pMac, struct qdf_mac_addr bssid) { uint32_t sessionId = 0; @@ -15366,7 +15366,7 @@ void csr_roam_stats_client_timer_handler(void *pv) tCsrStatsClientReqInfo *pStaEntry = (tCsrStatsClientReqInfo *) pv; if (CDF_TIMER_STATE_STOPPED == cdf_mc_timer_get_current_state(&pStaEntry->timer)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("roam stats client timer is stopped")); } } @@ -15758,7 +15758,7 @@ tCsrPeStatsReqInfo *csr_roam_insert_entry_into_pe_stats_req_list(tpAniSirGlobal QDF_STATUS csr_get_rssi(tpAniSirGlobal pMac, tCsrRssiCallback callback, uint8_t staId, - struct cdf_mac_addr bssId, + struct qdf_mac_addr bssId, int8_t lastRSSI, void *pContext, void *p_cds_context) { QDF_STATUS status = QDF_STATUS_SUCCESS; @@ -15808,7 +15808,7 @@ QDF_STATUS csr_get_rssi(tpAniSirGlobal pMac, QDF_STATUS csr_get_snr(tpAniSirGlobal pMac, tCsrSnrCallback callback, - uint8_t staId, struct cdf_mac_addr bssId, void *pContext) + uint8_t staId, struct qdf_mac_addr bssId, void *pContext) { QDF_STATUS status = QDF_STATUS_SUCCESS; cds_msg_t msg; @@ -15851,7 +15851,7 @@ QDF_STATUS csr_get_snr(tpAniSirGlobal pMac, QDF_STATUS csr_get_tsm_stats(tpAniSirGlobal pMac, tCsrTsmStatsCallback callback, uint8_t staId, - struct cdf_mac_addr bssId, + struct qdf_mac_addr bssId, void *pContext, void *p_cds_context, uint8_t tid) { QDF_STATUS status = QDF_STATUS_SUCCESS; @@ -15965,7 +15965,7 @@ csr_insert_stats_request_to_list(tpAniSirGlobal mac_ctx, ptr_sta_entry->periodicity = periodicity; if (ptr_sta_entry->periodicity) { status = cdf_mc_timer_init(&ptr_sta_entry->timer, - CDF_TIMER_TYPE_SW, + QDF_TIMER_TYPE_SW, csr_roam_stats_client_timer_handler, ptr_sta_entry); if (!QDF_IS_STATUS_SUCCESS(status)) { @@ -16010,7 +16010,7 @@ csr_get_statistics_from_tl(tpAniSirGlobal mac_ctx, /* update periodicity */ if (mac_ctx->roam.tlStatsReqInfo.periodicity) mac_ctx->roam.tlStatsReqInfo.periodicity = - CDF_MIN(periodicity, + QDF_MIN(periodicity, mac_ctx->roam.tlStatsReqInfo.periodicity); else mac_ctx->roam.tlStatsReqInfo.periodicity = periodicity; @@ -16221,13 +16221,13 @@ csr_roam_scan_offload_prepare_probe_req_template(tpAniSirGlobal pMac, nStatus = dot11f_get_packed_probe_request_size(pMac, &pr, &nPayload); if (DOT11F_FAILED(nStatus)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "Failed to calculate the packed size f" "or a Probe Request (0x%08x).\n", nStatus); nPayload = sizeof(tDot11fProbeRequest); } else if (DOT11F_WARNED(nStatus)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "There were warnings while calculating" "the packed size for a Probe Request (" "0x%08x).\n", nStatus); @@ -16245,7 +16245,7 @@ csr_roam_scan_offload_prepare_probe_req_template(tpAniSirGlobal pMac, selfMacAddr); if (eSIR_SUCCESS != nSirStatus) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "Failed to populate the buffer descriptor for a Probe Request (%d).\n", nSirStatus); return nSirStatus; @@ -16255,12 +16255,12 @@ csr_roam_scan_offload_prepare_probe_req_template(tpAniSirGlobal pMac, sizeof(tSirMacMgmtHdr), nPayload, &nPayload); if (DOT11F_FAILED(nStatus)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "Failed to pack a Probe Request (0x%08x).\n", nStatus); return eSIR_FAILURE; } else if (DOT11F_WARNED(nStatus)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "There were warnings while packing a Probe Request (0x%08x).\n", nStatus); } @@ -16300,7 +16300,7 @@ csr_update_roam_scan_offload_request(tpAniSirGlobal mac_ctx, cdf_mem_copy(req_buf->PSK_PMK, session->psk_pmk, sizeof(req_buf->PSK_PMK)); req_buf->pmk_len = session->pmk_len; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "LFR3: PMK Length = %d", req_buf->pmk_len); req_buf->R0KH_ID_Length = session->ftSmeContext.r0kh_id_len; cdf_mem_copy(req_buf->R0KH_ID, @@ -16384,7 +16384,7 @@ csr_fetch_ch_lst_from_ini(tpAniSirGlobal mac_ctx, band = mac_ctx->roam.configParam.bandCapability; if ((eCSR_BAND_24 != band) && (eCSR_BAND_5G != band) && (eCSR_BAND_ALL != band)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Invalid band(%d), roam scan offload req aborted"), band); return QDF_STATUS_E_FAILURE; @@ -16432,7 +16432,7 @@ csr_fetch_ch_lst_from_occupied_lst(tpAniSirGlobal mac_ctx, uint8_t num_channels = 0; uint8_t *ch_lst = mac_ctx->scan.occupiedChannels[session_id].channelList; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "Num of channels before filtering=%d", mac_ctx->scan.occupiedChannels[session_id].numChannels); for (i = 0; i < mac_ctx->scan.occupiedChannels[session_id].numChannels; @@ -16445,7 +16445,7 @@ csr_fetch_ch_lst_from_occupied_lst(tpAniSirGlobal mac_ctx, *ch_lst; } if (*ch_lst) - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "DFSRoam=%d, ChnlState=%d, Chnl=%d, num_ch=%d", mac_ctx->roam.configParam.allowDFSChannelRoam, cds_get_channel_state(*ch_lst), *ch_lst, @@ -16533,7 +16533,7 @@ csr_fetch_valid_ch_lst(tpAniSirGlobal mac_ctx, mac_ctx->roam.validChannelList, &host_channels); if (!QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Failed to get the valid channel list")); return status; } @@ -16592,7 +16592,7 @@ csr_create_roam_scan_offload_request(tpAniSirGlobal mac_ctx, req_buf = cdf_mem_malloc(sizeof(tSirRoamOffloadScanReq)); if (NULL == req_buf) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Mem alloc for roam scan offload req failed.")); return NULL; } @@ -16619,7 +16619,7 @@ csr_create_roam_scan_offload_request(tpAniSirGlobal mac_ctx, mac_ctx->roam.configParam.isRoamOffloadScanEnabled; } cdf_mem_copy(req_buf->ConnectedNetwork.currAPbssid, - roam_info->currAPbssid.bytes, sizeof(struct cdf_mac_addr)); + roam_info->currAPbssid.bytes, sizeof(struct qdf_mac_addr)); req_buf->ConnectedNetwork.ssId.length = mac_ctx->roam.roamSession[session_id]. connectedProfile.SSID.length; @@ -16672,7 +16672,7 @@ csr_create_roam_scan_offload_request(tpAniSirGlobal mac_ctx, eCSR_AUTH_TYPE_OPEN_SYSTEM) || (csr_is_auth_type_ese(req_buf-> ConnectedNetwork.authentication))); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, FL("LFR3:IsEseAssoc=%d\n"), req_buf->IsESEAssoc); #endif if (ese_neighbor_list_recvd || curr_ch_lst_info->numOfChannels == 0) { @@ -16712,7 +16712,7 @@ csr_create_roam_scan_offload_request(tpAniSirGlobal mac_ctx, } else break; } - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, FL("ChnlCacheType:%d, No of Chnls:%d,Channels: %s"), req_buf->ChannelCacheType, req_buf->ConnectedNetwork.ChannelCount, ch_cache_str); @@ -16741,14 +16741,14 @@ csr_create_roam_scan_offload_request(tpAniSirGlobal mac_ctx, */ if (req_buf->HomeAwayTime < (req_buf->NeighborScanChannelMaxTime + (2 * CSR_ROAM_SCAN_CHANNEL_SWITCH_TIME))) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, FL("Invalid config, Home away time(%d) is less than (twice RF switching time + channel max time)(%d). Hence enforcing home away time to disable (0)"), req_buf->HomeAwayTime, (req_buf->NeighborScanChannelMaxTime + (2 * CSR_ROAM_SCAN_CHANNEL_SWITCH_TIME))); req_buf->HomeAwayTime = 0; } - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, FL("HomeAwayTime:%d"), req_buf->HomeAwayTime); /*Prepare a probe request for 2.4GHz band and one for 5GHz band */ @@ -16773,7 +16773,7 @@ csr_create_roam_scan_offload_request(tpAniSirGlobal mac_ctx, mac_ctx->roam.configParam.early_stop_scan_min_threshold; req_buf->early_stop_scan_max_threshold = mac_ctx->roam.configParam.early_stop_scan_max_threshold; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, FL("EarlyStopFeature Enable=%d, MinThresh=%d, MaxThresh=%d"), req_buf->early_stop_scan_enable, req_buf->early_stop_scan_min_threshold, @@ -16812,7 +16812,7 @@ static void check_allowed_ssid_list(tSirRoamOffloadScanReq *req_buffer, cdf_mem_compare(roam_params->ssid_allowed_list[i].ssId, req_buffer->ConnectedNetwork.ssId.ssId, roam_params->ssid_allowed_list[i].length)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "Whitelist contains connected profile SSID"); match = true; break; @@ -16821,11 +16821,11 @@ static void check_allowed_ssid_list(tSirRoamOffloadScanReq *req_buffer, if (!match) { if (roam_params->num_ssid_allowed_list >= MAX_SSID_ALLOWED_LIST) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "Whitelist is FULL. Cannot Add another entry"); return; } - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "Adding Connected profile SSID to whitelist"); /* i is the next available index to add the entry.*/ i = roam_params->num_ssid_allowed_list; @@ -16893,7 +16893,7 @@ bool csr_is_RSO_cmd_allowed(tpAniSirGlobal mac_ctx, uint8_t command, desiredMask = RSO_ABORT_SCAN_ALLOW_MASK; break; default: - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Wrong RSO command %d, not allowed"), command); return 0;/*Cmd Not allowed*/ } @@ -16930,7 +16930,7 @@ csr_roam_offload_scan(tpAniSirGlobal mac_ctx, uint8_t session_id, uint8_t op_channel; if (NULL == session) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("session is null")); return QDF_STATUS_E_FAILURE; } @@ -16952,7 +16952,7 @@ csr_roam_offload_scan(tpAniSirGlobal mac_ctx, uint8_t session_id, } if (!csr_is_RSO_cmd_allowed(mac_ctx, command, session_id) && reason != REASON_ROAM_SET_BLACKLIST_BSSID) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("RSO out-of-sync command %d lastSentCmd %d"), command, roam_info->last_sent_cmd); return QDF_STATUS_E_FAILURE; @@ -16979,7 +16979,7 @@ csr_roam_offload_scan(tpAniSirGlobal mac_ctx, uint8_t session_id, (reason != REASON_ROAM_SET_BLACKLIST_BSSID)) { state = mac_trace_get_neighbour_roam_state( roam_info->neighborRoamState); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, FL("Scan Command not sent to FW state=%s and cmd=%d"), state, command); return QDF_STATUS_E_FAILURE; @@ -16989,7 +16989,7 @@ csr_roam_offload_scan(tpAniSirGlobal mac_ctx, uint8_t session_id, session_id, reason, session, roam_info); if (!req_buf) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Failed to create req packet")); return QDF_STATUS_E_FAILURE; } @@ -17016,7 +17016,7 @@ csr_roam_offload_scan(tpAniSirGlobal mac_ctx, uint8_t session_id, */ if (roam_params_src->rssi_diff) req_buf->RoamRssiDiff = roam_params_src->rssi_diff; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "num_bssid_avoid_list: %d, num_ssid_allowed_list: %d, " "num_bssid_favored: %d, raise_rssi_thresh_5g: %d, " "drop_rssi_thresh_5g: %d, raise_rssi_type_5g: %d, " @@ -17037,18 +17037,18 @@ csr_roam_offload_scan(tpAniSirGlobal mac_ctx, uint8_t session_id, req_buf->RoamRssiDiff, roam_params_dst->alert_rssi_threshold); for (i = 0; i < roam_params_dst->num_bssid_avoid_list; i++) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "Blacklist Bssid: ("MAC_ADDRESS_STR")", MAC_ADDR_ARRAY(roam_params_dst->bssid_avoid_list[i].bytes)); } for (i = 0; i < roam_params_dst->num_ssid_allowed_list; i++) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "Whitelist: %.*s", roam_params_dst->ssid_allowed_list[i].length, roam_params_dst->ssid_allowed_list[i].ssId); } for (i = 0; i < roam_params_dst->num_bssid_favored; i++) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "Preferred Bssid: ("MAC_ADDRESS_STR") score: %d", MAC_ADDR_ARRAY(roam_params_dst->bssid_favored[i].bytes), roam_params_dst->bssid_favored_factor[i]); @@ -17068,14 +17068,14 @@ csr_roam_offload_scan(tpAniSirGlobal mac_ctx, uint8_t session_id, * to connect to a better 5GHz AP is available. */ if (CDS_IS_CHANNEL_5GHZ(op_channel)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "Disabling HI_RSSI feature as connected AP is 5GHz"); req_buf->hi_rssi_scan_rssi_delta = 0; } else { req_buf->hi_rssi_scan_rssi_delta = roam_info->cfgParams.hi_rssi_scan_rssi_delta; } - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "hi_rssi:delta=%d, max_count=%d, delay=%d, ub=%d", req_buf->hi_rssi_scan_rssi_delta, req_buf->hi_rssi_scan_max_count, @@ -17086,8 +17086,8 @@ csr_roam_offload_scan(tpAniSirGlobal mac_ctx, uint8_t session_id, msg.reserved = 0; msg.bodyptr = req_buf; if (!QDF_IS_STATUS_SUCCESS - (cds_mq_post_message(CDF_MODULE_ID_WMA, &msg))) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + (cds_mq_post_message(QDF_MODULE_ID_WMA, &msg))) { + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to post message to WMA", __func__); cdf_mem_free(req_buf); @@ -17101,7 +17101,7 @@ csr_roam_offload_scan(tpAniSirGlobal mac_ctx, uint8_t session_id, /* update the last sent cmd */ roam_info->last_sent_cmd = command; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "Roam Scan Offload Command %d, Reason %d", command, reason); return status; } @@ -17111,7 +17111,7 @@ QDF_STATUS csr_roam_offload_scan_rsp_hdlr(tpAniSirGlobal pMac, { switch (scanOffloadRsp->reason) { case 0: - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "Rsp for Roam Scan Offload with failure status"); break; case REASON_OS_REQUESTED_ROAMING_NOW: @@ -17120,7 +17120,7 @@ QDF_STATUS csr_roam_offload_scan_rsp_hdlr(tpAniSirGlobal pMac, break; default: - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "Rsp for Roam Scan Offload with reason %d", scanOffloadRsp->reason); } @@ -17147,7 +17147,7 @@ tCsrPeStatsReqInfo *csr_roam_check_pe_stats_req_list(tpAniSirGlobal pMac, GET_BASE_ADDR(pStaEntry, tCsrPeStatsReqInfo, link); if (pTempStaEntry->periodicity) { pTempStaEntry->periodicity = - CDF_MIN(periodicity, + QDF_MIN(periodicity, pTempStaEntry->periodicity); } else { pTempStaEntry->periodicity = periodicity; @@ -17200,7 +17200,7 @@ tCsrPeStatsReqInfo *csr_roam_check_pe_stats_req_list(tpAniSirGlobal pMac, qdf_status = cdf_mc_timer_init(&pTempStaEntry-> hPeStatsTimer, - CDF_TIMER_TYPE_SW, + QDF_TIMER_TYPE_SW, csr_roam_pe_stats_timer_handler, pTempStaEntry); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { @@ -17745,7 +17745,7 @@ void csr_roam_ft_pre_auth_rsp_processor(tHalHandle hHal, } /* Save the received response */ cdf_mem_copy((void *)&pSession->ftSmeContext.preAuthbssId, - (void *)pFTPreAuthRsp->preAuthbssId, sizeof(struct cdf_mac_addr)); + (void *)pFTPreAuthRsp->preAuthbssId, sizeof(struct qdf_mac_addr)); if (csr_roam_is11r_assoc(pMac, pFTPreAuthRsp->smeSessionId)) csr_roam_call_callback(pMac, pFTPreAuthRsp->smeSessionId, NULL, 0, eCSR_ROAM_FT_RESPONSE, @@ -17759,7 +17759,7 @@ void csr_roam_ft_pre_auth_rsp_processor(tHalHandle hHal, /* Save the bssid from the received response */ cdf_mem_copy((void *)&roamInfo.bssid, (void *)pFTPreAuthRsp->preAuthbssId, - sizeof(struct cdf_mac_addr)); + sizeof(struct qdf_mac_addr)); csr_roam_call_callback(pMac, pFTPreAuthRsp->smeSessionId, &roamInfo, 0, eCSR_ROAM_CCKM_PREAUTH_NOTIFY, 0); @@ -17772,7 +17772,7 @@ void csr_roam_ft_pre_auth_rsp_processor(tHalHandle hHal, /* Save the bssid from the received response */ cdf_mem_copy((void *)&roamInfo.bssid, (void *)pFTPreAuthRsp->preAuthbssId, - sizeof(struct cdf_mac_addr)); + sizeof(struct qdf_mac_addr)); csr_roam_call_callback(pMac, pFTPreAuthRsp->smeSessionId, &roamInfo, 0, eCSR_ROAM_PMK_NOTIFY, 0); } @@ -17842,11 +17842,11 @@ static void csr_ser_des_unpack_diassoc_rsp(uint8_t *pBuf, tSirSmeDisassocRsp *pR pBuf += 2; cdf_get_u32(pBuf, (uint32_t *) &pRsp->statusCode); pBuf += 4; - cdf_mem_copy(pRsp->peer_macaddr.bytes, pBuf, CDF_MAC_ADDR_SIZE); + cdf_mem_copy(pRsp->peer_macaddr.bytes, pBuf, QDF_MAC_ADDR_SIZE); } } -/* Returns whether a session is in CDF_STA_MODE...or not */ +/* Returns whether a session is in QDF_STA_MODE...or not */ bool csr_roam_is_sta_mode(tpAniSirGlobal pMac, uint32_t sessionId) { tCsrRoamSession *pSession = NULL; @@ -17871,7 +17871,7 @@ bool csr_roam_is_sta_mode(tpAniSirGlobal pMac, uint32_t sessionId) * really in STA Mode.*/ if (NULL != pSession->pCurRoamProfile) { - if (pSession->pCurRoamProfile->csrPersona == CDF_STA_MODE) { + if (pSession->pCurRoamProfile->csrPersona == QDF_STA_MODE) { return true; } else { return false; @@ -17900,7 +17900,7 @@ QDF_STATUS csr_handoff_request(tpAniSirGlobal pMac, pMsg->sessionId = sessionId; pMsg->channel = pHandoffInfo->channel; pMsg->handoff_src = pHandoffInfo->src; - cdf_mem_copy(pMsg->bssid, pHandoffInfo->bssid.bytes, CDF_MAC_ADDR_SIZE); + cdf_mem_copy(pMsg->bssid, pHandoffInfo->bssid.bytes, QDF_MAC_ADDR_SIZE); msg.type = eWNI_SME_HANDOFF_REQ; msg.bodyptr = pMsg; msg.reserved = 0; @@ -17984,7 +17984,7 @@ QDF_STATUS csr_roam_read_tsf(tpAniSirGlobal pMac, uint8_t *pTimestamp, * Return: QDF_STATUS */ QDF_STATUS csr_roam_channel_change_req(tpAniSirGlobal pMac, - struct cdf_mac_addr bssid, + struct qdf_mac_addr bssid, chan_params_t *ch_params, tCsrRoamProfile *profile) { QDF_STATUS status = QDF_STATUS_SUCCESS; @@ -18008,7 +18008,7 @@ QDF_STATUS csr_roam_channel_change_req(tpAniSirGlobal pMac, pMac->roam.configParam.uCfgDot11Mode); pMsg->center_freq_seg_0 = ch_params->center_freq_seg0; pMsg->center_freq_seg_1 = ch_params->center_freq_seg1; - cdf_mem_copy(pMsg->bssid, bssid.bytes, CDF_MAC_ADDR_SIZE); + cdf_mem_copy(pMsg->bssid, bssid.bytes, QDF_MAC_ADDR_SIZE); cdf_mem_copy(&pMsg->operational_rateset, ¶m.operationalRateSet, sizeof(pMsg->operational_rateset)); cdf_mem_copy(&pMsg->extended_rateset, @@ -18024,7 +18024,7 @@ QDF_STATUS csr_roam_channel_change_req(tpAniSirGlobal pMac, * completed without any RADAR indications. */ QDF_STATUS csr_roam_start_beacon_req(tpAniSirGlobal pMac, - struct cdf_mac_addr bssid, + struct qdf_mac_addr bssid, uint8_t dfsCacWaitStatus) { QDF_STATUS status = QDF_STATUS_SUCCESS; @@ -18040,7 +18040,7 @@ QDF_STATUS csr_roam_start_beacon_req(tpAniSirGlobal pMac, pMsg->messageType = eWNI_SME_START_BEACON_REQ; pMsg->messageLen = sizeof(tSirStartBeaconIndication); pMsg->beaconStartStatus = dfsCacWaitStatus; - cdf_mem_copy(pMsg->bssid, bssid.bytes, CDF_MAC_ADDR_SIZE); + cdf_mem_copy(pMsg->bssid, bssid.bytes, QDF_MAC_ADDR_SIZE); status = cds_send_mb_message_to_mac(pMsg); @@ -18217,7 +18217,7 @@ QDF_STATUS csr_send_ext_change_channel(tpAniSirGlobal mac_ctx, uint32_t channel, **/ QDF_STATUS csr_roam_send_chan_sw_ie_request(tpAniSirGlobal mac_ctx, - struct cdf_mac_addr bssid, uint8_t target_channel, + struct qdf_mac_addr bssid, uint8_t target_channel, uint8_t csa_ie_reqd, chan_params_t *ch_params) { QDF_STATUS status = QDF_STATUS_SUCCESS; @@ -18234,7 +18234,7 @@ csr_roam_send_chan_sw_ie_request(tpAniSirGlobal mac_ctx, msg->targetChannel = target_channel; msg->csaIeRequired = csa_ie_reqd; - cdf_mem_copy(msg->bssid, bssid.bytes, CDF_MAC_ADDR_SIZE); + cdf_mem_copy(msg->bssid, bssid.bytes, QDF_MAC_ADDR_SIZE); cdf_mem_copy(&msg->ch_params, ch_params, sizeof(chan_params_t)); status = cds_send_mb_message_to_mac(msg); @@ -18305,13 +18305,13 @@ void csr_process_ho_fail_ind(tpAniSirGlobal pMac, void *pMsgBuf) if (pSmeHOFailInd) sessionId = pSmeHOFailInd->sessionId; else { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "LFR3: Hand-Off Failure Ind is NULL"); return; } /* Roaming is supported only on Infra STA Mode. */ if (!csr_roam_is_sta_mode(pMac, sessionId)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "LFR3:HO Fail cannot be handled for session %d", sessionId); return; @@ -18319,7 +18319,7 @@ void csr_process_ho_fail_ind(tpAniSirGlobal pMac, void *pMsgBuf) csr_roam_synch_clean_up(pMac, sessionId); csr_roaming_report_diag_event(pMac, NULL, eCSR_REASON_ROAM_HO_FAIL); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "LFR3:Issue Disconnect on session %d", sessionId); csr_roam_disconnect(pMac, sessionId, eCSR_DISCONNECT_REASON_UNSPECIFIED); } @@ -18440,7 +18440,7 @@ void csr_init_operating_classes(tHalHandle hHal) * Return: session id for give session type. **/ static uint32_t -csr_find_session_by_type(tpAniSirGlobal mac_ctx, enum tCDF_ADAPTER_MODE type) +csr_find_session_by_type(tpAniSirGlobal mac_ctx, enum tQDF_ADAPTER_MODE type) { uint32_t i, session_id = CSR_SESSION_ID_INVALID; tCsrRoamSession *session_ptr; @@ -18475,19 +18475,19 @@ static bool csr_is_conn_allow_2g_band(tpAniSirGlobal mac_ctx, uint32_t chnl) tCsrRoamSession *sap_session; if (0 == chnl) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("channel is zero, connection not allowed")); return false; } - sap_session_id = csr_find_session_by_type(mac_ctx, CDF_SAP_MODE); + sap_session_id = csr_find_session_by_type(mac_ctx, QDF_SAP_MODE); if (CSR_SESSION_ID_INVALID != sap_session_id) { sap_session = CSR_GET_SESSION(mac_ctx, sap_session_id); if ((0 != sap_session->bssParams.operationChn) && (sap_session->bssParams.operationChn != chnl)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL ("Can't allow STA to connect, chnls not same")); return false; @@ -18515,13 +18515,13 @@ static bool csr_is_conn_allow_5g_band(tpAniSirGlobal mac_ctx, uint32_t chnl) tCsrRoamSession *p2pgo_session; if (0 == chnl) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL ("channel is zero, connection not allowed")); return false; } - p2pgo_session_id = csr_find_session_by_type(mac_ctx, CDF_P2P_GO_MODE); + p2pgo_session_id = csr_find_session_by_type(mac_ctx, QDF_P2P_GO_MODE); if (CSR_SESSION_ID_INVALID != p2pgo_session_id) { p2pgo_session = CSR_GET_SESSION(mac_ctx, p2pgo_session_id); if ((0 != p2pgo_session->bssParams.operationChn) && @@ -18530,7 +18530,7 @@ static bool csr_is_conn_allow_5g_band(tpAniSirGlobal mac_ctx, uint32_t chnl) (p2pgo_session->bssParams.operationChn != chnl)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL ("Can't allow STA to connect, chnls not same")); return false; @@ -18570,7 +18570,7 @@ bool csr_clear_joinreq_param(tpAniSirGlobal mac_ctx, if (NULL != bss_list) { csr_scan_result_purge(mac_ctx, sta_session->stored_roam_profile.bsslist_handle); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("bss list is released for session %d"), session_id); sta_session->stored_roam_profile.bsslist_handle = NULL; } @@ -18659,7 +18659,7 @@ QDF_STATUS csr_issue_stored_joinreq(tpAniSirGlobal mac_ctx, sta_session->stored_roam_profile.imediate_flag, sta_session->stored_roam_profile.clear_flag); if (QDF_STATUS_SUCCESS != status) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL ("CSR failed issuing connect cmd with status = 0x%08X"), status); @@ -18944,7 +18944,7 @@ void csr_roam_synch_callback(tpAniSirGlobal mac_ctx, tCsrRoamInfo *roam_info; tCsrRoamConnectedProfile *conn_profile = NULL; sme_QosAssocInfo assoc_info; - struct cdf_mac_addr bcast_mac = CDF_MAC_ADDR_BROADCAST_INITIALIZER; + struct qdf_mac_addr bcast_mac = QDF_MAC_ADDR_BROADCAST_INITIALIZER; tpAddBssParams add_bss_params; QDF_STATUS status = QDF_STATUS_SUCCESS; @@ -18982,7 +18982,7 @@ void csr_roam_synch_callback(tpAniSirGlobal mac_ctx, session->connectState = eCSR_ASSOC_STATE_TYPE_INFRA_ASSOCIATED; roam_info = cdf_mem_malloc(sizeof(tCsrRoamInfo)); if (NULL == roam_info) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, FL("LFR3: Mem Alloc failed for roam info")); session->roam_synch_in_progress = false; sme_release_global_lock(&mac_ctx->sme); @@ -18996,7 +18996,7 @@ void csr_roam_synch_callback(tpAniSirGlobal mac_ctx, roam_info, 0, eCSR_ROAM_TDLS_STATUS_UPDATE, eCSR_ROAM_RESULT_DELETE_ALL_TDLS_PEER_IND); cdf_mem_copy(&roam_info->bssid.bytes, &bss_desc->bssId, - sizeof(struct cdf_mac_addr)); + sizeof(struct qdf_mac_addr)); csr_roam_save_connected_infomation(mac_ctx, session_id, session->pCurRoamProfile, bss_desc, @@ -19030,7 +19030,7 @@ void csr_roam_synch_callback(tpAniSirGlobal mac_ctx, } if ((roam_synch_data->authStatus == CSR_ROAM_AUTH_STATUS_AUTHENTICATED)) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, FL("LFR3:Don't start waitforkey timer")); csr_roam_substate_change(mac_ctx, @@ -19081,7 +19081,7 @@ void csr_roam_synch_callback(tpAniSirGlobal mac_ctx, SIR_MAC_HDR_LEN_3A, roam_info->nAssocRspLength); - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, FL("LFR3:Clear Connected info")); csr_roam_free_connected_info(mac_ctx, @@ -19153,7 +19153,7 @@ void csr_roam_synch_callback(tpAniSirGlobal mac_ctx, cdf_mem_copy(roam_info->kek, roam_synch_data->kek, SIR_KEK_KEY_LEN); cdf_mem_copy(roam_info->replay_ctr, roam_synch_data->replay_ctr, SIR_REPLAY_CTR_LEN); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, FL("LFR3: Copy KCK, KEK and Replay Ctr")); roam_info->subnet_change_status = CSR_GET_SUBNET_STATUS(roam_synch_data->roamReason); @@ -19164,7 +19164,7 @@ void csr_roam_synch_callback(tpAniSirGlobal mac_ctx, csr_reset_bkid_candidate_list(mac_ctx, session_id); #endif if (!CSR_IS_WAIT_FOR_KEY(mac_ctx, session_id)) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, FL ("NO CSR_IS_WAIT_FOR_KEY -> csr_roam_link_up")); diff --git a/core/sme/src/csr/csr_api_scan.c b/core/sme/src/csr/csr_api_scan.c index 2c6a370345..88a27787a2 100644 --- a/core/sme/src/csr/csr_api_scan.c +++ b/core/sme/src/csr/csr_api_scan.c @@ -172,7 +172,7 @@ QDF_STATUS csr_scan_open(tpAniSirGlobal mac_ctx) mac_ctx->scan.nBssLimit = CSR_MAX_BSS_SUPPORT; #ifdef WLAN_AP_STA_CONCURRENCY status = cdf_mc_timer_init(&mac_ctx->scan.hTimerStaApConcTimer, - CDF_TIMER_TYPE_SW, + QDF_TIMER_TYPE_SW, csr_sta_ap_conc_timer_handler, mac_ctx); if (!QDF_IS_STATUS_SUCCESS(status)) { @@ -182,7 +182,7 @@ QDF_STATUS csr_scan_open(tpAniSirGlobal mac_ctx) } #endif status = cdf_mc_timer_init(&mac_ctx->scan.hTimerResultCfgAging, - CDF_TIMER_TYPE_SW, + QDF_TIMER_TYPE_SW, csr_scan_result_cfg_aging_timer_handler, mac_ctx); if (!QDF_IS_STATUS_SUCCESS(status)) @@ -425,7 +425,7 @@ csr_issue_11d_scan(tpAniSirGlobal mac_ctx, tSmeCmd *scan_cmd, tmp_rq.scan_id = scan_11d_cmd->u.scanCmd.scanID; status = cdf_mc_timer_init(&scan_cmd->u.scanCmd.csr_scan_timer, - CDF_TIMER_TYPE_SW, + QDF_TIMER_TYPE_SW, csr_scan_active_list_timeout_handle, &scan_11d_cmd); if (csr_is11d_supported(mac_ctx)) { @@ -611,7 +611,7 @@ QDF_STATUS csr_scan_request(tpAniSirGlobal pMac, uint16_t sessionId, pMac->scan.scanProfile.numOfChannels = pTempScanReq->ChannelInfo.numOfChannels; status = cdf_mc_timer_init(&scan_cmd->u.scanCmd.csr_scan_timer, - CDF_TIMER_TYPE_SW, + QDF_TIMER_TYPE_SW, csr_scan_active_list_timeout_handle, scan_cmd); sms_log(pMac, LOG1, FL("SId=%d scanId=%d Scan reason=%u numSSIDs=%d numChan=%d P2P search=%d minCT=%d maxCT=%d uIEFieldLen=%d"), @@ -808,7 +808,7 @@ csr_update_lost_link1_cmd(tpAniSirGlobal mac_ctx, tSmeCmd *cmd, cmd->u.scanCmd.u.scanRequest.scanType = eSIR_ACTIVE_SCAN; wma_get_scan_id(&cmd->u.scanCmd.scanID); status = cdf_mc_timer_init(&cmd->u.scanCmd.csr_scan_timer, - CDF_TIMER_TYPE_SW, + QDF_TIMER_TYPE_SW, csr_scan_active_list_timeout_handle, &cmd); cmd->u.scanCmd.u.scanRequest.scan_id = cmd->u.scanCmd.scanID; @@ -935,7 +935,7 @@ csr_scan_request_lost_link1(tpAniSirGlobal mac_ctx, uint32_t session_id) goto release_lost_link1_cmd; cdf_mem_set(&cmd->u.scanCmd.u.scanRequest.bssid, - sizeof(struct cdf_mac_addr), 0xFF); + sizeof(struct qdf_mac_addr), 0xFF); status = csr_queue_sme_command(mac_ctx, cmd, false); if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac_ctx, LOGE, @@ -979,7 +979,7 @@ csr_update_lost_link2_cmd(tpAniSirGlobal mac_ctx, tSmeCmd *cmd, if (!session->pCurRoamProfile) return QDF_STATUS_SUCCESS; status = cdf_mc_timer_init(&cmd->u.scanCmd.csr_scan_timer, - CDF_TIMER_TYPE_SW, + QDF_TIMER_TYPE_SW, csr_scan_active_list_timeout_handle, &cmd); scan_fltr = cdf_mem_malloc(sizeof(tCsrScanResultFilter)); if (NULL == scan_fltr) @@ -1062,7 +1062,7 @@ csr_scan_request_lost_link2(tpAniSirGlobal mac_ctx, uint32_t session_id) goto release_lost_link2_cmd; cdf_mem_set(&cmd->u.scanCmd.u.scanRequest.bssid, - sizeof(struct cdf_mac_addr), 0xFF); + sizeof(struct qdf_mac_addr), 0xFF); /* Put to the head in pending queue */ status = csr_queue_sme_command(mac_ctx, cmd, true); if (!QDF_IS_STATUS_SUCCESS(status)) { @@ -1114,7 +1114,7 @@ csr_scan_request_lost_link3(tpAniSirGlobal mac_ctx, uint32_t session_id) cmd->u.scanCmd.u.scanRequest.scanType = eSIR_ACTIVE_SCAN; wma_get_scan_id(&cmd->u.scanCmd.scanID); status = cdf_mc_timer_init(&cmd->u.scanCmd.csr_scan_timer, - CDF_TIMER_TYPE_SW, + QDF_TIMER_TYPE_SW, csr_scan_active_list_timeout_handle, &cmd); cmd->u.scanCmd.u.scanRequest.scan_id = cmd->u.scanCmd.scanID; @@ -1375,21 +1375,21 @@ static bool is_channel_found_in_pcl(tpAniSirGlobal mac_ctx, int channel_id, * Return: The modified RSSI Value */ static int csr_get_altered_rssi(tpAniSirGlobal mac_ctx, int rssi, - uint8_t channel_id, struct cdf_mac_addr *bssid) + uint8_t channel_id, struct qdf_mac_addr *bssid) { int modified_rssi; int boost_factor; int penalty_factor; int i; struct roam_ext_params *roam_params; - struct cdf_mac_addr fav_bssid; - struct cdf_mac_addr local_bssid; + struct qdf_mac_addr fav_bssid; + struct qdf_mac_addr local_bssid; modified_rssi = rssi; - cdf_mem_zero(&local_bssid.bytes, CDF_MAC_ADDR_SIZE); + cdf_mem_zero(&local_bssid.bytes, QDF_MAC_ADDR_SIZE); if (bssid) cdf_mem_copy(local_bssid.bytes, bssid->bytes, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); roam_params = &mac_ctx->roam.configParam.roam_params; /* * If the 5G pref feature is enabled, apply the roaming @@ -1421,12 +1421,12 @@ static int csr_get_altered_rssi(tpAniSirGlobal mac_ctx, int rssi, * Check if there are preferred bssid and then apply the * preferred score */ - cdf_mem_zero(&fav_bssid.bytes, CDF_MAC_ADDR_SIZE); + cdf_mem_zero(&fav_bssid.bytes, QDF_MAC_ADDR_SIZE); if (bssid && roam_params->num_bssid_favored) { for (i = 0; i < roam_params->num_bssid_favored; i++) { cdf_mem_copy(fav_bssid.bytes, &roam_params->bssid_favored[i], - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); if (!cdf_is_macaddr_equal(&fav_bssid, bssid)) continue; modified_rssi += roam_params->bssid_favored_factor[i]; @@ -1453,7 +1453,7 @@ static int csr_get_altered_rssi(tpAniSirGlobal mac_ctx, int rssi, * Return: Preference value for the BSSID */ static uint32_t csr_get_bss_prefer_value(tpAniSirGlobal mac_ctx, int rssi, - struct cdf_mac_addr *bssid, int channel_id) + struct qdf_mac_addr *bssid, int channel_id) { uint32_t ret = 0; int modified_rssi; @@ -1518,7 +1518,7 @@ static bool csr_is_better_rssi(tpAniSirGlobal mac_ctx, { bool ret; int rssi1, rssi2; - struct cdf_mac_addr local_mac; + struct qdf_mac_addr local_mac; rssi1 = bss1->Result.BssDescriptor.rssi; rssi2 = bss2->Result.BssDescriptor.rssi; @@ -1526,14 +1526,14 @@ static bool csr_is_better_rssi(tpAniSirGlobal mac_ctx, * Apply the boost and penlty logic and check * which is the best RSSI */ - cdf_mem_zero(&local_mac.bytes, CDF_MAC_ADDR_SIZE); + cdf_mem_zero(&local_mac.bytes, QDF_MAC_ADDR_SIZE); cdf_mem_copy(&local_mac.bytes, - &bss1->Result.BssDescriptor.bssId, CDF_MAC_ADDR_SIZE); + &bss1->Result.BssDescriptor.bssId, QDF_MAC_ADDR_SIZE); rssi1 = csr_get_altered_rssi(mac_ctx, rssi1, bss1->Result.BssDescriptor.channelId, &local_mac); cdf_mem_copy(&local_mac.bytes, - &bss2->Result.BssDescriptor.bssId, CDF_MAC_ADDR_SIZE); + &bss2->Result.BssDescriptor.bssId, QDF_MAC_ADDR_SIZE); rssi2 = csr_get_altered_rssi(mac_ctx, rssi2, bss2->Result.BssDescriptor.channelId, &local_mac); @@ -1624,11 +1624,11 @@ static void csr_scan_add_result(tpAniSirGlobal pMac, tCsrScanResult *pResult, tpCsrNeighborRoamControlInfo pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[sessionId]; - struct cdf_mac_addr bssid; + struct qdf_mac_addr bssid; uint8_t channel_id = pResult->Result.BssDescriptor.channelId; - cdf_mem_zero(&bssid.bytes, CDF_MAC_ADDR_SIZE); + cdf_mem_zero(&bssid.bytes, QDF_MAC_ADDR_SIZE); cdf_mem_copy(bssid.bytes, &pResult->Result.BssDescriptor.bssId, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); pResult->preferValue = csr_get_bss_prefer_value(pMac, (int)pResult->Result.BssDescriptor.rssi, &bssid, channel_id); @@ -1739,7 +1739,7 @@ csr_prefer_5ghz(tpAniSirGlobal pMac, tCsrScanResultFilter *pFilter) pMac->scan.inScanResultBestAPRssi = -128; roam_params = &pMac->roam.configParam.roam_params; #ifdef WLAN_DEBUG_ROAM_OFFLOAD - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, FL("nSelect5GHzMargin")); #endif csr_ll_lock(&pMac->scan.scanResultList); @@ -1772,7 +1772,7 @@ csr_prefer_5ghz(tpAniSirGlobal pMac, tCsrScanResultFilter *pFilter) */ pBssDesc->preferValue = csr_get_bss_prefer_value(pMac, (int)pBssDesc->Result.BssDescriptor.rssi, - (struct cdf_mac_addr *) + (struct qdf_mac_addr *) &pBssDesc->Result.BssDescriptor.bssId, pBssDesc->Result.BssDescriptor.channelId); @@ -1809,7 +1809,7 @@ csr_save_ies(tpAniSirGlobal pMac, *fMatch = csr_match_bss(pMac, &pBssDesc->Result.BssDescriptor, pFilter, auth, uc, mc, &pIes); #ifdef WLAN_DEBUG_ROAM_OFFLOAD - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, FL("csr_match_bss fmatch %d"), *fMatch); #endif if (NULL == pIes) @@ -2169,7 +2169,7 @@ void csr_scan_flush_bss_entry(tpAniSirGlobal pMac, while (pEntry != NULL) { pBssDesc = GET_BASE_ADDR(pEntry, tCsrScanResult, Link); if (cdf_mem_compare(pBssDesc->Result.BssDescriptor.bssId, - pCsaOffloadInd->bssid.bytes, CDF_MAC_ADDR_SIZE)) { + pCsaOffloadInd->bssid.bytes, QDF_MAC_ADDR_SIZE)) { pFreeElem = pEntry; pEntry = csr_ll_next(pList, pEntry, LL_ACCESS_NOLOCK); csr_ll_remove_entry(pList, pFreeElem, LL_ACCESS_NOLOCK); @@ -2434,7 +2434,7 @@ QDF_STATUS csr_scanning_state_msg_processor(tpAniSirGlobal pMac, pRoamInfo = &roamInfo; pUpperLayerAssocCnf = (tSirSmeAssocIndToUpperLayerCnf *) pMsgBuf; status = csr_roam_get_session_id_from_bssid(pMac, - (struct cdf_mac_addr *)pUpperLayerAssocCnf->bssId, &sessionId); + (struct qdf_mac_addr *)pUpperLayerAssocCnf->bssId, &sessionId); pSession = CSR_GET_SESSION(pMac, sessionId); if (!pSession) { @@ -2452,9 +2452,9 @@ QDF_STATUS csr_scanning_state_msg_processor(tpAniSirGlobal pMac, pRoamInfo->paddIE = pUpperLayerAssocCnf->addIE.addIEdata; cdf_mem_copy(pRoamInfo->peerMac.bytes, pUpperLayerAssocCnf->peerMacAddr, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); cdf_mem_copy(&pRoamInfo->bssid.bytes, pUpperLayerAssocCnf->bssId, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); pRoamInfo->wmmEnabledSta = pUpperLayerAssocCnf->wmmEnabledSta; if (CSR_IS_INFRA_AP(pRoamInfo->u.pConnectedProfile)) { pMac->roam.roamSession[sessionId].connectState = @@ -2508,7 +2508,7 @@ void csr_check_n_save_wsc_ie(tpAniSirGlobal pMac, tSirBssDescription *pNewBssDes bool csr_remove_dup_bss_description(tpAniSirGlobal pMac, tSirBssDescription *bss_dscp, tDot11fBeaconIEs *pIes, tAniSSID *pSsid, - v_TIME_t *timer, bool fForced) + unsigned long *timer, bool fForced) { tListElem *pEntry; tCsrScanResult *scan_entry; @@ -2627,7 +2627,7 @@ QDF_STATUS csr_add_pmkid_candidate_list(tpAniSirGlobal pMac, uint32_t sessionId, secEvent.encryptionModeUnicast = (uint8_t)diag_enc_type_from_csr_type( pSession->connectedProfile.EncryptionType); cdf_mem_copy(secEvent.bssid, pSession->connectedProfile.bssid.bytes, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); secEvent.authMode = (uint8_t)diag_auth_type_from_csr_type( pSession->connectedProfile.AuthType); WLAN_HOST_DIAG_EVENT_REPORT(&secEvent, EVENT_WLAN_SECURITY); @@ -2636,7 +2636,7 @@ QDF_STATUS csr_add_pmkid_candidate_list(tpAniSirGlobal pMac, uint32_t sessionId, pmkid_info = &pSession->PmkidCandidateInfo[pSession->NumPmkidCandidate]; /* if yes, then add to PMKIDCandidateList */ cdf_mem_copy(pmkid_info->BSSID.bytes, pBssDesc->bssId, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); /* Bit 0 offirst byte - PreAuthentication Capability */ if ((pIes->RSN.RSN_Cap[0] >> 0) & 0x1) pmkid_info->preAuthSupported = true; @@ -2721,7 +2721,7 @@ QDF_STATUS csr_add_bkid_candidate_list(tpAniSirGlobal pMac, uint32_t sessionId, BkidCandidateInfo[pSession-> NumBkidCandidate]. BSSID.bytes, pBssDesc->bssId, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); if (pIes->WAPI.preauth) { pSession->BkidCandidateInfo[pSession-> NumBkidCandidate]. @@ -2796,7 +2796,7 @@ csr_remove_from_tmp_list(tpAniSirGlobal mac_ctx, tDot11fBeaconIEs *local_ie = NULL; bool dup_bss; tAniSSID tmpSsid; - v_TIME_t timer = 0; + unsigned long timer = 0; tmpSsid.length = 0; while ((entry = csr_ll_remove_tail(&mac_ctx->scan.tempScanResults, @@ -2858,7 +2858,7 @@ csr_remove_from_tmp_list(tpAniSirGlobal mac_ctx, * hidden ssid from the profile i.e., forget the SSID * via GUI that SSID shouldn't see in the profile */ - v_TIME_t time_gap = cdf_mc_timer_get_system_time() - + unsigned long time_gap = cdf_mc_timer_get_system_time() - timer; if ((0 == bss_dscp->Result.ssId.length) && (time_gap <= HIDDEN_TIMER) @@ -2968,7 +2968,7 @@ tCsrScanResult *csr_scan_append_bss_description(tpAniSirGlobal pMac, { tCsrScanResult *pCsrBssDescription = NULL; tAniSSID tmpSsid; - v_TIME_t timer = 0; + unsigned long timer = 0; int result; tmpSsid.length = 0; @@ -3074,7 +3074,7 @@ QDF_STATUS csr_save_to_channel_power2_g_5_g(tpAniSirGlobal pMac, cdf_mem_free(pChannelSet); return QDF_STATUS_E_FAILURE; } - pChannelSet->txPower = CDF_MIN(pChannelInfo->maxTxPower, + pChannelSet->txPower = QDF_MIN(pChannelInfo->maxTxPower, pMac->roam.configParam.nTxPowerCap); if (f2GHzInfoFound) { if (!f2GListPurged) { @@ -3203,7 +3203,7 @@ static void csr_diag_reset_country_information(tpAniSirGlobal pMac) for (Index = 0; Index < pMac->scan.base_channels.numChannels; Index++) { - p11dLog->TxPwr[Index] = CDF_MIN( + p11dLog->TxPwr[Index] = QDF_MIN( pMac->scan.defaultPowerTable[Index].power, pMac->roam.configParam.nTxPowerCap); } @@ -3322,7 +3322,7 @@ bool csr_elected_country_info(tpAniSirGlobal pMac) * pick random.we can put some more intelligence - TBD */ if (maxVotes < pMac->scan.votes11d[i].votes) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, " Votes for Country %c%c : %d\n", pMac->scan.votes11d[i].countryCode[0], pMac->scan.votes11d[i].countryCode[1], @@ -3341,7 +3341,7 @@ bool csr_elected_country_info(tpAniSirGlobal pMac) cdf_mem_copy(pMac->scan.countryCode11d, pMac->scan.votes11d[j].countryCode, WNI_CFG_COUNTRY_CODE_LEN); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "Selected Country is %c%c With count %d\n", pMac->scan.votes11d[j].countryCode[0], pMac->scan.votes11d[j].countryCode[1], @@ -3537,7 +3537,7 @@ void csr_save_channel_power_for_band(tpAniSirGlobal pMac, bool fill_5f) pMac->scan.defaultPowerTable[idx].chan_num; chan_info->numChannels = 1; chan_info->maxTxPower = - CDF_MIN(pMac->scan.defaultPowerTable[idx].power, + QDF_MIN(pMac->scan.defaultPowerTable[idx].power, pMac->roam.configParam.nTxPowerCap); chan_info++; count++; @@ -4308,8 +4308,8 @@ bool csr_is_duplicate_bss_description(tpAniSirGlobal pMac, goto free_ies; if (pCap1->ess && - cdf_is_macaddr_equal((struct cdf_mac_addr *) pSirBssDesc1->bssId, - (struct cdf_mac_addr *) pSirBssDesc2->bssId) + cdf_is_macaddr_equal((struct qdf_mac_addr *) pSirBssDesc1->bssId, + (struct qdf_mac_addr *) pSirBssDesc2->bssId) && (fForced || (cds_chan_to_band(pSirBssDesc1->channelId) == cds_chan_to_band((pSirBssDesc2->channelId))))) { @@ -4359,8 +4359,8 @@ bool csr_is_duplicate_bss_description(tpAniSirGlobal pMac, /* In case of P2P devices, ess and ibss will be set to zero */ else if (!pCap1->ess && cdf_is_macaddr_equal( - (struct cdf_mac_addr *) pSirBssDesc1->bssId, - (struct cdf_mac_addr *) pSirBssDesc2->bssId)) { + (struct qdf_mac_addr *) pSirBssDesc1->bssId, + (struct qdf_mac_addr *) pSirBssDesc2->bssId)) { fMatch = true; } @@ -4568,9 +4568,9 @@ QDF_STATUS csr_scan_process_single_bssdescr(tpAniSirGlobal mac_ctx, bool csr_scan_is_wild_card_scan(tpAniSirGlobal pMac, tSmeCmd *pCommand) { - uint8_t bssid[CDF_MAC_ADDR_SIZE] = {0}; + uint8_t bssid[QDF_MAC_ADDR_SIZE] = {0}; bool f = cdf_mem_compare(pCommand->u.scanCmd.u.scanRequest.bssid.bytes, - bssid, sizeof(struct cdf_mac_addr)); + bssid, sizeof(struct qdf_mac_addr)); /* * It is not a wild card scan if the bssid is not broadcast and * the number of SSID is 1. @@ -4702,7 +4702,7 @@ tCsrScanResultInfo *csr_scan_result_get_next(tpAniSirGlobal pMac, * head of the result */ QDF_STATUS csr_move_bss_to_head_from_bssid(tpAniSirGlobal pMac, - struct cdf_mac_addr *bssid, + struct qdf_mac_addr *bssid, tScanResultHandle hScanResult) { QDF_STATUS status = QDF_STATUS_E_FAILURE; @@ -4718,7 +4718,7 @@ QDF_STATUS csr_move_bss_to_head_from_bssid(tpAniSirGlobal pMac, while (pEntry) { pResult = GET_BASE_ADDR(pEntry, tCsrScanResult, Link); if (cdf_mem_compare(bssid, pResult->Result.BssDescriptor.bssId, - sizeof(struct cdf_mac_addr))) { + sizeof(struct qdf_mac_addr))) { status = QDF_STATUS_SUCCESS; csr_ll_remove_entry(&pResultList->List, pEntry, LL_ACCESS_NOLOCK); @@ -4783,8 +4783,8 @@ bool csr_scan_age_out_bss(tpAniSirGlobal pMac, tCsrScanResult *pResult) if (csr_ll_remove_entry(&pMac->scan.scanResultList, &pResult->Link, LL_ACCESS_NOLOCK)) { if (cdf_is_macaddr_equal( - (struct cdf_mac_addr *) &pResult->Result.BssDescriptor.bssId, - (struct cdf_mac_addr *) &pMac->scan.currentCountryBssid)) { + (struct qdf_mac_addr *) &pResult->Result.BssDescriptor.bssId, + (struct qdf_mac_addr *) &pMac->scan.currentCountryBssid)) { sms_log(pMac, LOGW, FL("Aging out 11d BSS " MAC_ADDRESS_STR), MAC_ADDR_ARRAY( @@ -4853,7 +4853,7 @@ QDF_STATUS csr_send_mb_scan_req(tpAniSirGlobal pMac, uint16_t sessionId, uint32_t minChnTime; /* in units of milliseconds */ uint32_t maxChnTime; /* in units of milliseconds */ uint32_t i; - struct cdf_mac_addr selfmac; + struct qdf_mac_addr selfmac; msgLen = (uint16_t) (sizeof(tSirSmeScanReq) - sizeof(pMsg->channelList.channelNumber) + @@ -4919,11 +4919,11 @@ QDF_STATUS csr_send_mb_scan_req(tpAniSirGlobal pMac, uint16_t sessionId, } } if (CSR_ROAM_SESSION_MAX == i) { - uint32_t len = CDF_MAC_ADDR_SIZE; + uint32_t len = QDF_MAC_ADDR_SIZE; status = wlan_cfg_get_str(pMac, WNI_CFG_STA_ID, selfmac.bytes, &len); if (!QDF_IS_STATUS_SUCCESS(status) - || (len < CDF_MAC_ADDR_SIZE)) { + || (len < QDF_MAC_ADDR_SIZE)) { sms_log(pMac, LOGE, FL("Can't get self MAC address = %d"), status); @@ -5810,7 +5810,7 @@ static void csr_scan_result_cfg_aging_timer_handler(void *pv) tListElem *entry, *tmp_entry; tCsrScanResult *result; uint32_t ageout_time = - mac_ctx->scan.scanResultCfgAgingTime * CDF_TICKS_PER_SECOND/10; + mac_ctx->scan.scanResultCfgAgingTime * QDF_TICKS_PER_SECOND/10; uint32_t cur_time = (uint32_t) cdf_mc_timer_get_system_ticks(); uint8_t *bssId; @@ -6163,7 +6163,7 @@ QDF_STATUS csr_scan_for_ssid(tpAniSirGlobal mac_ctx, uint32_t session_id, cdf_mem_set(&scan_cmd->u.scanCmd.u.scanRequest, sizeof(tCsrScanRequest), 0); status = cdf_mc_timer_init(&scan_cmd->u.scanCmd.csr_scan_timer, - CDF_TIMER_TYPE_SW, + QDF_TIMER_TYPE_SW, csr_scan_active_list_timeout_handle, &scan_cmd); scan_req = &scan_cmd->u.scanCmd.u.scanRequest; scan_req->scanType = eSIR_ACTIVE_SCAN; @@ -6173,7 +6173,7 @@ QDF_STATUS csr_scan_for_ssid(tpAniSirGlobal mac_ctx, uint32_t session_id, * To avoid 11b rate in probe request Set p2pSearch * flag as 1 for P2P Client Mode */ - if (CDF_P2P_CLIENT_MODE == profile->csrPersona) + if (QDF_P2P_CLIENT_MODE == profile->csrPersona) scan_req->p2pSearch = 1; /* Allocate memory for IE field */ @@ -6300,15 +6300,15 @@ void csr_set_cfg_valid_channel_list(tpAniSirGlobal pMac, uint8_t *pChannelList, uint32_t dataLen = sizeof(uint8_t) * NumChannels; QDF_STATUS status; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: dump valid channel list(NumChannels(%d))", __func__, NumChannels); - CDF_TRACE_HEX_DUMP(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE_HEX_DUMP(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, pChannelList, NumChannels); cfg_set_str(pMac, WNI_CFG_VALID_CHANNEL_LIST, pChannelList, dataLen); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "Scan offload is enabled, update default chan list"); /* * disable fcc constraint since new country code @@ -6317,7 +6317,7 @@ void csr_set_cfg_valid_channel_list(tpAniSirGlobal pMac, uint8_t *pChannelList, pMac->scan.fcc_constraint = false; status = csr_update_channel_list(pMac); if (QDF_STATUS_SUCCESS != status) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "failed to update the supported channel list"); } return; @@ -6382,7 +6382,7 @@ void csr_save_tx_power_to_cfg(tpAniSirGlobal pMac, tDblLinkList *pList, ch_pwr_set->firstChanNum); ch_pwr_set->numChannels = 1; ch_pwr_set->maxTxPower = - CDF_MIN(ch_set->txPower, + QDF_MIN(ch_set->txPower, pMac->roam.configParam.nTxPowerCap); sms_log(pMac, LOG3, FL("Setting Max Transmit Power %d"), @@ -6404,7 +6404,7 @@ void csr_save_tx_power_to_cfg(tpAniSirGlobal pMac, tDblLinkList *pList, sms_log(pMac, LOG3, FL("Setting Channel Number %d"), ch_pwr_set->firstChanNum); ch_pwr_set->numChannels = ch_set->numChannels; - ch_pwr_set->maxTxPower = CDF_MIN(ch_set->txPower, + ch_pwr_set->maxTxPower = QDF_MIN(ch_set->txPower, pMac->roam.configParam.nTxPowerCap); sms_log(pMac, LOG3, FL("Setting Max Tx Power %d, nTxPower %d"), @@ -6507,9 +6507,9 @@ void csr_set_cfg_scan_control_list(tpAniSirGlobal pMac, uint8_t *countryCode, } } - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: dump scan control list", __func__); - CDF_TRACE_HEX_DUMP(CDF_MODULE_ID_SME, + CDF_TRACE_HEX_DUMP(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, pControlList, len); @@ -6827,7 +6827,7 @@ QDF_STATUS csr_scan_save_preferred_network_found(tpAniSirGlobal pMac, bool fDupBss; tDot11fBeaconIEs *local_ie = NULL; tAniSSID tmpSsid; - v_TIME_t timer = 0; + unsigned long timer = 0; QDF_STATUS status; tpSirMacMgmtHdr macHeader = @@ -7014,7 +7014,7 @@ void csr_init_occupied_channels_list(tpAniSirGlobal pMac, uint8_t sessionId) QDF_STATUS csr_scan_create_entry_in_scan_cache(tpAniSirGlobal pMac, uint32_t sessionId, - struct cdf_mac_addr bssid, + struct qdf_mac_addr bssid, uint8_t channel) { QDF_STATUS status = QDF_STATUS_SUCCESS; @@ -7110,7 +7110,7 @@ QDF_STATUS csr_scan_save_roam_offload_ap_to_scan_cache(tpAniSirGlobal pMac, bool dup_bss; tDot11fBeaconIEs *ies_local_ptr = NULL; tAniSSID tmpSsid; - v_TIME_t timer = 0; + unsigned long timer = 0; tCsrScanResult *scan_res_ptr = NULL; uint8_t session_id = roam_sync_ind_ptr->roamedVdevId; @@ -7118,7 +7118,7 @@ QDF_STATUS csr_scan_save_roam_offload_ap_to_scan_cache(tpAniSirGlobal pMac, (SIR_MAC_HDR_LEN_3A + SIR_MAC_B_PR_SSID_OFFSET); scan_res_ptr = cdf_mem_malloc(sizeof(tCsrScanResult) + length); if (scan_res_ptr == NULL) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, " fail to allocate memory for frame"); return QDF_STATUS_E_NOMEM; } @@ -7133,7 +7133,7 @@ QDF_STATUS csr_scan_save_roam_offload_ap_to_scan_cache(tpAniSirGlobal pMac, pMac, &scan_res_ptr->Result. BssDescriptor, &ies_local_ptr)))) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s:Cannot Parse IEs", __func__); csr_free_scan_result_entry(pMac, scan_res_ptr); return QDF_STATUS_E_RESOURCES; @@ -7143,7 +7143,7 @@ QDF_STATUS csr_scan_save_roam_offload_ap_to_scan_cache(tpAniSirGlobal pMac, &scan_res_ptr->Result.BssDescriptor, ies_local_ptr, &tmpSsid, &timer, true); if (CSR_SCAN_IS_OVER_BSS_LIMIT(pMac)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s:BSS Limit Exceed", __func__); if ((scan_res_ptr->Result.pvIes == NULL) && ies_local_ptr) cdf_mem_free(ies_local_ptr); @@ -7174,12 +7174,12 @@ csr_get_bssdescr_from_scan_handle(tScanResultHandle result_handle, tScanResultList *bss_list = (tScanResultList *)result_handle; if (NULL == bss_list) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Empty bss_list")); return NULL; } if (csr_ll_is_list_empty(&bss_list->List, LL_ACCESS_NOLOCK)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("bss_list->List is empty")); cdf_mem_free(bss_list); return NULL; @@ -7207,7 +7207,7 @@ csr_get_bssdescr_from_scan_handle(tScanResultHandle result_handle, void csr_scan_active_list_timeout_handle(void *userData) { tSmeCmd *scan_cmd = (tSmeCmd *) userData; - tHalHandle *hal_ctx = cds_get_context(CDF_MODULE_ID_PE); + tHalHandle *hal_ctx = cds_get_context(QDF_MODULE_ID_PE); tpAniSirGlobal mac_ctx; uint16_t scan_id; tSirSmeScanAbortReq *msg; @@ -7215,12 +7215,12 @@ void csr_scan_active_list_timeout_handle(void *userData) QDF_STATUS status = QDF_STATUS_SUCCESS; if (scan_cmd == NULL) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Scan Timeout: Scan command is NULL")); return; } if (hal_ctx == NULL) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("HAL Context is NULL")); return; } diff --git a/core/sme/src/csr/csr_inside_api.h b/core/sme/src/csr/csr_inside_api.h index e21cde84b5..b3ba204237 100644 --- a/core/sme/src/csr/csr_inside_api.h +++ b/core/sme/src/csr/csr_inside_api.h @@ -402,7 +402,7 @@ int8_t csr_get_cfg_max_tx_power(tpAniSirGlobal pMac, uint8_t channel); void csr_free_roam_profile(tpAniSirGlobal pMac, uint32_t sessionId); void csr_free_connect_bss_desc(tpAniSirGlobal pMac, uint32_t sessionId); QDF_STATUS csr_move_bss_to_head_from_bssid(tpAniSirGlobal pMac, - struct cdf_mac_addr *bssid, + struct qdf_mac_addr *bssid, tScanResultHandle hScanResult); bool csr_check_ps_ready(void *pv); bool csr_check_ps_offload_ready(void *pv, uint32_t sessionId); @@ -464,7 +464,7 @@ QDF_STATUS csr_roam_close_session(tpAniSirGlobal pMac, uint32_t sessionId, csr_roamSessionCloseCallback callback, void *pContext); void csr_cleanup_session(tpAniSirGlobal pMac, uint32_t sessionId); -QDF_STATUS csr_roam_get_session_id_from_bssid(tpAniSirGlobal pMac, struct cdf_mac_addr *bssid, +QDF_STATUS csr_roam_get_session_id_from_bssid(tpAniSirGlobal pMac, struct qdf_mac_addr *bssid, uint32_t *pSessionId); eCsrCfgDot11Mode csr_find_best_phy_mode(tpAniSirGlobal pMac, uint32_t phyMode); @@ -955,14 +955,14 @@ QDF_STATUS csr_roam_issue_tkip_counter_measures(tpAniSirGlobal pMac, \return QDF_STATUS ---------------------------------------------------------------------------*/ QDF_STATUS csr_roam_get_associated_stas(tpAniSirGlobal pMac, uint32_t sessionId, - CDF_MODULE_ID modId, void *pUsrContext, + QDF_MODULE_ID modId, void *pUsrContext, void *pfnSapEventCallback, uint8_t *pAssocStasBuf); QDF_STATUS csr_send_mb_get_associated_stas_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, - CDF_MODULE_ID modId, - struct cdf_mac_addr bssId, + QDF_MODULE_ID modId, + struct qdf_mac_addr bssId, void *pUsrContext, void *pfnSapEventCallback, uint8_t *pAssocStasBuf); @@ -979,14 +979,14 @@ QDF_STATUS csr_send_mb_get_associated_stas_req_msg(tpAniSirGlobal pMac, QDF_STATUS csr_roam_get_wps_session_overlap(tpAniSirGlobal pMac, uint32_t sessionId, void *pUsrContext, void *pfnSapEventCallback, - struct cdf_mac_addr pRemoveMac); + struct qdf_mac_addr pRemoveMac); QDF_STATUS csr_send_mb_get_wpspbc_sessions(tpAniSirGlobal pMac, uint32_t sessionId, - struct cdf_mac_addr bssId, + struct qdf_mac_addr bssId, void *pUsrContext, void *pfnSapEventCallback, - struct cdf_mac_addr pRemoveMac); + struct qdf_mac_addr pRemoveMac); /* --------------------------------------------------------------------------- \fn csr_send_chng_mcc_beacon_interval @@ -1023,7 +1023,7 @@ bool csr_neighbor_roam_connected_profile_match(tpAniSirGlobal pMac, QDF_STATUS csr_scan_create_entry_in_scan_cache(tpAniSirGlobal pMac, uint32_t sessionId, - struct cdf_mac_addr bssid, + struct qdf_mac_addr bssid, uint8_t channel); QDF_STATUS csr_update_channel_list(tpAniSirGlobal pMac); diff --git a/core/sme/src/csr/csr_link_list.c b/core/sme/src/csr/csr_link_list.c index da01816d02..58b34196ae 100644 --- a/core/sme/src/csr/csr_link_list.c +++ b/core/sme/src/csr/csr_link_list.c @@ -38,12 +38,12 @@ #include "cdf_trace.h" #include "cdf_mc_timer.h" -CDF_INLINE_FN void csr_list_init(tListElem *pList) +static inline void csr_list_init(tListElem *pList) { pList->last = pList->next = pList; } -CDF_INLINE_FN void csr_list_remove_entry(tListElem *pEntry) +static inline void csr_list_remove_entry(tListElem *pEntry) { tListElem *pLast; tListElem *pNext; @@ -54,7 +54,7 @@ CDF_INLINE_FN void csr_list_remove_entry(tListElem *pEntry) pNext->last = pLast; } -CDF_INLINE_FN tListElem *csr_list_remove_head(tListElem *pHead) +static inline tListElem *csr_list_remove_head(tListElem *pHead) { tListElem *pEntry; tListElem *pNext; @@ -67,7 +67,7 @@ CDF_INLINE_FN tListElem *csr_list_remove_head(tListElem *pHead) return pEntry; } -CDF_INLINE_FN tListElem *csr_list_remove_tail(tListElem *pHead) +static inline tListElem *csr_list_remove_tail(tListElem *pHead) { tListElem *pEntry; tListElem *pLast; @@ -80,7 +80,7 @@ CDF_INLINE_FN tListElem *csr_list_remove_tail(tListElem *pHead) return pEntry; } -CDF_INLINE_FN void csr_list_insert_tail(tListElem *pHead, tListElem *pEntry) +static inline void csr_list_insert_tail(tListElem *pHead, tListElem *pEntry) { tListElem *pLast; @@ -91,7 +91,7 @@ CDF_INLINE_FN void csr_list_insert_tail(tListElem *pHead, tListElem *pEntry) pHead->last = pEntry; } -CDF_INLINE_FN void csr_list_insert_head(tListElem *pHead, tListElem *pEntry) +static inline void csr_list_insert_head(tListElem *pHead, tListElem *pEntry) { tListElem *pNext; @@ -107,7 +107,7 @@ void csr_list_insert_entry(tListElem *pEntry, tListElem *pNewEntry) { tListElem *pLast; if (!pEntry) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, "%s: Error!! pEntry is Null", __func__); return; } @@ -124,7 +124,7 @@ uint32_t csr_ll_count(tDblLinkList *pList) uint32_t c = 0; if (!pList) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, "%s: Error!! pList is Null", __func__); return c; } @@ -140,7 +140,7 @@ void csr_ll_lock(tDblLinkList *pList) { if (!pList) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, "%s: Error!! pList is Null", __func__); return; } @@ -154,7 +154,7 @@ void csr_ll_unlock(tDblLinkList *pList) { if (!pList) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, "%s: Error!! pList is Null", __func__); return; } @@ -169,7 +169,7 @@ bool csr_ll_is_list_empty(tDblLinkList *pList, bool fInterlocked) bool fEmpty = true; if (!pList) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, "%s: Error!! pList is Null", __func__); return fEmpty; } @@ -194,7 +194,7 @@ bool csr_ll_find_entry(tDblLinkList *pList, tListElem *pEntryToFind) tListElem *pEntry; if (!pList) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, "%s: Error!! pList is Null", __func__); return fFound; } @@ -223,7 +223,7 @@ QDF_STATUS csr_ll_open(tHddHandle hHdd, tDblLinkList *pList) QDF_STATUS qdf_status; if (!pList) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, "%s: Error!! pList is Null", __func__); return QDF_STATUS_E_FAILURE; } @@ -247,7 +247,7 @@ QDF_STATUS csr_ll_open(tHddHandle hHdd, tDblLinkList *pList) void csr_ll_close(tDblLinkList *pList) { if (!pList) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, "%s: Error!! pList is Null", __func__); return; } @@ -264,7 +264,7 @@ void csr_ll_insert_tail(tDblLinkList *pList, tListElem *pEntry, bool fInterlocked) { if (!pList) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, "%s: Error!! pList is Null", __func__); return; } @@ -286,7 +286,7 @@ void csr_ll_insert_head(tDblLinkList *pList, tListElem *pEntry, { if (!pList) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, "%s: Error!! pList is Null", __func__); return; } @@ -312,7 +312,7 @@ void csr_ll_insert_entry(tDblLinkList *pList, tListElem *pEntry, tListElem *pNewEntry, bool fInterlocked) { if (!pList) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, "%s: Error!! pList is Null", __func__); return; } @@ -334,7 +334,7 @@ tListElem *csr_ll_remove_tail(tDblLinkList *pList, bool fInterlocked) tListElem *pEntry = NULL; if (!pList) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, "%s: Error!! pList is Null", __func__); return pEntry; } @@ -362,7 +362,7 @@ tListElem *csr_ll_peek_tail(tDblLinkList *pList, bool fInterlocked) tListElem *pEntry = NULL; if (!pList) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, "%s: Error!! pList is Null", __func__); return pEntry; } @@ -388,7 +388,7 @@ tListElem *csr_ll_remove_head(tDblLinkList *pList, bool fInterlocked) tListElem *pEntry = NULL; if (!pList) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, "%s: Error!! pList is Null", __func__); return pEntry; } @@ -416,7 +416,7 @@ tListElem *csr_ll_peek_head(tDblLinkList *pList, bool fInterlocked) tListElem *pEntry = NULL; if (!pList) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, "%s: Error!! pList is Null", __func__); return pEntry; } @@ -442,7 +442,7 @@ void csr_ll_purge(tDblLinkList *pList, bool fInterlocked) tListElem *pEntry; if (!pList) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, "%s: Error!! pList is Null", __func__); return; } @@ -468,7 +468,7 @@ bool csr_ll_remove_entry(tDblLinkList *pList, tListElem *pEntryToRemove, tListElem *pEntry; if (!pList) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, "%s: Error!! pList is Null", __func__); return fFound; } @@ -510,7 +510,7 @@ tListElem *csr_ll_next(tDblLinkList *pList, tListElem *pEntry, tListElem *pNextEntry = NULL; if (!pList) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, "%s: Error!! pList is Null", __func__); return pNextEntry; } @@ -543,7 +543,7 @@ tListElem *csr_ll_previous(tDblLinkList *pList, tListElem *pEntry, tListElem *pNextEntry = NULL; if (!pList) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, "%s: Error!! pList is Null", __func__); return pNextEntry; } diff --git a/core/sme/src/csr/csr_neighbor_roam.c b/core/sme/src/csr/csr_neighbor_roam.c index 41034a8d8e..6a73d176da 100644 --- a/core/sme/src/csr/csr_neighbor_roam.c +++ b/core/sme/src/csr/csr_neighbor_roam.c @@ -66,7 +66,7 @@ static QDF_STATUS csr_neighbor_roam_issue_preauth_req(tpAniSirGlobal pMac, mac_ctx->roam.neighborRoamInfo[session].prevNeighborRoamState = \ mac_ctx->roam.neighborRoamInfo[session].neighborRoamState; \ mac_ctx->roam.neighborRoamInfo[session].neighborRoamState = newstate; \ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, \ + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, \ FL("Sessionid (%d) NeighborRoam transition from %s to %s"), \ session, csr_neighbor_roam_state_to_string( \ mac_ctx->roam.neighborRoamInfo[session].prevNeighborRoamState),\ @@ -1170,7 +1170,7 @@ csr_neighbor_roam_offload_update_preauth_list(tpAniSirGlobal pMac, CSR_NEIGHBOR_ROAM_STATE_TRANSITION (pMac, eCSR_NEIGHBOR_ROAM_STATE_PREAUTH_DONE, session_id) neighbor_roam_info_ptr->FTRoamInfo.numPreAuthRetries = 0; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "LFR3:Entry added to Auth Done List"); return QDF_STATUS_SUCCESS; @@ -1232,7 +1232,7 @@ csr_neighbor_roam_prepare_scan_profile_filter(tpAniSirGlobal pMac, &nbr_roam_info->handoffReqInfo.bssid); } } - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, FL("No of Allowed SSID List:%d"), roam_params->num_ssid_allowed_list); if (roam_params->num_ssid_allowed_list) { @@ -1445,7 +1445,7 @@ csr_neighbor_roam_process_scan_results(tpAniSirGlobal mac_ctx, if (NULL == scan_result) break; descr = &scan_result->BssDescriptor; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, FL("Scan result: BSSID " MAC_ADDRESS_STR " (Rssi %ld, Ch:%d)"), MAC_ADDR_ARRAY(descr->bssId), @@ -1458,7 +1458,7 @@ csr_neighbor_roam_process_scan_results(tpAniSirGlobal mac_ctx, * currently associated AP. Do not have this * in the roamable AP list */ - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "SKIP-currently associated AP"); continue; @@ -1474,7 +1474,7 @@ csr_neighbor_roam_process_scan_results(tpAniSirGlobal mac_ctx, sizeof(tSirMacAddr))) || (descr->channelId != n_roam_info->handoffReqInfo.channel))) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "SKIP-not a candidate AP for OS requested roam"); continue; @@ -1508,14 +1508,14 @@ csr_neighbor_roam_process_scan_results(tpAniSirGlobal mac_ctx, n_roam_info->MinQBssLoadRequired); if (voadmitted && qpresent && (qavail < n_roam_info->MinQBssLoadRequired)) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "BSSID : " MAC_ADDRESS_STR " has no bandwidth, ignoring", MAC_ADDR_ARRAY(descr->bssId)); continue; } if (voadmitted && !qpresent) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "BSSID : " MAC_ADDRESS_STR " has no QBSS LOAD IE, ignoring", MAC_ADDR_ARRAY(descr->bssId)); @@ -1541,7 +1541,7 @@ csr_neighbor_roam_process_scan_results(tpAniSirGlobal mac_ctx, descr->nReceivedTime; if (age_constraint == true && age_ticks > limit_ticks) { num_dropped++; - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, FL("Old AP (probe rsp/beacon) skipped.") ); @@ -1587,7 +1587,7 @@ csr_neighbor_roam_process_scan_results(tpAniSirGlobal mac_ctx, * iterations and no candidate were found */ if (age_constraint == false) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: No roam able candidates found", __func__); break; @@ -1713,7 +1713,7 @@ QDF_STATUS csr_neighbor_roam_channels_filter_by_current_band(tpAniSirGlobal pMac return QDF_STATUS_E_INVAL; if (inputNumOfChannels > WNI_CFG_VALID_CHANNEL_LIST_LEN) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Wrong Number of Input Channels %d", __func__, inputNumOfChannels); return QDF_STATUS_E_INVAL; @@ -1774,13 +1774,13 @@ QDF_STATUS csr_neighbor_roam_merge_channel_lists(tpAniSirGlobal pMac, return QDF_STATUS_E_INVAL; if (inputNumOfChannels > WNI_CFG_VALID_CHANNEL_LIST_LEN) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Wrong Number of Input Channels %d", __func__, inputNumOfChannels); return QDF_STATUS_E_INVAL; } if (outputNumOfChannels >= WNI_CFG_VALID_CHANNEL_LIST_LEN) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Wrong Number of Output Channels %d", __func__, outputNumOfChannels); return QDF_STATUS_E_INVAL; @@ -1793,7 +1793,7 @@ QDF_STATUS csr_neighbor_roam_merge_channel_lists(tpAniSirGlobal pMac, } if (j == outputNumOfChannels) { if (pInputChannelList[i]) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: [INFOLOG] Adding extra %d to Neighbor channel list", __func__, pInputChannelList[i]); @@ -1803,7 +1803,7 @@ QDF_STATUS csr_neighbor_roam_merge_channel_lists(tpAniSirGlobal pMac, } } if (numChannels >= WNI_CFG_VALID_CHANNEL_LIST_LEN) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: Merge Neighbor channel list reached Max " "limit %d", __func__, numChannels); break; @@ -1885,7 +1885,7 @@ QDF_STATUS csr_neighbor_roam_create_chan_list_from_neighbor_report(tpAniSirGloba get_rf_band(pNeighborBssDesc-> pNeighborBssDescription-> channel)) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: [INFOLOG] Adding %d to Neighbor channel list (Same band)\n", __func__, @@ -1899,7 +1899,7 @@ QDF_STATUS csr_neighbor_roam_create_chan_list_from_neighbor_report(tpAniSirGloba numChannels++; } } else { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: [INFOLOG] Adding %d to Neighbor channel list\n", __func__, @@ -2212,7 +2212,7 @@ void csr_roam_reset_roam_params(tpAniSirGlobal mac_ctx) * clear all the whitelist parameters and remaining * needs to be retained across connections. */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, FL("Roaming parameters are reset")); roam_params = &mac_ctx->roam.configParam.roam_params; roam_params->num_ssid_allowed_list = 0; @@ -2246,7 +2246,7 @@ QDF_STATUS csr_neighbor_roam_indicate_disconnect(tpAniSirGlobal pMac, sms_log(pMac, LOGE, FL("pSession is NULL")); return QDF_STATUS_E_FAILURE; } - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("Disconn ind on session %d in state %d from bss :" MAC_ADDRESS_STR), sessionId, pNeighborRoamInfo->neighborRoamState, @@ -2265,7 +2265,7 @@ QDF_STATUS csr_neighbor_roam_indicate_disconnect(tpAniSirGlobal pMac, csr_roam_reset_roam_params(pMac); if (NULL != pSession) { roam_session = &pMac->roam.roamSession[sessionId]; - if (NULL != pSession->pCurRoamProfile && (CDF_STA_MODE != + if (NULL != pSession->pCurRoamProfile && (QDF_STA_MODE != roam_session->pCurRoamProfile->csrPersona)) { sms_log(pMac, LOGE, FL("Ignore disconn ind rcvd from nonSTA persona" @@ -2454,7 +2454,7 @@ static void csr_neighbor_roam_info_ctx_init( * down to firmware.Do not send the START command for * other session connections.*/ if (!csr_roam_is_sta_mode(pMac, session_id)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "Wrong Mode %d", session->connectedProfile.BSSType); return; @@ -2463,7 +2463,7 @@ static void csr_neighbor_roam_info_ctx_init( #ifdef WLAN_FEATURE_ROAM_OFFLOAD if (session->roam_synch_in_progress) { if (pMac->roam.pReassocResp != NULL) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "Free Reassoc Rsp"); cdf_mem_free(pMac->roam.pReassocResp); @@ -2515,7 +2515,7 @@ QDF_STATUS csr_neighbor_roam_indicate_connect( /* Bail out if this is NOT a STA persona */ if (pMac->roam.roamSession[session_id].pCurRoamProfile->csrPersona != - CDF_STA_MODE) { + QDF_STA_MODE) { sms_log(pMac, LOGE, FL("Ignoring Connect ind received from a non STA." "session_id: %d, csrPersonna %d"), session_id, @@ -2535,11 +2535,11 @@ QDF_STATUS csr_neighbor_roam_indicate_connect( if (session->roam_synch_in_progress && (eSIR_ROAM_AUTH_STATUS_AUTHENTICATED == session->roam_synch_data->authStatus)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "LFR3:csr_neighbor_roam_indicate_connect"); msg = cdf_mem_malloc(sizeof(tSirSetActiveModeSetBncFilterReq)); if (msg == NULL) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "LFR3:Mem Alloc failed for beacon Filter Req"); return QDF_STATUS_E_NOMEM; } @@ -2905,7 +2905,7 @@ void csr_neighbor_roam_request_handoff(tpAniSirGlobal mac_ctx, uint32_t roamid = 0; QDF_STATUS status; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "%s session_id=%d", + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "%s session_id=%d", __func__, session_id); if (neighbor_roam_info->neighborRoamState != @@ -2919,11 +2919,11 @@ void csr_neighbor_roam_request_handoff(tpAniSirGlobal mac_ctx, if (false == csr_neighbor_roam_get_handoff_ap_info(mac_ctx, &handoff_node, session_id)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("failed to obtain handoff AP")); return; } - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, FL("HANDOFF CANDIDATE BSSID "MAC_ADDRESS_STR), MAC_ADDR_ARRAY(handoff_node.pBssDescription->bssId)); @@ -2949,7 +2949,7 @@ void csr_neighbor_roam_request_handoff(tpAniSirGlobal mac_ctx, status = csr_roam_copy_connected_profile(mac_ctx, session_id, &neighbor_roam_info->csrNeighborRoamProfile); if (QDF_STATUS_SUCCESS != status) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("csr_roam_copy_connected_profile failed %d"), status); return; @@ -2975,7 +2975,7 @@ void csr_neighbor_roam_request_handoff(tpAniSirGlobal mac_ctx, cdf_mem_copy(roam_info.bssid.bytes, handoff_node.pBssDescription->bssId, - sizeof(struct cdf_mac_addr)); + sizeof(struct qdf_mac_addr)); csr_roam_call_callback(mac_ctx, session_id, &roam_info, 0, eCSR_ROAM_ROAMING_START, eCSR_ROAM_RESULT_NONE); @@ -3124,7 +3124,7 @@ void csr_neighbor_roam_tranistion_preauth_done_to_disconnected(tpAniSirGlobal pM tCsrRoamSession *session = CSR_GET_SESSION(pMac, sessionId); if (!session) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, FL("session is NULL")); return; } @@ -3425,7 +3425,7 @@ QDF_STATUS csr_neighbor_roam_handoff_req_hdlr( roam_ctrl_info->handoffReqInfo.src = handoff_req->handoff_src; cdf_mem_copy(&roam_ctrl_info->handoffReqInfo.bssid.bytes, - &handoff_req->bssid, CDF_MAC_ADDR_SIZE); + &handoff_req->bssid, QDF_MAC_ADDR_SIZE); roam_ctrl_info->uOsRequestedHandoff = 1; status = csr_roam_offload_scan(mac_ctx, session_id, ROAM_SCAN_OFFLOAD_STOP, diff --git a/core/sme/src/csr/csr_tdls_process.c b/core/sme/src/csr/csr_tdls_process.c index d99bd997cd..69c37cf5a8 100644 --- a/core/sme/src/csr/csr_tdls_process.c +++ b/core/sme/src/csr/csr_tdls_process.c @@ -159,7 +159,7 @@ QDF_STATUS csr_tdls_change_peer_sta(tHalHandle hHal, uint8_t sessionId, tdlsAddStaCmd->sessionId = sessionId; cdf_mem_copy(tdlsAddStaCmdInfo->peermac.bytes, - peerMac, CDF_MAC_ADDR_SIZE); + peerMac, QDF_MAC_ADDR_SIZE); tdlsAddStaCmdInfo->capability = pstaParams->capability; tdlsAddStaCmdInfo->uapsdQueues = pstaParams->uapsd_queues; @@ -233,7 +233,7 @@ QDF_STATUS csr_tdls_send_link_establish_params(tHalHandle hHal, tdlsLinkEstablishCmd->sessionId = sessionId; cdf_mem_copy(tdlsLinkEstablishCmdInfo->peermac.bytes, - peerMac, CDF_MAC_ADDR_SIZE); + peerMac, QDF_MAC_ADDR_SIZE); tdlsLinkEstablishCmdInfo->isBufSta = tdlsLinkEstablishParams->isBufSta; tdlsLinkEstablishCmdInfo->isResponder = @@ -301,7 +301,7 @@ QDF_STATUS csr_tdls_add_peer_sta(tHalHandle hHal, uint8_t sessionId, tdlsAddStaCmdInfo->tdlsAddOper = TDLS_OPER_ADD; cdf_mem_copy(tdlsAddStaCmdInfo->peermac.bytes, - peerMac, CDF_MAC_ADDR_SIZE); + peerMac, QDF_MAC_ADDR_SIZE); tdlsAddStaCmd->command = eSmeCommandTdlsAddPeer; tdlsAddStaCmd->u.tdlsCmd.size = @@ -337,7 +337,7 @@ QDF_STATUS csr_tdls_del_peer_sta(tHalHandle hHal, uint8_t sessionId, tdlsDelStaCmd->sessionId = sessionId; cdf_mem_copy(tdlsDelStaCmdInfo->peermac.bytes, - peerMac, CDF_MAC_ADDR_SIZE); + peerMac, QDF_MAC_ADDR_SIZE); tdlsDelStaCmd->command = eSmeCommandTdlsDelPeer; tdlsDelStaCmd->u.tdlsCmd.size = @@ -361,7 +361,7 @@ QDF_STATUS tdls_send_message(tpAniSirGlobal pMac, uint16_t msg_type, pMsg->type = msg_type; pMsg->msgLen = (uint16_t) (msg_size); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, ("sending msg = %d"), pMsg->type); /* Send message. */ if (cds_send_mb_message_to_mac(pMsg) != QDF_STATUS_SUCCESS) { @@ -412,10 +412,10 @@ QDF_STATUS csr_tdls_process_send_mgmt(tpAniSirGlobal pMac, tSmeCmd *cmd) tdlsSendMgmtReq->peerCapability = tdlsSendMgmtCmdInfo->peerCapability; cdf_mem_copy(tdlsSendMgmtReq->bssid.bytes, - pSession->pConnectBssDesc->bssId, CDF_MAC_ADDR_SIZE); + pSession->pConnectBssDesc->bssId, QDF_MAC_ADDR_SIZE); cdf_mem_copy(tdlsSendMgmtReq->peer_mac.bytes, - tdlsSendMgmtCmdInfo->peerMac, CDF_MAC_ADDR_SIZE); + tdlsSendMgmtCmdInfo->peerMac, QDF_MAC_ADDR_SIZE); if (tdlsSendMgmtCmdInfo->len && tdlsSendMgmtCmdInfo->buf) { cdf_mem_copy(tdlsSendMgmtReq->addIe, tdlsSendMgmtCmdInfo->buf, @@ -476,7 +476,7 @@ QDF_STATUS csr_tdls_process_add_sta(tpAniSirGlobal pMac, tSmeCmd *cmd) tdlsAddStaReq->transactionId = 0; cdf_mem_copy(tdlsAddStaReq->bssid.bytes, - pSession->pConnectBssDesc->bssId, CDF_MAC_ADDR_SIZE); + pSession->pConnectBssDesc->bssId, QDF_MAC_ADDR_SIZE); cdf_copy_macaddr(&tdlsAddStaReq->peermac, &tdlsAddStaCmdInfo->peermac); @@ -546,7 +546,7 @@ QDF_STATUS csr_tdls_process_del_sta(tpAniSirGlobal pMac, tSmeCmd *cmd) tdlsDelStaReq->transactionId = 0; cdf_mem_copy(tdlsDelStaReq->bssid.bytes, - pSession->pConnectBssDesc->bssId, CDF_MAC_ADDR_SIZE); + pSession->pConnectBssDesc->bssId, QDF_MAC_ADDR_SIZE); cdf_copy_macaddr(&tdlsDelStaReq->peermac, &tdlsDelStaCmdInfo->peermac); @@ -640,7 +640,7 @@ QDF_STATUS csr_tdls_process_link_establish(tpAniSirGlobal pMac, tSmeCmd *cmd) cdf_copy_macaddr(&tdlsLinkEstablishReq->peermac, &tdlsLinkEstablishCmdInfo->peermac); cdf_mem_copy(tdlsLinkEstablishReq->bssid.bytes, - pSession->pConnectBssDesc->bssId, CDF_MAC_ADDR_SIZE); + pSession->pConnectBssDesc->bssId, QDF_MAC_ADDR_SIZE); cdf_mem_copy(tdlsLinkEstablishReq->supportedChannels, tdlsLinkEstablishCmdInfo->supportedChannels, tdlsLinkEstablishCmdInfo->supportedChannelsLen); @@ -772,7 +772,7 @@ QDF_STATUS tdls_msg_processor(tpAniSirGlobal pMac, uint16_t msgType, case eWNI_SME_TDLS_SHOULD_DISCOVER: cdf_copy_macaddr(&roamInfo.peerMac, &tevent->peermac); roamInfo.reasonCode = tevent->peer_reason; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: eWNI_SME_TDLS_SHOULD_DISCOVER for peer mac: " MAC_ADDRESS_STR " peer_reason: %d", __func__, MAC_ADDR_ARRAY(tevent->peermac.bytes), @@ -784,7 +784,7 @@ QDF_STATUS tdls_msg_processor(tpAniSirGlobal pMac, uint16_t msgType, case eWNI_SME_TDLS_SHOULD_TEARDOWN: cdf_copy_macaddr(&roamInfo.peerMac, &tevent->peermac); roamInfo.reasonCode = tevent->peer_reason; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: eWNI_SME_TDLS_SHOULD_TEARDOWN for peer mac: " MAC_ADDRESS_STR " peer_reason: %d", __func__, MAC_ADDR_ARRAY(tevent->peermac.bytes), @@ -796,7 +796,7 @@ QDF_STATUS tdls_msg_processor(tpAniSirGlobal pMac, uint16_t msgType, case eWNI_SME_TDLS_PEER_DISCONNECTED: cdf_copy_macaddr(&roamInfo.peerMac, &tevent->peermac); roamInfo.reasonCode = tevent->peer_reason; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: eWNI_SME_TDLS_PEER_DISCONNECTED for peer mac: " MAC_ADDRESS_STR " peer_reason: %d", __func__, MAC_ADDR_ARRAY(tevent->peermac.bytes), diff --git a/core/sme/src/csr/csr_util.c b/core/sme/src/csr/csr_util.c index 562048d444..08b2a7c99d 100644 --- a/core/sme/src/csr/csr_util.c +++ b/core/sme/src/csr/csr_util.c @@ -256,10 +256,10 @@ const char *get_e_csr_roam_result_str(eCsrRoamResult val) } bool csr_get_bss_id_bss_desc(tHalHandle hHal, tSirBssDescription *pSirBssDesc, - struct cdf_mac_addr *pBssId) + struct qdf_mac_addr *pBssId) { cdf_mem_copy(pBssId, &pSirBssDesc->bssId[0], - sizeof(struct cdf_mac_addr)); + sizeof(struct qdf_mac_addr)); return true; } @@ -268,8 +268,8 @@ bool csr_is_bss_id_equal(tHalHandle hHal, tSirBssDescription *pSirBssDesc1, { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); bool fEqual = false; - struct cdf_mac_addr bssId1; - struct cdf_mac_addr bssId2; + struct qdf_mac_addr bssId1; + struct qdf_mac_addr bssId2; do { if (!pSirBssDesc1) @@ -422,9 +422,9 @@ bool csr_is_session_client_and_connected(tpAniSirGlobal pMac, uint8_t sessionId) pSession = CSR_GET_SESSION(pMac, sessionId); if (NULL != pSession->pCurRoamProfile) { if ((pSession->pCurRoamProfile->csrPersona == - CDF_STA_MODE) + QDF_STA_MODE) || (pSession->pCurRoamProfile->csrPersona == - CDF_P2P_CLIENT_MODE)) + QDF_P2P_CLIENT_MODE)) return true; } } @@ -445,7 +445,7 @@ uint8_t csr_get_concurrent_operation_channel(tpAniSirGlobal mac_ctx) { tCsrRoamSession *session = NULL; uint8_t i = 0; - enum tCDF_ADAPTER_MODE persona; + enum tQDF_ADAPTER_MODE persona; for (i = 0; i < CSR_ROAM_SESSION_MAX; i++) { if (!CSR_IS_SESSION_VALID(mac_ctx, i)) @@ -454,12 +454,12 @@ uint8_t csr_get_concurrent_operation_channel(tpAniSirGlobal mac_ctx) if (NULL == session->pCurRoamProfile) continue; persona = session->pCurRoamProfile->csrPersona; - if ((((persona == CDF_STA_MODE) || - (persona == CDF_P2P_CLIENT_MODE)) && + if ((((persona == QDF_STA_MODE) || + (persona == QDF_P2P_CLIENT_MODE)) && (session->connectState == eCSR_ASSOC_STATE_TYPE_INFRA_ASSOCIATED)) || - (((persona == CDF_P2P_GO_MODE) || - (persona == CDF_SAP_MODE)) + (((persona == QDF_P2P_GO_MODE) || + (persona == QDF_SAP_MODE)) && (session->connectState != eCSR_ASSOC_STATE_TYPE_NOT_CONNECTED))) return session->connectedProfile.operationChannel; @@ -675,7 +675,7 @@ static void csr_handle_conc_chnl_overlap_for_sap_go(tpAniSirGlobal mac_ctx, } } else if (*sap_ch == 0 && (session->pCurRoamProfile->csrPersona == - CDF_SAP_MODE)) { + QDF_SAP_MODE)) { *sap_ch = session->connectedProfile.operationChannel; csr_get_ch_from_ht_profile(mac_ctx, &session->connectedProfile.HTProfile, @@ -731,9 +731,9 @@ uint16_t csr_check_concurrent_channel_overlap(tpAniSirGlobal mac_ctx, session = CSR_GET_SESSION(mac_ctx, i); if (NULL == session->pCurRoamProfile) continue; - if (((session->pCurRoamProfile->csrPersona == CDF_STA_MODE) || + if (((session->pCurRoamProfile->csrPersona == QDF_STA_MODE) || (session->pCurRoamProfile->csrPersona == - CDF_P2P_CLIENT_MODE)) && + QDF_P2P_CLIENT_MODE)) && (session->connectState == eCSR_ASSOC_STATE_TYPE_INFRA_ASSOCIATED)) { intf_ch = session->connectedProfile.operationChannel; @@ -741,9 +741,9 @@ uint16_t csr_check_concurrent_channel_overlap(tpAniSirGlobal mac_ctx, &session->connectedProfile.HTProfile, intf_ch, &intf_cfreq, &intf_hbw); } else if (((session->pCurRoamProfile->csrPersona == - CDF_P2P_GO_MODE) || + QDF_P2P_GO_MODE) || (session->pCurRoamProfile->csrPersona == - CDF_SAP_MODE)) && + QDF_SAP_MODE)) && (session->connectState != eCSR_ASSOC_STATE_TYPE_NOT_CONNECTED)) { if (session->ch_switch_in_progress) @@ -827,7 +827,7 @@ bool csr_is_sta_session_connected(tpAniSirGlobal mac_ctx) pSession = CSR_GET_SESSION(mac_ctx, i); if ((NULL != pSession->pCurRoamProfile) && - (CDF_STA_MODE == + (QDF_STA_MODE == pSession->pCurRoamProfile->csrPersona)) return true; } @@ -849,7 +849,7 @@ bool csr_is_p2p_session_connected(tpAniSirGlobal pMac) { uint32_t i; tCsrRoamSession *pSession = NULL; - enum tCDF_ADAPTER_MODE persona; + enum tQDF_ADAPTER_MODE persona; for (i = 0; i < CSR_ROAM_SESSION_MAX; i++) { if (CSR_IS_SESSION_VALID(pMac, i) @@ -857,8 +857,8 @@ bool csr_is_p2p_session_connected(tpAniSirGlobal pMac) pSession = CSR_GET_SESSION(pMac, i); persona = pSession->pCurRoamProfile->csrPersona; if ((NULL != pSession->pCurRoamProfile) && - ((CDF_P2P_CLIENT_MODE == persona) || - (CDF_P2P_GO_MODE == persona))) { + ((QDF_P2P_CLIENT_MODE == persona) || + (QDF_P2P_GO_MODE == persona))) { return true; } } @@ -1880,10 +1880,10 @@ bool csr_is_profile_rsn(tCsrRoamProfile *pProfile) */ QDF_STATUS csr_isconcurrentsession_valid(tpAniSirGlobal mac_ctx, uint32_t cur_sessionid, - enum tCDF_ADAPTER_MODE cur_bss_persona) + enum tQDF_ADAPTER_MODE cur_bss_persona) { uint32_t sessionid = 0; - enum tCDF_ADAPTER_MODE bss_persona; + enum tQDF_ADAPTER_MODE bss_persona; eCsrConnectState connect_state, temp; tCsrRoamSession *roam_session; @@ -1897,19 +1897,19 @@ csr_isconcurrentsession_valid(tpAniSirGlobal mac_ctx, uint32_t cur_sessionid, connect_state = roam_session->connectState; switch (cur_bss_persona) { - case CDF_STA_MODE: - CDF_TRACE(CDF_MODULE_ID_SME, + case QDF_STA_MODE: + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("** STA session **")); return QDF_STATUS_SUCCESS; - case CDF_SAP_MODE: + case QDF_SAP_MODE: temp = eCSR_ASSOC_STATE_TYPE_IBSS_DISCONNECTED; - if ((bss_persona == CDF_IBSS_MODE) + if ((bss_persona == QDF_IBSS_MODE) && (connect_state != temp)) { /* allow IBSS+SAP for Emulation only */ #ifndef QCA_WIFI_3_0_EMU - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Can't start SAP")); return QDF_STATUS_E_FAILURE; @@ -1917,44 +1917,44 @@ csr_isconcurrentsession_valid(tpAniSirGlobal mac_ctx, uint32_t cur_sessionid, } break; - case CDF_P2P_GO_MODE: + case QDF_P2P_GO_MODE: temp = eCSR_ASSOC_STATE_TYPE_IBSS_DISCONNECTED; - if ((bss_persona == CDF_IBSS_MODE) + if ((bss_persona == QDF_IBSS_MODE) && (connect_state != temp)) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Can't start SAP")); return QDF_STATUS_E_FAILURE; } break; - case CDF_IBSS_MODE: - if ((bss_persona == CDF_IBSS_MODE) && + case QDF_IBSS_MODE: + if ((bss_persona == QDF_IBSS_MODE) && (connect_state == eCSR_ASSOC_STATE_TYPE_IBSS_CONNECTED)) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("IBSS mode already exist")); return QDF_STATUS_E_FAILURE; - } else if (((bss_persona == CDF_P2P_GO_MODE) || - (bss_persona == CDF_SAP_MODE)) && + } else if (((bss_persona == QDF_P2P_GO_MODE) || + (bss_persona == QDF_SAP_MODE)) && (connect_state != eCSR_ASSOC_STATE_TYPE_NOT_CONNECTED)) { /* allow IBSS+SAP for Emulation only */ #ifndef QCA_WIFI_3_0_EMU - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Can't start GO/SAP")); return QDF_STATUS_E_FAILURE; #endif } break; - case CDF_P2P_CLIENT_MODE: - CDF_TRACE(CDF_MODULE_ID_SME, + case QDF_P2P_CLIENT_MODE: + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("**P2P-Client session**")); return QDF_STATUS_SUCCESS; default: - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Persona not handled = %d"), cur_bss_persona); @@ -1988,7 +1988,7 @@ QDF_STATUS csr_update_mcc_p2p_beacon_interval(tpAniSirGlobal mac_ctx) * change the BI of the P2P-GO */ roam_session = &mac_ctx->roam.roamSession[session_id]; - if (roam_session->bssParams.bssPersona != CDF_P2P_GO_MODE) + if (roam_session->bssParams.bssPersona != QDF_P2P_GO_MODE) continue; /* * Handle different BI scneario based on the @@ -2072,7 +2072,7 @@ QDF_STATUS csr_validate_mcc_beacon_interval(tpAniSirGlobal pMac, uint8_t channelId, uint16_t *beaconInterval, uint32_t cursessionId, - enum tCDF_ADAPTER_MODE currBssPersona) + enum tQDF_ADAPTER_MODE currBssPersona) { uint32_t sessionId = 0; uint16_t new_beaconInterval = 0; @@ -2089,12 +2089,12 @@ QDF_STATUS csr_validate_mcc_beacon_interval(tpAniSirGlobal pMac, } switch (currBssPersona) { - case CDF_STA_MODE: + case QDF_STA_MODE: if (pMac->roam.roamSession[sessionId]. pCurRoamProfile && (pMac->roam.roamSession[sessionId]. pCurRoamProfile->csrPersona == - CDF_P2P_CLIENT_MODE)) { + QDF_P2P_CLIENT_MODE)) { /* check for P2P client mode */ sms_log(pMac, LOG1, FL @@ -2108,7 +2108,7 @@ QDF_STATUS csr_validate_mcc_beacon_interval(tpAniSirGlobal pMac, */ else if (pMac->roam.roamSession[sessionId]. bssParams.bssPersona == - CDF_SAP_MODE) { + QDF_SAP_MODE) { if (pMac->roam.roamSession[sessionId]. bssParams.operationChn != channelId) { @@ -2119,7 +2119,7 @@ QDF_STATUS csr_validate_mcc_beacon_interval(tpAniSirGlobal pMac, } } else if (pMac->roam.roamSession[sessionId]. bssParams.bssPersona == - CDF_P2P_GO_MODE) { + QDF_P2P_GO_MODE) { /* * Check for P2P go scenario * if GO in MCC support different @@ -2229,19 +2229,19 @@ QDF_STATUS csr_validate_mcc_beacon_interval(tpAniSirGlobal pMac, } break; - case CDF_P2P_CLIENT_MODE: + case QDF_P2P_CLIENT_MODE: if (pMac->roam.roamSession[sessionId]. pCurRoamProfile && (pMac->roam.roamSession[sessionId]. pCurRoamProfile->csrPersona == - CDF_STA_MODE)) { + QDF_STA_MODE)) { /* check for P2P client mode */ sms_log(pMac, LOG1, FL (" Ignore Beacon Interval Validation...")); } else if (pMac->roam.roamSession[sessionId]. bssParams.bssPersona == - CDF_P2P_GO_MODE) { + QDF_P2P_GO_MODE) { /* Check for P2P go scenario */ if ((pMac->roam.roamSession[sessionId]. bssParams.operationChn != @@ -2258,20 +2258,20 @@ QDF_STATUS csr_validate_mcc_beacon_interval(tpAniSirGlobal pMac, } break; - case CDF_SAP_MODE: - case CDF_IBSS_MODE: + case QDF_SAP_MODE: + case QDF_IBSS_MODE: break; - case CDF_P2P_GO_MODE: + case QDF_P2P_GO_MODE: { if (pMac->roam.roamSession[sessionId]. pCurRoamProfile && ((pMac->roam.roamSession[sessionId]. pCurRoamProfile->csrPersona == - CDF_P2P_CLIENT_MODE) || + QDF_P2P_CLIENT_MODE) || (pMac->roam.roamSession[sessionId]. pCurRoamProfile->csrPersona == - CDF_STA_MODE))) { + QDF_STA_MODE))) { /* check for P2P_client scenario */ if ((pMac->roam. roamSession[sessionId]. @@ -2902,7 +2902,7 @@ csr_is_pmf_capabilities_in_rsn_match(tHalHandle hHal, apProfileMFPRequired = (pRSNIe->RSN_Cap[0] >> 6) & 0x1; if (*pFilterMFPEnabled && *pFilterMFPCapable && *pFilterMFPRequired && (apProfileMFPCapable == 0)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "AP is not capable to make PMF connection"); return false; } else if (*pFilterMFPEnabled && *pFilterMFPCapable && @@ -2915,7 +2915,7 @@ csr_is_pmf_capabilities_in_rsn_match(tHalHandle hHal, * so if AP is not capable of PMF then drop it. * Don't try to connect with it. */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "we need PMF connection & AP isn't capable to make PMF connection"); return false; } else if (!(*pFilterMFPCapable) && @@ -2926,12 +2926,12 @@ csr_is_pmf_capabilities_in_rsn_match(tHalHandle hHal, * requires mandatory PMF connections and we are not * capable so this AP is not good choice to connect */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "AP needs PMF connection and we are not capable of pmf connection"); return false; } else if (!(*pFilterMFPEnabled) && *pFilterMFPCapable && (apProfileMFPCapable == 1)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "we don't need PMF connection even though both parties are capable"); return false; } @@ -2987,7 +2987,7 @@ bool csr_lookup_pmkid(tpAniSirGlobal pMac, uint32_t sessionId, uint8_t *pBSSId, MAC_ADDR_ARRAY(pBSSId)); if (cdf_mem_compare (pBSSId, pSession->PmkidCacheInfo[Index].BSSID.bytes, - sizeof(struct cdf_mac_addr))) { + sizeof(struct qdf_mac_addr))) { /* match found */ fMatchFound = true; break; @@ -3324,7 +3324,7 @@ bool csr_lookup_bkid(tpAniSirGlobal pMac, uint32_t sessionId, uint8_t *pBSSId, MAC_ADDR_ARRAY(pBSSId)); if (cdf_mem_compare (pBSSId, pSession->BkidCacheInfo[Index].BSSID.bytes, - sizeof(struct cdf_mac_addr))) { + sizeof(struct qdf_mac_addr))) { /* match found */ fMatchFound = true; break; @@ -4329,15 +4329,15 @@ bool csr_is_ssid_in_list(tHalHandle hHal, tSirMacSSid *pSsid, return fMatch; } -bool csr_is_bssid_match(tHalHandle hHal, struct cdf_mac_addr *pProfBssid, - struct cdf_mac_addr *BssBssid) +bool csr_is_bssid_match(tHalHandle hHal, struct qdf_mac_addr *pProfBssid, + struct qdf_mac_addr *BssBssid) { bool fMatch = false; - struct cdf_mac_addr ProfileBssid; + struct qdf_mac_addr ProfileBssid; /* for efficiency of the MAC_ADDRESS functions, move the */ /* Bssid's into MAC_ADDRESS structs. */ - cdf_mem_copy(&ProfileBssid, pProfBssid, sizeof(struct cdf_mac_addr)); + cdf_mem_copy(&ProfileBssid, pProfBssid, sizeof(struct qdf_mac_addr)); do { @@ -4724,9 +4724,9 @@ bool csr_match_bss(tHalHandle hal, tSirBssDescription *bss_descr, /* Check for Blacklist BSSID's and avoid connections */ blacklist_check = false; for (i = 0; i < roam_params->num_bssid_avoid_list; i++) { - if (cdf_is_macaddr_equal((struct cdf_mac_addr *) + if (cdf_is_macaddr_equal((struct qdf_mac_addr *) &roam_params->bssid_avoid_list[i], - (struct cdf_mac_addr *)bss_descr->bssId)) { + (struct qdf_mac_addr *)bss_descr->bssId)) { blacklist_check = true; break; } @@ -4754,16 +4754,16 @@ bool csr_match_bss(tHalHandle hal, tSirBssDescription *bss_descr, p2p_macaddr = ie_ptr->P2PBeaconProbeRes.P2PDeviceInfo.P2PDeviceAddress; for (i = 0; i < filter->BSSIDs.numOfBSSIDs; i++) { check = csr_is_bssid_match(mac_ctx, - (struct cdf_mac_addr *)&filter->BSSIDs.bssid[i], - (struct cdf_mac_addr *)bss_descr->bssId); + (struct qdf_mac_addr *)&filter->BSSIDs.bssid[i], + (struct qdf_mac_addr *)bss_descr->bssId); if (check) break; if (filter->p2pResult && ie_ptr->P2PBeaconProbeRes.present) { check = csr_is_bssid_match(mac_ctx, - (struct cdf_mac_addr *) + (struct qdf_mac_addr *) &filter->BSSIDs.bssid[i], - (struct cdf_mac_addr *)p2p_macaddr); + (struct qdf_mac_addr *)p2p_macaddr); if (check) break; } @@ -5696,16 +5696,16 @@ bool csr_wait_for_connection_update(tpAniSirGlobal mac, * * This function is to return the persona of a session * - * Reture: enum tCDF_ADAPTER_MODE persona + * Reture: enum tQDF_ADAPTER_MODE persona */ -enum tCDF_ADAPTER_MODE csr_get_session_persona(tpAniSirGlobal pmac, +enum tQDF_ADAPTER_MODE csr_get_session_persona(tpAniSirGlobal pmac, uint32_t session_id) { tCsrRoamSession *session = NULL; session = CSR_GET_SESSION(pmac, session_id); if (NULL == session || NULL == session->pCurRoamProfile) - return CDF_MAX_NO_OF_MODE; + return QDF_MAX_NO_OF_MODE; return session->pCurRoamProfile->csrPersona; } diff --git a/core/sme/src/nan/nan_api.c b/core/sme/src/nan/nan_api.c index 12252ec80d..489e6713ec 100644 --- a/core/sme/src/nan/nan_api.c +++ b/core/sme/src/nan/nan_api.c @@ -51,7 +51,7 @@ void sme_nan_register_callback(tHalHandle hHal, NanCallback callback) tpAniSirGlobal pMac = NULL; if (NULL == hHal) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("hHal is not valid")); return; } @@ -82,7 +82,7 @@ QDF_STATUS sme_nan_request(tpNanRequestReq input) data = cdf_mem_malloc(data_len); if (data == NULL) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Memory allocation failure")); return QDF_STATUS_E_NOMEM; } @@ -98,8 +98,8 @@ QDF_STATUS sme_nan_request(tpNanRequestReq input) msg.reserved = 0; msg.bodyptr = data; - if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) { + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL ("Not able to post WMA_NAN_REQUEST message to WMA")); cdf_mem_free(data); @@ -129,11 +129,11 @@ QDF_STATUS sme_nan_event(tHalHandle hHal, void *pMsg) QDF_STATUS status = QDF_STATUS_SUCCESS; if (NULL == pMsg) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("msg ptr is NULL")); status = QDF_STATUS_E_FAILURE; } else { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, FL("SME: Received sme_nan_event")); if (pMac->sme.nanCallback) { pMac->sme.nanCallback(pMac->hHdd, diff --git a/core/sme/src/p2p/p2p_api.c b/core/sme/src/p2p/p2p_api.c index 05d23ae584..97703854f4 100644 --- a/core/sme/src/p2p/p2p_api.c +++ b/core/sme/src/p2p/p2p_api.c @@ -74,7 +74,7 @@ QDF_STATUS p2p_process_remain_on_channel_cmd(tpAniSirGlobal pMac, if (NULL == pMsg) goto error; else { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s call", + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s call", __func__); cdf_mem_set(pMsg, sizeof(tSirRemainOnChnReq), 0); pMsg->messageType = eWNI_SME_REMAIN_ON_CHANNEL_REQ; @@ -311,7 +311,7 @@ QDF_STATUS p2p_send_action(tHalHandle hHal, uint8_t sessionId, tSirMbMsgP2p *pMsg; uint16_t msgLen; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, " %s sends action frame", __func__); msgLen = (uint16_t) ((sizeof(tSirMbMsgP2p)) + len); pMsg = cdf_mem_malloc(msgLen); diff --git a/core/sme/src/qos/sme_qos.c b/core/sme/src/qos/sme_qos.c index 1672a8d498..0342026ab5 100644 --- a/core/sme/src/qos/sme_qos.c +++ b/core/sme/src/qos/sme_qos.c @@ -516,7 +516,7 @@ QDF_STATUS sme_qos_open(tpAniSirGlobal pMac) sme_QosSessionInfo *pSession; uint8_t sessionId; QDF_STATUS status; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: initializing SME-QoS module", __func__, __LINE__); /* init the control block */ /* (note that this will make all sessions invalid) */ @@ -527,7 +527,7 @@ QDF_STATUS sme_qos_open(tpAniSirGlobal pMac) /* init flow list */ status = csr_ll_open(pMac->hHdd, &sme_qos_cb.flow_list); if (!QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, "%s: %d: cannot initialize Flow List", __func__, __LINE__); return QDF_STATUS_E_FAILURE; @@ -541,7 +541,7 @@ QDF_STATUS sme_qos_open(tpAniSirGlobal pMac) /* initialize the session's buffered command list */ status = csr_ll_open(pMac->hHdd, &pSession->bufferedCommandList); if (!QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, "%s: %d: cannot initialize cmd list for session %d", __func__, __LINE__, sessionId); return QDF_STATUS_E_FAILURE; @@ -549,7 +549,7 @@ QDF_STATUS sme_qos_open(tpAniSirGlobal pMac) pSession->readyForPowerSave = true; } - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: done initializing SME-QoS module", __func__, __LINE__); return QDF_STATUS_SUCCESS; @@ -568,7 +568,7 @@ QDF_STATUS sme_qos_close(tpAniSirGlobal pMac) sme_QosSessionInfo *pSession; sme_QosEdcaAcType ac; uint8_t sessionId; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: closing down SME-QoS", __func__, __LINE__); /* cleanup control block */ @@ -606,7 +606,7 @@ QDF_STATUS sme_qos_close(tpAniSirGlobal pMac) pSession->sessionActive = false; pSession->readyForPowerSave = true; } - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: closed down QoS", __func__, __LINE__); return QDF_STATUS_SUCCESS; } @@ -650,18 +650,18 @@ sme_QosStatusType sme_qos_setup_req(tHalHandle hHal, uint32_t sessionId, QDF_STATUS lock_status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); sme_QosStatusType status; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: QoS Setup requested by client on session %d", __func__, __LINE__, sessionId); lock_status = sme_acquire_global_lock(&pMac->sme); if (!QDF_IS_STATUS_SUCCESS(lock_status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Unable to obtain lock", __func__, __LINE__); return SME_QOS_STATUS_SETUP_FAILURE_RSP; } /* Make sure the session is valid */ if (!CSR_IS_SESSION_VALID(pMac, sessionId)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Supplied Session ID %d is invalid", __func__, __LINE__, sessionId); status = SME_QOS_STATUS_SETUP_FAILURE_RSP; @@ -669,14 +669,14 @@ sme_QosStatusType sme_qos_setup_req(tHalHandle hHal, uint32_t sessionId, /* Make sure the session is active */ pSession = &sme_qos_cb.sessionInfo[sessionId]; if (!pSession->sessionActive) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Supplied Session ID %d is inactive", __func__, __LINE__, sessionId); status = SME_QOS_STATUS_SETUP_FAILURE_RSP; } else { /* Assign a Flow ID */ *pQosFlowID = sme_qos_assign_flow_id(); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: QoS request on session %d assigned Flow ID %d", __func__, __LINE__, sessionId, *pQosFlowID); /* Call the internal function for QoS setup, */ @@ -690,7 +690,7 @@ sme_QosStatusType sme_qos_setup_req(tHalHandle hHal, uint32_t sessionId, } } sme_release_global_lock(&pMac->sme); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: QoS setup return status on session %d is %d", __func__, __LINE__, sessionId, status); return status; @@ -722,19 +722,19 @@ sme_QosStatusType sme_qos_modify_req(tHalHandle hHal, QDF_STATUS lock_status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); sme_QosStatusType status; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: QoS Modify requested by client for Flow %d", __func__, __LINE__, QosFlowID); lock_status = sme_acquire_global_lock(&pMac->sme); if (!QDF_IS_STATUS_SUCCESS(lock_status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Unable to obtain lock", __func__, __LINE__); return SME_QOS_STATUS_MODIFY_SETUP_FAILURE_RSP; } /* Call the internal function for QoS modify, adding a layer of abstraction */ status = sme_qos_internal_modify_req(pMac, pQoSInfo, QosFlowID, false); sme_release_global_lock(&pMac->sme); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: QoS Modify return status on Flow %d is %d", __func__, __LINE__, QosFlowID, status); return status; @@ -759,19 +759,19 @@ sme_QosStatusType sme_qos_release_req(tHalHandle hHal, uint32_t QosFlowID) QDF_STATUS lock_status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); sme_QosStatusType status; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: QoS Release requested by client for Flow %d", __func__, __LINE__, QosFlowID); lock_status = sme_acquire_global_lock(&pMac->sme); if (!QDF_IS_STATUS_SUCCESS(lock_status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Unable to obtain lock", __func__, __LINE__); return SME_QOS_STATUS_RELEASE_FAILURE_RSP; } /* Call the internal function for QoS release, adding a layer of abstraction */ status = sme_qos_internal_release_req(pMac, QosFlowID, false); sme_release_global_lock(&pMac->sme); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: QoS Release return status on Flow %d is %d", __func__, __LINE__, QosFlowID, status); return status; @@ -800,7 +800,7 @@ QDF_STATUS sme_qos_msg_processor(tpAniSirGlobal mac_ctx, QDF_STATUS status = QDF_STATUS_E_FAILURE; tListElem *entry = NULL; tSmeCmd *command; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL(" msg = %d for QoS"), msg_type); /* switch on the msg type & make the state transition accordingly */ switch (msg_type) { @@ -845,7 +845,7 @@ QDF_STATUS sme_qos_msg_processor(tpAniSirGlobal mac_ctx, break; default: /* err msg */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("unknown msg type = %d"), msg_type); break; @@ -869,14 +869,14 @@ QDF_STATUS sme_qos_validate_params(tpAniSirGlobal pMac, { tDot11fBeaconIEs *pIes = NULL; QDF_STATUS status = QDF_STATUS_E_FAILURE; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: validation for QAP & APSD", __func__, __LINE__); do { if (!QDF_IS_STATUS_SUCCESS( csr_get_parsed_bss_description_ies( pMac, pBssDesc, &pIes))) { /* err msg */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: csr_get_parsed_bss_description_ies() failed", __func__, __LINE__); break; @@ -884,7 +884,7 @@ QDF_STATUS sme_qos_validate_params(tpAniSirGlobal pMac, /* check if the AP is QAP & it supports APSD */ if (!CSR_IS_QOS_BSS(pIes)) { /* err msg */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: AP doesn't support QoS", __func__, __LINE__); @@ -893,14 +893,14 @@ QDF_STATUS sme_qos_validate_params(tpAniSirGlobal pMac, if (!(pIes->WMMParams.qosInfo & SME_QOS_AP_SUPPORTS_APSD) && !(pIes->WMMInfoAp.uapsd)) { /* err msg */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: AP doesn't support APSD", __func__, __LINE__); break; } status = QDF_STATUS_SUCCESS; } while (0); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: validated with status = %d", __func__, __LINE__, status); if (pIes) { @@ -926,7 +926,7 @@ QDF_STATUS sme_qos_csr_event_ind(tpAniSirGlobal pMac, sme_qos_csr_event_indType ind, void *pEvent_info) { QDF_STATUS status = QDF_STATUS_E_FAILURE; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: On Session %d Event %d received from CSR", __func__, __LINE__, sessionId, ind); switch (ind) { @@ -992,12 +992,12 @@ QDF_STATUS sme_qos_csr_event_ind(tpAniSirGlobal pMac, break; default: /* Err msg */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: On Session %d Unknown Event %d received from CSR", __func__, __LINE__, sessionId, ind); break; } - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: On Session %d processed Event %d with status %d", __func__, __LINE__, sessionId, ind, status); return status; @@ -1020,7 +1020,7 @@ uint8_t sme_qos_get_acm_mask(tpAniSirGlobal pMac, tSirBssDescription *pSirBssDes { sme_QosEdcaAcType ac; uint8_t acm_mask = 0; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: invoked", __func__, __LINE__); for (ac = SME_QOS_EDCA_AC_BE; ac < SME_QOS_EDCA_AC_MAX; ac++) { if (sme_qos_is_acm(pMac, pSirBssDesc, ac, pIes)) { @@ -1028,7 +1028,7 @@ uint8_t sme_qos_get_acm_mask(tpAniSirGlobal pMac, tSirBssDescription *pSirBssDes } } - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: mask is %d", __func__, __LINE__, acm_mask); return acm_mask; } @@ -1086,19 +1086,19 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, uint8_t new_tmask = 0; sme_QosSearchInfo search_key; QDF_STATUS hstatus; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: invoked on session %d for flow %d", __func__, __LINE__, sessionId, QosFlowID); pSession = &sme_qos_cb.sessionInfo[sessionId]; /* if caller sent an empty TSPEC, fill up with the default one */ if (!pQoSInfo) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, "%s: %d: caller sent an empty QoS param list, using defaults", __func__, __LINE__); /* find the AC with UPType passed in */ ac = sme_qos_up_to_ac(UPType); if (SME_QOS_EDCA_AC_MAX == ac) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: invalid AC %d from UP %d", __func__, __LINE__, ac, UPType); @@ -1109,7 +1109,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, /* find the AC */ ac = sme_qos_up_to_ac(pQoSInfo->ts_info.up); if (SME_QOS_EDCA_AC_MAX == ac) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: invalid AC %d from UP %d", __func__, __LINE__, ac, pQoSInfo->ts_info.up); @@ -1117,7 +1117,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, } /* validate QoS params */ if (!sme_qos_validate_requested_params(pMac, pQoSInfo, sessionId)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: invalid params", __func__, __LINE__); return SME_QOS_STATUS_SETUP_INVALID_PARAMS_RSP; } @@ -1133,7 +1133,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, * confuse PE with back to back Addts or Addts followed by Reassoc */ if (sme_qos_is_rsp_pending(sessionId, ac)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, "%s: %d: buffering the setup request for flow %d in state %d " "since another request is pending", __func__, __LINE__, QosFlowID, pACInfo->curr_state); @@ -1149,7 +1149,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, cmd.u.setupCmdInfo.QosFlowID = QosFlowID; hstatus = sme_qos_buffer_cmd(&cmd, buffered_cmd); if (!QDF_IS_STATUS_SUCCESS(hstatus)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: couldn't buffer the setup request in state = %d", __func__, __LINE__, pACInfo->curr_state); /* unable to buffer the request */ @@ -1157,7 +1157,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, pSession->readyForPowerSave = true; return SME_QOS_STATUS_SETUP_FAILURE_RSP; } - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Buffered setup request for flow = %d", __func__, __LINE__, QosFlowID); return SME_QOS_STATUS_SETUP_REQ_PENDING_RSP; @@ -1168,7 +1168,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, /* call the internal qos setup logic to decide on if the */ /* request is NOP, or need reassoc for APSD and/or need to send out ADDTS */ status = sme_qos_setup(pMac, sessionId, &Tspec_Info, ac); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: On session %d with AC %d in state SME_QOS_LINK_UP " "sme_qos_setup returned with status %d", __func__, __LINE__, sessionId, ac, status); @@ -1185,7 +1185,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, /* create an entry in the flow list */ pentry = cdf_mem_malloc(sizeof(*pentry)); if (!pentry) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: couldn't allocate memory for the new " "entry in the Flow List", __func__, @@ -1205,7 +1205,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, if (SME_QOS_STATUS_SETUP_REQ_PENDING_RSP == status) { if (pACInfo->tspec_mask_status && !pACInfo->reassoc_pending) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d with AC %d in state " "SME_QOS_LINK_UP tspec_mask_status is %d " @@ -1250,7 +1250,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, /* Flow List at the end */ pentry->tspec_mask = pACInfo->tspec_mask_status; pentry->QoSInfo = Tspec_Info; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Creating entry on session %d at %p with flowID %d", __func__, __LINE__, sessionId, pentry, QosFlowID); @@ -1258,7 +1258,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, true); } else { /* unexpected status returned by sme_qos_setup() */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d unexpected status %d " "returned by sme_qos_setup", __func__, __LINE__, sessionId, status); @@ -1274,7 +1274,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, break; case SME_QOS_HANDOFF: case SME_QOS_REQUESTED: - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, "%s: %d: Buffering setup request for flow %d in state = %d", __func__, __LINE__, QosFlowID, pACInfo->curr_state); /* buffer cmd */ @@ -1289,7 +1289,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, cmd.u.setupCmdInfo.QosFlowID = QosFlowID; hstatus = sme_qos_buffer_cmd(&cmd, buffered_cmd); if (!QDF_IS_STATUS_SUCCESS(hstatus)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d couldn't buffer the setup " "request for flow %d in state = %d", __func__, __LINE__, @@ -1311,13 +1311,13 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, if (CSR_IS_ADDTS_WHEN_ACMOFF_SUPPORTED(pMac) || sme_qos_is_acm(pMac, pSession->assocInfo.pBssDesc, ac, NULL)) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, "%s: %d: tspec_mask_status = %d for AC = %d", __func__, __LINE__, pACInfo->tspec_mask_status, ac); if (!pACInfo->tspec_mask_status) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: tspec_mask_status can't be 0 for ac = %d in " "state = %d", __func__, @@ -1402,7 +1402,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, SME_QOS_TSPEC_MASK_BIT_1_SET; } } else { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, "%s: %d: wrong tmask = %d", __func__, __LINE__, @@ -1414,11 +1414,11 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, /* to aggregate to calculate trigger frame parameters */ tmask = SME_QOS_TSPEC_MASK_BIT_1_SET; } - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, "%s: %d: tmask = %d, new_tmask = %d in state = %d", __func__, __LINE__, tmask, new_tmask, pACInfo->curr_state); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, "%s: %d: tspec_mask_status = %d for AC = %d", __func__, __LINE__, pACInfo->tspec_mask_status, ac); @@ -1460,7 +1460,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, if (!QDF_IS_STATUS_SUCCESS(hstatus)) { /* err msg */ - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: failed to aggregate params", __func__, __LINE__); @@ -1480,7 +1480,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, Tspec_Info; } } else { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: no flows running for ac = %d while in state = %d", __func__, __LINE__, ac, pACInfo->curr_state); CDF_ASSERT(0); @@ -1501,7 +1501,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, status = sme_qos_setup(pMac, sessionId, &pACInfo->requested_QoSInfo[tmask - 1], ac); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: On session %d with AC %d in state SME_QOS_QOS_ON " "sme_qos_setup returned with status %d", __func__, __LINE__, sessionId, ac, status); @@ -1520,7 +1520,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, (sme_QosFlowInfoEntry *) cdf_mem_malloc(sizeof(*pentry)); if (!pentry) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: couldn't allocate memory for the new " "entry in the Flow List", __func__, @@ -1533,7 +1533,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, pentry->hoRenewal = hoRenewal; pentry->QosFlowID = QosFlowID; pentry->sessionId = sessionId; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Creating flow %d", __func__, __LINE__, QosFlowID); if ((SME_QOS_STATUS_SETUP_SUCCESS_NO_ACM_NO_APSD_RSP == @@ -1571,7 +1571,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, if (!QDF_IS_STATUS_SUCCESS (hstatus)) { CDF_TRACE - (CDF_MODULE_ID_SME, + (QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: couldn't notify other " "entries on this AC =%d", @@ -1594,7 +1594,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, /* Flow List at the end */ pentry->tspec_mask = tmask; pentry->QoSInfo = Tspec_Info; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: On session %d creating entry at %p with flowID %d", __func__, __LINE__, sessionId, pentry, QosFlowID); @@ -1602,7 +1602,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, true); } else { /* unexpected status returned by sme_qos_setup() */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d unexpected status %d " "returned by sme_qos_setup", __func__, __LINE__, sessionId, status); @@ -1612,7 +1612,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, case SME_QOS_CLOSED: case SME_QOS_INIT: default: - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: setup requested in unexpected state = %d", __func__, __LINE__, pACInfo->curr_state); /* unable to service the request */ @@ -1678,7 +1678,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac, sme_QosCmdInfo cmd; uint8_t sessionId; QDF_STATUS hstatus; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: invoked for flow %d", __func__, __LINE__, QosFlowID); cdf_mem_zero(&search_key, sizeof(sme_QosSearchInfo)); @@ -1690,7 +1690,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac, pEntry = sme_qos_find_in_flow_list(search_key); if (!pEntry) { /* Err msg */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: no match found for flowID = %d", __func__, __LINE__, QosFlowID); return SME_QOS_STATUS_MODIFY_SETUP_INVALID_PARAMS_RSP; @@ -1705,7 +1705,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac, /* validate QoS params */ if (!sme_qos_validate_requested_params(pMac, pQoSInfo, sessionId)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: invalid params", __func__, __LINE__); return SME_QOS_STATUS_MODIFY_SETUP_INVALID_PARAMS_RSP; } @@ -1714,7 +1714,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac, flow_info->QoSInfo.ts_info.direction) || (pQoSInfo->ts_info.up != flow_info->QoSInfo.ts_info.up) || (pQoSInfo->ts_info.tid != flow_info->QoSInfo.ts_info.tid)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Modification of direction/tid/up is not allowed", __func__, __LINE__); @@ -1742,7 +1742,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac, flow_info->QoSInfo.suspension_interval) && (pQoSInfo->surplus_bw_allowance == flow_info->QoSInfo.surplus_bw_allowance)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: the addts parameters are same as last request," "dropping the current request", __func__, __LINE__); @@ -1758,7 +1758,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac, * confuse PE with back to back Addts or Addts followed by Reassoc */ if (sme_qos_is_rsp_pending(sessionId, ac)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, "%s: %d: buffering the modify request for flow %d in state %d " "since another request is pending", __func__, __LINE__, QosFlowID, pACInfo->curr_state); @@ -1770,7 +1770,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac, cmd.u.modifyCmdInfo.QoSInfo = *pQoSInfo; hstatus = sme_qos_buffer_cmd(&cmd, buffered_cmd); if (!QDF_IS_STATUS_SUCCESS(hstatus)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: couldn't buffer the modify request in state = %d", __func__, __LINE__, pACInfo->curr_state); /* unable to buffer the request */ @@ -1778,7 +1778,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac, pSession->readyForPowerSave = true; return SME_QOS_STATUS_MODIFY_SETUP_FAILURE_RSP; } - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Buffered modify request for flow = %d", __func__, __LINE__, QosFlowID); return SME_QOS_STATUS_MODIFY_SETUP_PENDING_RSP; @@ -1792,7 +1792,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac, pNewEntry = (sme_QosFlowInfoEntry *) cdf_mem_malloc(sizeof(*pNewEntry)); if (!pNewEntry) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: couldn't allocate memory for the new " "entry in the Flow List", __func__, __LINE__); /* unable to service the request */ @@ -1812,7 +1812,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac, pNewEntry->QoSInfo = *pQoSInfo; /* update the entry from Flow List which needed to be modified */ flow_info->reason = SME_QOS_REASON_MODIFY; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: On session %d creating modified " "entry at %p with flowID %d", __func__, __LINE__, @@ -1833,7 +1833,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac, requested_QoSInfo[pNewEntry-> tspec_mask - 1], ac); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: On session %d with AC %d in state SME_QOS_QOS_ON " "sme_qos_setup returned with status %d", __func__, __LINE__, sessionId, ac, status); @@ -1893,7 +1893,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac, if (!QDF_IS_STATUS_SUCCESS (hstatus)) { CDF_TRACE - (CDF_MODULE_ID_SME, + (QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: couldn't notify other " "entries on this AC =%d", @@ -1923,7 +1923,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac, } else { /* unexpected status returned by sme_qos_setup() */ - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d unexpected status %d " "returned by sme_qos_setup", __func__, @@ -1932,7 +1932,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac, } } else { /* err msg */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: sme_qos_update_params() failed", __func__, __LINE__); /* unable to service the request */ @@ -1953,7 +1953,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac, break; case SME_QOS_HANDOFF: case SME_QOS_REQUESTED: - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, "%s: %d: Buffering modify request for flow %d in state = %d", __func__, __LINE__, QosFlowID, pACInfo->curr_state); /* buffer cmd */ @@ -1964,7 +1964,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac, cmd.u.modifyCmdInfo.QoSInfo = *pQoSInfo; hstatus = sme_qos_buffer_cmd(&cmd, buffered_cmd); if (!QDF_IS_STATUS_SUCCESS(hstatus)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: couldn't buffer the modify request in state = %d", __func__, __LINE__, pACInfo->curr_state); /* unable to buffer the request */ @@ -1978,7 +1978,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac, case SME_QOS_INIT: case SME_QOS_LINK_UP: default: - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: modify requested in unexpected state = %d", __func__, __LINE__, pACInfo->curr_state); /* unable to service the request */ @@ -2028,7 +2028,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, bool uplinkFlowsPresent = false; bool downlinkFlowsPresent = false; tListElem *pResult = NULL; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: invoked for flow %d", __func__, __LINE__, QosFlowID); cdf_mem_zero(&search_key, sizeof(sme_QosSearchInfo)); @@ -2041,7 +2041,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, if (!pEntry) { /* Err msg */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: no match found for flowID = %d", __func__, __LINE__, QosFlowID); return SME_QOS_STATUS_RELEASE_INVALID_PARAMS_RSP; @@ -2061,7 +2061,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, * confuse PE with back to back Addts or Addts followed by Reassoc */ if (sme_qos_is_rsp_pending(sessionId, ac)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, "%s: %d: buffering the release request for flow %d in state %d " "since another request is pending", __func__, __LINE__, QosFlowID, pACInfo->curr_state); @@ -2072,7 +2072,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, cmd.u.releaseCmdInfo.QosFlowID = QosFlowID; hstatus = sme_qos_buffer_cmd(&cmd, buffered_cmd); if (!QDF_IS_STATUS_SUCCESS(hstatus)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: couldn't buffer the release request in state = %d", __func__, __LINE__, pACInfo->curr_state); /* unable to buffer the request */ @@ -2080,7 +2080,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, pSession->readyForPowerSave = true; return SME_QOS_STATUS_RELEASE_FAILURE_RSP; } - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Buffered release request for flow = %d", __func__, __LINE__, QosFlowID); return SME_QOS_STATUS_RELEASE_REQ_PENDING_RSP; @@ -2088,7 +2088,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, /* get into the stat m/c to see if the request can be granted */ switch (pACInfo->curr_state) { case SME_QOS_QOS_ON: - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, "%s: %d: tspec_mask_status = %d for AC = %d with " "entry tspec_mask = %d", __func__, __LINE__, @@ -2171,7 +2171,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, SME_QOS_TSPEC_MASK_BIT_2_SET, &Aggr_Tspec_Info); - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d buffering the AddTS request " "for AC %d in state %d as Addts is pending " @@ -2200,7 +2200,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, (sme_qos_buffer_cmd (&cmd, false))) { CDF_TRACE - (CDF_MODULE_ID_SME, + (QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d unable to buffer the AddTS " "request for AC %d TSPEC %d in state %d", @@ -2242,7 +2242,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, requested_QoSInfo [flow_info->tspec_mask - 1], ac); - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: On session %d with AC %d in state SME_QOS_QOS_ON " "sme_qos_setup returned with status %d", @@ -2272,7 +2272,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, requested_QoSInfo[flow_info-> tspec_mask - 1]; /* delete the entry from Flow List */ - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Deleting entry at %p with flowID %d", __func__, __LINE__, flow_info, @@ -2296,7 +2296,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, if (!QDF_IS_STATUS_SUCCESS (hstatus)) { CDF_TRACE - (CDF_MODULE_ID_SME, + (QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: couldn't notify other " "entries on this AC =%d", @@ -2321,7 +2321,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, } } else { /* unexpected status returned by sme_qos_setup() */ - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d unexpected status %d " "returned by sme_qos_setup", @@ -2336,7 +2336,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, requested_QoSInfo[flow_info-> tspec_mask - 1]; /* delete the entry from Flow List */ - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: On session %d deleting entry at " "%p with flowID %d", __func__, @@ -2361,7 +2361,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, } } else { /* err msg */ - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: sme_qos_update_params() failed", __func__, __LINE__); @@ -2428,7 +2428,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, tspec_mask); if (!QDF_IS_STATUS_SUCCESS(hstatus)) { /* err msg */ - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: sme_qos_del_ts_req() failed", __func__, __LINE__); @@ -2477,7 +2477,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, false); if (!QDF_IS_STATUS_SUCCESS(hstatus)) { /* err msg */ - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Reassoc failed", __func__, __LINE__); @@ -2492,7 +2492,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, pACInfo->tspec_pending = 0; } } else { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: nothing to do for AC = %d", __func__, __LINE__, ac); @@ -2511,7 +2511,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, SME_QOS_STATUS_RELEASE_QOS_LOST_IND, flow_info->QosFlowID); - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Deleting entry at %p with flowID %d", __func__, __LINE__, flow_info, @@ -2541,7 +2541,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, new_state = SME_QOS_LINK_UP; } } else { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Exceeded the array bounds of pACInfo->num_flows", __func__, __LINE__); @@ -2562,7 +2562,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, sizeof(sme_QosWmmTspecInfo)); pACInfo->num_flows[flow_info->tspec_mask - 1]--; /* delete the entry from Flow List */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: On session %d deleting entry at %p with flowID %d", __func__, __LINE__, sessionId, flow_info, QosFlowID); @@ -2591,7 +2591,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, cmd.u.releaseCmdInfo.QosFlowID = QosFlowID; hstatus = sme_qos_buffer_cmd(&cmd, buffered_cmd); if (!QDF_IS_STATUS_SUCCESS(hstatus)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: couldn't buffer the release request in state = %d", __func__, __LINE__, pACInfo->curr_state); /* unable to service the request */ @@ -2606,7 +2606,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, case SME_QOS_LINK_UP: default: /* print error msg */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: release request in unexpected state = %d", __func__, __LINE__, pACInfo->curr_state); CDF_ASSERT(0); @@ -2671,20 +2671,20 @@ sme_QosStatusType sme_qos_setup(tpAniSirGlobal pMac, tCsrRoamModifyProfileFields modifyProfileFields; QDF_STATUS hstatus; if (!CSR_IS_SESSION_VALID(pMac, sessionId)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Session Id %d is invalid", __func__, __LINE__, sessionId); return status; } pSession = &sme_qos_cb.sessionInfo[sessionId]; if (!pSession->sessionActive) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Session %d is inactive", __func__, __LINE__, sessionId); return status; } if (!pSession->assocInfo.pBssDesc) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Session %d has an Invalid BSS Descriptor", __func__, __LINE__, sessionId); return status; @@ -2693,7 +2693,7 @@ sme_QosStatusType sme_qos_setup(tpAniSirGlobal pMac, pSession->assocInfo.pBssDesc, &pIes); if (!QDF_IS_STATUS_SUCCESS(hstatus)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d unable to parse BSS IEs", __func__, __LINE__, sessionId); return status; @@ -2702,7 +2702,7 @@ sme_QosStatusType sme_qos_setup(tpAniSirGlobal pMac, /* success so pIes was allocated */ if (!CSR_IS_QOS_BSS(pIes)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d AP doesn't support QoS", __func__, __LINE__, sessionId); cdf_mem_free(pIes); @@ -2710,7 +2710,7 @@ sme_QosStatusType sme_qos_setup(tpAniSirGlobal pMac, return SME_QOS_STATUS_SETUP_NOT_QOS_AP_RSP; } - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "%s: %d: UAPSD/PSB set %d: ", __func__, __LINE__, pTspec_Info->ts_info.psb); @@ -2726,7 +2726,7 @@ sme_QosStatusType sme_qos_setup(tpAniSirGlobal pMac, qosInfo & SME_QOS_AP_SUPPORTS_APSD) && !(pIes->WMMInfoAp.uapsd)) { /* application is looking for APSD but AP doesn't support it */ - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d AP doesn't support APSD", __func__, __LINE__, sessionId); @@ -2744,13 +2744,13 @@ sme_QosStatusType sme_qos_setup(tpAniSirGlobal pMac, qos_issue_command(pMac, sessionId, eSmeCommandAddTs, pTspec_Info, ac, 0); if (!QDF_IS_STATUS_SUCCESS(hstatus)) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: sme_qos_add_ts_req() failed", __func__, __LINE__); break; } - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: On session %d AddTS on AC %d is pending", __func__, __LINE__, sessionId, ac); status = SME_QOS_STATUS_SETUP_REQ_PENDING_RSP; @@ -2768,7 +2768,7 @@ sme_QosStatusType sme_qos_setup(tpAniSirGlobal pMac, apsdMask & (1 << (SME_QOS_EDCA_AC_VO - ac))) { /* APSD was formerly enabled on this AC but is no longer required */ /* so we must reassociate */ - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: On session %d reassoc needed " "to disable APSD on AC %d", __func__, @@ -2785,13 +2785,13 @@ sme_QosStatusType sme_qos_setup(tpAniSirGlobal pMac, false); if (!QDF_IS_STATUS_SUCCESS(hstatus)) { /* err msg */ - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Unable to request reassociation", __func__, __LINE__); break; } else { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: On session %d reassociation to enable " "APSD on AC %d is pending", @@ -2804,7 +2804,7 @@ sme_QosStatusType sme_qos_setup(tpAniSirGlobal pMac, } else { /* we don't need APSD on this AC */ /* and we don't currently have APSD on this AC */ - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Request is not looking for APSD & Admission " "Control isn't mandatory for the AC", @@ -2817,7 +2817,7 @@ sme_QosStatusType sme_qos_setup(tpAniSirGlobal pMac, } else if (!(pIes->WMMParams.qosInfo & SME_QOS_AP_SUPPORTS_APSD) && !(pIes->WMMInfoAp.uapsd)) { /* application is looking for APSD but AP doesn't support it */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d AP doesn't support APSD", __func__, __LINE__, sessionId); break; @@ -2826,7 +2826,7 @@ sme_QosStatusType sme_qos_setup(tpAniSirGlobal pMac, /* application is looking for APSD */ /* and it is already enabled on this AC */ status = SME_QOS_STATUS_SETUP_SUCCESS_APSD_SET_ALREADY; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Request is looking for APSD and it is already " "set for the AC", __func__, __LINE__); break; @@ -2834,7 +2834,7 @@ sme_QosStatusType sme_qos_setup(tpAniSirGlobal pMac, /* application is looking for APSD */ /* but it is not enabled on this AC */ /* so we need to reassociate */ - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL("On session %d reassoc needed to enable APSD on AC %d"), sessionId, ac); @@ -2853,13 +2853,13 @@ sme_QosStatusType sme_qos_setup(tpAniSirGlobal pMac, false); if (!QDF_IS_STATUS_SUCCESS(hstatus)) { /* err msg */ - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Unable to request reassociation", __func__, __LINE__); break; } else { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL("On session %d reassociation to enable APSD on AC %d is pending"), sessionId, ac); @@ -2883,7 +2883,7 @@ sme_QosStatusType sme_qos_setup(tpAniSirGlobal pMac, QDF_STATUS sme_qos_process_set_key_success_ind(tpAniSirGlobal pMac, uint8_t sessionId, void *pEvent_info) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, "########### Set Key Complete #############"); (void)sme_qos_process_buffered_cmd(sessionId); return QDF_STATUS_SUCCESS; @@ -2921,7 +2921,7 @@ QDF_STATUS sme_qos_ese_save_tspec_response(tpAniSirGlobal pMac, uint8_t sessionI pAddtsRsp->rsp.dialogToken = 0; pAddtsRsp->rsp.status = eSIR_SUCCESS; pAddtsRsp->rsp.wmeTspecPresent = pTspec->present; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: Copy Tspec to local data structure ac=%d, tspecIdx=%d", __func__, ac, tspecIndex); @@ -2963,7 +2963,7 @@ QDF_STATUS sme_qos_ese_process_reassoc_tspec_rsp(tpAniSirGlobal pMac, pCsrSession = CSR_GET_SESSION(pMac, sessionId); if (NULL == pCsrSession) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("session %d not found"), sessionId); return QDF_STATUS_E_FAILURE; } @@ -2983,13 +2983,13 @@ QDF_STATUS sme_qos_ese_process_reassoc_tspec_rsp(tpAniSirGlobal pMac, /* should be atleast equal to the one TSPEC IE */ tspecIeLen = pCsrConnectedInfo->nTspecIeLength; if (tspecIeLen < sizeof(tDot11fIEWMMTSPEC)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("ESE Tspec IE len %d less than min %zu"), tspecIeLen, sizeof(tDot11fIEWMMTSPEC)); return QDF_STATUS_E_FAILURE; } - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, "TspecLen = %d, pbFrames = %p, pTspecIE = %p", tspecIeLen, pCsrConnectedInfo->pbFrames, pTspecIE); @@ -2997,13 +2997,13 @@ QDF_STATUS sme_qos_ese_process_reassoc_tspec_rsp(tpAniSirGlobal pMac, for (cnt = 0; cnt < numTspec; cnt++) { ac = sme_qos_up_to_ac(pTspecIE->user_priority); if (ac >= SME_QOS_EDCA_AC_MAX) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("ac %d more than it`s max value"), ac); return QDF_STATUS_E_FAILURE; } pACInfo = &pSession->ac_info[ac]; tspec_mask_status = pACInfo->tspec_mask_status; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, FL("UP=%d, ac=%d, tspec_mask_status=%x"), pTspecIE->user_priority, ac, tspec_mask_status); @@ -3011,7 +3011,7 @@ QDF_STATUS sme_qos_ese_process_reassoc_tspec_rsp(tpAniSirGlobal pMac, tspec_flow_index < SME_QOS_TSPEC_INDEX_MAX; tspec_flow_index++) { if (tspec_mask_status & (1 << tspec_flow_index)) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, FL ("Found Tspec entry flow = %d AC = %d"), @@ -3020,7 +3020,7 @@ QDF_STATUS sme_qos_ese_process_reassoc_tspec_rsp(tpAniSirGlobal pMac, pTspecIE, ac, tspec_flow_index); } else { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, FL ("Not found Tspec entry flow = %d AC = %d"), @@ -3088,7 +3088,7 @@ static void sme_qos_copy_tspec_info(tpAniSirGlobal pMac, pTspec->tsinfo.traffic.ackPolicy = pTspec_Info->ts_info.ack_policy; pTspec->type = SME_QOS_TSPEC_IE_TYPE; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: up = %d, tid = %d", __func__, __LINE__, pTspec_Info->ts_info.up, pTspec_Info->ts_info.tid); @@ -3217,7 +3217,7 @@ QDF_STATUS sme_qos_create_tspec_ricie(tpAniSirGlobal pMac, dot11f_pack_ie_ric_data_desc(pMac, &ricIE, pRICBuffer, sizeof(ricIE), pRICLength); if (DOT11F_FAILED(nStatus)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL ("Packing of RIC Data of length %d failed with status %d"), *pRICLength, nStatus); @@ -3258,7 +3258,7 @@ QDF_STATUS sme_qos_create_tspec_ricie(tpAniSirGlobal pMac, dot11f_pack_ie_ric_data_desc(pMac, &ricIE, pRICBuffer, sizeof(ricIE), pRICLength); if (DOT11F_FAILED(nStatus)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL ("Packing of RIC Data of length %d failed with status %d"), *pRICLength, nStatus); @@ -3286,7 +3286,7 @@ static QDF_STATUS sme_qos_process_ft_reassoc_req_ev( sme_QosFlowInfoEntry *flow_info = NULL; tListElem *entry = NULL; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL("Invoked on session %d"), sessionId); session = &sme_qos_cb.sessionInfo[sessionId]; @@ -3306,7 +3306,7 @@ static QDF_STATUS sme_qos_process_ft_reassoc_req_ev( && !ac_info->tspec_pending) || (ac_info-> tspec_mask_status & (1 << tspec_index))) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("Copying the currentQos to " "requestedQos for AC=%d, flow=%d"), @@ -3332,7 +3332,7 @@ static QDF_STATUS sme_qos_process_ft_reassoc_req_ev( SME_QOS_REQUESTED); break; default: - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("FT Reassoc req event in" " unexpected state %d"), @@ -3357,7 +3357,7 @@ static QDF_STATUS sme_qos_process_ft_reassoc_req_ev( */ entry = csr_ll_peek_head(&sme_qos_cb.flow_list, false); if (!entry) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, FL("Flow List empty, nothing to update")); return QDF_STATUS_E_FAILURE; } @@ -3365,7 +3365,7 @@ static QDF_STATUS sme_qos_process_ft_reassoc_req_ev( do { flow_info = GET_BASE_ADDR(entry, sme_QosFlowInfoEntry, link); if (sessionId == flow_info->sessionId) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL("Changing FlowID %d reason to SETUP" "and HO renewal to false"), flow_info->QosFlowID); @@ -3397,7 +3397,7 @@ static void sme_qos_fill_aggr_info(int ac_id, int ts_id, tSirAggrQosReq *msg, sme_QosSessionInfo *session) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, FL("Found tspec entry AC=%d, flow=%d, direction = %d"), ac_id, ts_id, direction); @@ -3447,7 +3447,7 @@ QDF_STATUS sme_qos_ft_aggr_qos_req(tpAniSirGlobal mac_ctx, uint8_t session_id) int i, j = 0; uint8_t direction; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL("invoked on session %d"), session_id); session = &sme_qos_cb.sessionInfo[session_id]; @@ -3456,7 +3456,7 @@ QDF_STATUS sme_qos_ft_aggr_qos_req(tpAniSirGlobal mac_ctx, uint8_t session_id) if (!aggr_req) { /* err msg */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("couldn't allocate memory for the msg buffer")); return QDF_STATUS_E_NOMEM; } @@ -3470,14 +3470,14 @@ QDF_STATUS sme_qos_ft_aggr_qos_req(tpAniSirGlobal mac_ctx, uint8_t session_id) aggr_req->rspReqd = true; cdf_mem_copy(&aggr_req->bssid.bytes[0], &session->assocInfo.pBssDesc->bssId[0], - sizeof(struct cdf_mac_addr)); + sizeof(struct qdf_mac_addr)); for (i = 0; i < SME_QOS_EDCA_AC_MAX; i++) { for (j = 0; j < SME_QOS_TSPEC_INDEX_MAX; j++) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("ac=%d, tspec_mask_staus=%x, tspec_index=%d"), i, session->ac_info[i].tspec_mask_status, j); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("direction = %d"), session->ac_info[i].addTsRsp[j].rsp.tspec. tsinfo.traffic.direction); @@ -3497,13 +3497,13 @@ QDF_STATUS sme_qos_ft_aggr_qos_req(tpAniSirGlobal mac_ctx, uint8_t session_id) } } - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("Sending aggregated message to HAL 0x%x"), aggr_req->aggrInfo.tspecIdx); if (QDF_IS_STATUS_SUCCESS(cds_send_mb_message_to_mac(aggr_req))) { status = QDF_STATUS_SUCCESS; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL("sent down a AGGR QoS req to PE")); } @@ -3585,7 +3585,7 @@ QDF_STATUS sme_qos_process_aggr_qos_rsp(tpAniSirGlobal mac_ctx, void *msgbuf) int i, j = 0; uint8_t sessionid = rsp->sessionId; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("Received AGGR_QOS resp from LIM")); /* Copy the updated response information for TSPEC of all the ACs */ @@ -3599,7 +3599,7 @@ QDF_STATUS sme_qos_process_aggr_qos_rsp(tpAniSirGlobal mac_ctx, void *msgbuf) ac_info[i].addTsRsp[j].rsp.tspec.tsinfo.traffic. direction; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("Addts rsp from LIM AC=%d, flow=%d dir=%d, tspecIdx=%x"), i, j, direction, rsp->aggrInfo.tspecIdx); @@ -3617,7 +3617,7 @@ QDF_STATUS sme_qos_process_aggr_qos_rsp(tpAniSirGlobal mac_ctx, void *msgbuf) addtsrsp.rsp.status = rsp->aggrInfo.aggrRsp[i].status; addtsrsp.rsp.tspec = rsp->aggrInfo.aggrRsp[i].tspec; - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("Processing Addts rsp from LIM AC=%d, flow=%d"), i, j); @@ -3661,7 +3661,7 @@ static QDF_STATUS sme_qos_find_matching_tspec(tpAniSirGlobal mac_ctx, continue; if (!*ric_rsplen) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("RIC Response not received for AC %d on " "TSPEC Index %d, RIC Req Identifier = %d"), ac, tspec_flow_index, @@ -3677,14 +3677,14 @@ static QDF_STATUS sme_qos_find_matching_tspec(tpAniSirGlobal mac_ctx, if (ric_data_desc->RICData.Identifier != ac_info->ricIdentifier[tspec_flow_index]) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("RIC response order not same as request sent. " "Request ID = %d, Response ID = %d"), ac_info->ricIdentifier[tspec_flow_index], ric_data_desc->RICData.Identifier); CDF_ASSERT(0); } else { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("Processing RIC Response for AC %d, " "TSPEC Flow index %d with RIC ID %d "), @@ -3694,7 +3694,7 @@ static QDF_STATUS sme_qos_find_matching_tspec(tpAniSirGlobal mac_ctx, sessionid, ric_data_desc, ac, tspec_flow_index); if (QDF_STATUS_SUCCESS != status) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Failed with status %d for AC %d in " "TSPEC Flow index = %d"), @@ -3749,7 +3749,7 @@ static QDF_STATUS sme_qos_find_matching_tspec_lfr3(tpAniSirGlobal mac_ctx, ac1 = sme_qos_up_to_ac( ric_data->WMMTSPEC.user_priority); if (ac == SME_QOS_EDCA_AC_MAX) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Invalid AC %d UP %d"), ac, ric_data->WMMTSPEC.user_priority); @@ -3762,7 +3762,7 @@ static QDF_STATUS sme_qos_find_matching_tspec_lfr3(tpAniSirGlobal mac_ctx, sessionid, ric_data, ac, tspec_flow_idx); if (QDF_STATUS_SUCCESS != status) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Failed with status %d for AC %d " "in TSPEC Flow index = %d"), @@ -3800,14 +3800,14 @@ QDF_STATUS sme_qos_process_ft_reassoc_rsp_ev(tpAniSirGlobal mac_ctx, #endif if (NULL == csr_session) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("The Session pointer is NULL")); return QDF_STATUS_E_FAILURE; } csr_conn_info = &csr_session->connectedInfo; ric_rsplen = csr_conn_info->nRICRspLength; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL("invoked on session %d"), sessionid); qos_session = &sme_qos_cb.sessionInfo[sessionid]; @@ -3827,14 +3827,14 @@ QDF_STATUS sme_qos_process_ft_reassoc_rsp_ev(tpAniSirGlobal mac_ctx, } if (ric_rsplen) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("RIC Resp still follows . Rem len = %d"), ric_rsplen); CDF_ASSERT(0); } #ifdef WLAN_FEATURE_ROAM_OFFLOAD } else { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("LFR3-11r Compare RIC in Reassoc Resp to find" " matching tspec in host.")); ric_data = ric_data_desc; @@ -3848,7 +3848,7 @@ QDF_STATUS sme_qos_process_ft_reassoc_rsp_ev(tpAniSirGlobal mac_ctx, ric_len); } } else { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("LFR3-11r ric_rsplen is zero or ric_data_desc is" " not present or wmmtspec is not present")); } @@ -3887,12 +3887,12 @@ QDF_STATUS sme_qos_add_ts_req(tpAniSirGlobal pMac, #ifdef FEATURE_WLAN_DIAG_SUPPORT WLAN_HOST_DIAG_EVENT_DEF(qos, host_event_wlan_qos_payload_type); #endif - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: invoked on session %d for AC %d", __func__, __LINE__, sessionId, ac); if (sessionId >= CSR_ROAM_SESSION_MAX) { /* err msg */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: sessionId(%d) is invalid", __func__, __LINE__, sessionId); return QDF_STATUS_E_FAILURE; @@ -3902,7 +3902,7 @@ QDF_STATUS sme_qos_add_ts_req(tpAniSirGlobal pMac, pMsg = (tSirAddtsReq *) cdf_mem_malloc(sizeof(tSirAddtsReq)); if (!pMsg) { /* err msg */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: couldn't allocate memory for the msg buffer", __func__, __LINE__); return QDF_STATUS_E_NOMEM; @@ -3953,7 +3953,7 @@ QDF_STATUS sme_qos_add_ts_req(tpAniSirGlobal pMac, pMsg->req.tspec.type = SME_QOS_TSPEC_IE_TYPE; /*Fill the BSSID pMsg->req.bssId */ if (NULL == pSession->assocInfo.pBssDesc) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: BSS descriptor is NULL so we don't send request to PE", __func__, __LINE__); cdf_mem_free(pMsg); @@ -3961,8 +3961,8 @@ QDF_STATUS sme_qos_add_ts_req(tpAniSirGlobal pMac, } cdf_mem_copy(&pMsg->bssid.bytes[0], &pSession->assocInfo.pBssDesc->bssId[0], - sizeof(struct cdf_mac_addr)); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + sizeof(struct qdf_mac_addr)); + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: up = %d, tid = %d", __func__, __LINE__, pTspec_Info->ts_info.up, pTspec_Info->ts_info.tid); @@ -3974,7 +3974,7 @@ QDF_STATUS sme_qos_add_ts_req(tpAniSirGlobal pMac, #endif if (QDF_IS_STATUS_SUCCESS(cds_send_mb_message_to_mac(pMsg))) { status = QDF_STATUS_SUCCESS; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: sent down a ADDTS req to PE", __func__, __LINE__); /* event: EVENT_WLAN_QOS */ @@ -4013,13 +4013,13 @@ QDF_STATUS sme_qos_del_ts_req(tpAniSirGlobal pMac, #ifdef FEATURE_WLAN_DIAG_SUPPORT WLAN_HOST_DIAG_EVENT_DEF(qos, host_event_wlan_qos_payload_type); #endif - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: invoked on session %d for AC %d", __func__, __LINE__, sessionId, ac); pMsg = (tSirDeltsReq *) cdf_mem_malloc(sizeof(tSirDeltsReq)); if (!pMsg) { /* err msg */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: couldn't allocate memory for the msg buffer", __func__, __LINE__); return QDF_STATUS_E_NOMEM; @@ -4063,7 +4063,7 @@ QDF_STATUS sme_qos_del_ts_req(tpAniSirGlobal pMac, pMsg->req.tspec.type = SME_QOS_TSPEC_IE_TYPE; /*Fill the BSSID pMsg->req.bssId */ if (NULL == pSession->assocInfo.pBssDesc) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: BSS descriptor is NULL so we don't send request to PE", __func__, __LINE__); cdf_mem_free(pMsg); @@ -4071,9 +4071,9 @@ QDF_STATUS sme_qos_del_ts_req(tpAniSirGlobal pMac, } cdf_mem_copy(&pMsg->bssid.bytes[0], &pSession->assocInfo.pBssDesc->bssId[0], - sizeof(struct cdf_mac_addr)); + sizeof(struct qdf_mac_addr)); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: up = %d, tid = %d", __func__, __LINE__, pTspecInfo->ts_info.up, pTspecInfo->ts_info.tid); @@ -4081,7 +4081,7 @@ QDF_STATUS sme_qos_del_ts_req(tpAniSirGlobal pMac, sizeof(sme_QosWmmTspecInfo)); if (QDF_IS_STATUS_SUCCESS(cds_send_mb_message_to_mac(pMsg))) { status = QDF_STATUS_SUCCESS; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: sme_qos_del_ts_req:Test: sent down a DELTS req to PE", __func__, __LINE__); /* event: EVENT_WLAN_QOS */ @@ -4126,14 +4126,14 @@ QDF_STATUS sme_qos_process_add_ts_rsp(tpAniSirGlobal pMac, void *pMsgBuf) pSession = &sme_qos_cb.sessionInfo[sessionId]; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: invoked on session %d for UP %d", __func__, __LINE__, sessionId, up); ac = sme_qos_up_to_ac(up); if (SME_QOS_EDCA_AC_MAX == ac) { /* err msg */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: invalid AC %d from UP %d", __func__, __LINE__, ac, up); @@ -4149,7 +4149,7 @@ QDF_STATUS sme_qos_process_add_ts_rsp(tpAniSirGlobal pMac, void *pMsgBuf) return QDF_STATUS_SUCCESS; } - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Invoked on session %d with return code %d", __func__, __LINE__, sessionId, paddts_rsp->rc); /* our outstanding request has been serviced */ @@ -4191,7 +4191,7 @@ QDF_STATUS sme_qos_process_del_ts_rsp(tpAniSirGlobal pMac, void *pMsgBuf) sme_QosSessionInfo *pSession; uint8_t sessionId = pDeltsRsp->sessionId; /* msg */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Invoked on session %d with return code %d", __func__, __LINE__, sessionId, pDeltsRsp->rc); pSession = &sme_qos_cb.sessionInfo[sessionId]; @@ -4229,13 +4229,13 @@ QDF_STATUS sme_qos_process_del_ts_ind(tpAniSirGlobal pMac, void *pMsgBuf) #ifdef FEATURE_WLAN_DIAG_SUPPORT WLAN_HOST_DIAG_EVENT_DEF(qos, host_event_wlan_qos_payload_type); #endif - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Invoked on session %d for UP %d", __func__, __LINE__, sessionId, up); ac = sme_qos_up_to_ac(up); if (SME_QOS_EDCA_AC_MAX == ac) { /* err msg */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: invalid AC %d from UP %d", __func__, __LINE__, ac, up); return QDF_STATUS_E_FAILURE; @@ -4252,7 +4252,7 @@ QDF_STATUS sme_qos_process_del_ts_ind(tpAniSirGlobal pMac, void *pMsgBuf) /* through the callback it registered per request */ if (!QDF_IS_STATUS_SUCCESS (sme_qos_find_all_in_flow_list(pMac, search_key, sme_qos_del_ts_ind_fnp))) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: no match found for ac = %d", __func__, __LINE__, search_key.key.ac_type); CDF_ASSERT(0); @@ -4285,7 +4285,7 @@ QDF_STATUS sme_qos_process_assoc_complete_ev(tpAniSirGlobal pMac, uint8_t sessio sme_QosACInfo *pACInfo; QDF_STATUS status = QDF_STATUS_E_FAILURE; sme_QosEdcaAcType ac = SME_QOS_EDCA_AC_BE; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: invoked on session %d", __func__, __LINE__, sessionId); pSession = &sme_qos_cb.sessionInfo[sessionId]; @@ -4300,31 +4300,31 @@ QDF_STATUS sme_qos_process_assoc_complete_ev(tpAniSirGlobal pMac, uint8_t sessio /* get the association info */ if (!pEvent_info) { /* err msg */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: pEvent_info is NULL", __func__, __LINE__); return status; } if (!((sme_QosAssocInfo *) pEvent_info)->pBssDesc) { /* err msg */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: pBssDesc is NULL", __func__, __LINE__); return status; } if ((pSession->assocInfo.pBssDesc) && (csr_is_bssid_match - (pMac, (struct cdf_mac_addr *) &pSession->assocInfo.pBssDesc->bssId, - (struct cdf_mac_addr *) &(((sme_QosAssocInfo *) pEvent_info)-> + (pMac, (struct qdf_mac_addr *) &pSession->assocInfo.pBssDesc->bssId, + (struct qdf_mac_addr *) &(((sme_QosAssocInfo *) pEvent_info)-> pBssDesc->bssId)))) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: assoc with the same BSS, no update needed", __func__, __LINE__); } else { status = sme_qos_save_assoc_info(pSession, pEvent_info); } } else { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: wrong state: BE %d, BK %d, VI %d, VO %d", __func__, __LINE__, pSession->ac_info[SME_QOS_EDCA_AC_BE].curr_state, @@ -4355,7 +4355,7 @@ QDF_STATUS sme_qos_process_assoc_complete_ev(tpAniSirGlobal pMac, uint8_t sessio case SME_QOS_HANDOFF: case SME_QOS_CLOSED: default: - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d AC %d is in wrong state %d", __func__, __LINE__, sessionId, ac, @@ -4384,13 +4384,13 @@ QDF_STATUS sme_qos_process_reassoc_req_ev(tpAniSirGlobal pMac, uint8_t sessionId sme_QosSessionInfo *pSession; sme_QosACInfo *pACInfo; sme_QosEdcaAcType ac; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: invoked on session %d", __func__, __LINE__, sessionId); pSession = &sme_qos_cb.sessionInfo[sessionId]; if (pSession->ftHandoffInProgress) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: no need for state transition, should " "already be in handoff state", __func__, __LINE__); if ((pSession->ac_info[0].curr_state != SME_QOS_HANDOFF) || @@ -4405,7 +4405,7 @@ QDF_STATUS sme_qos_process_reassoc_req_ev(tpAniSirGlobal pMac, uint8_t sessionId } if (pSession->handoffRequested) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: no need for state transition, should " "already be in handoff state", __func__, __LINE__); @@ -4424,7 +4424,7 @@ QDF_STATUS sme_qos_process_reassoc_req_ev(tpAniSirGlobal pMac, uint8_t sessionId } /* TBH: Assuming both handoff algo & 11r willn't be enabled at the same time */ if (pSession->ftHandoffInProgress) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: no need for state transition, should " "already be in handoff state", __func__, __LINE__); @@ -4454,7 +4454,7 @@ QDF_STATUS sme_qos_process_reassoc_req_ev(tpAniSirGlobal pMac, uint8_t sessionId case SME_QOS_CLOSED: case SME_QOS_INIT: default: - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d AC %d is in wrong state %d", __func__, __LINE__, sessionId, ac, pACInfo->curr_state); @@ -4547,7 +4547,7 @@ QDF_STATUS sme_qos_handle_handoff_state(tpAniSirGlobal mac_ctx, status = sme_qos_find_all_in_flow_list(mac_ctx, search_key, sme_qos_reassoc_success_ev_fnp); if (!QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("no match found for ac = %d"), search_key.key.ac_type); CDF_ASSERT(0); @@ -4582,11 +4582,11 @@ QDF_STATUS sme_qos_process_reassoc_success_ev(tpAniSirGlobal mac_ctx, sme_QosEdcaAcType ac; QDF_STATUS status = QDF_STATUS_E_FAILURE; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL("invoked on session %d"), sessionid); if (CSR_ROAM_SESSION_MAX <= sessionid) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("invoked on session %d"), sessionid); return status; } @@ -4602,19 +4602,19 @@ QDF_STATUS sme_qos_process_reassoc_success_ev(tpAniSirGlobal mac_ctx, /* get the association info */ if (!event_info) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("event_info is NULL")); return status; } if (!((sme_QosAssocInfo *) event_info)->pBssDesc) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("pBssDesc is NULL")); return status; } status = sme_qos_save_assoc_info(qos_session, event_info); if (status) - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("sme_qos_save_assoc_info() failed")); /* @@ -4670,7 +4670,7 @@ QDF_STATUS sme_qos_process_reassoc_success_ev(tpAniSirGlobal mac_ctx, case SME_QOS_REQUESTED: case SME_QOS_QOS_ON: default: - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("session %d AC %d is in wrong state %d"), sessionid, ac, ac_info->curr_state); CDF_ASSERT(0); @@ -4697,7 +4697,7 @@ QDF_STATUS sme_qos_process_reassoc_failure_ev(tpAniSirGlobal pMac, sme_QosSessionInfo *pSession; sme_QosACInfo *pACInfo; sme_QosEdcaAcType ac; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: invoked on session %d", __func__, __LINE__, sessionId); pSession = &sme_qos_cb.sessionInfo[sessionId]; @@ -4737,7 +4737,7 @@ QDF_STATUS sme_qos_process_reassoc_failure_ev(tpAniSirGlobal pMac, case SME_QOS_REQUESTED: case SME_QOS_QOS_ON: default: - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d AC %d is in wrong state %d", __func__, __LINE__, sessionId, ac, pACInfo->curr_state); @@ -4766,7 +4766,7 @@ QDF_STATUS sme_qos_process_handoff_assoc_req_ev(tpAniSirGlobal pMac, sme_QosSessionInfo *pSession; sme_QosACInfo *pACInfo; uint8_t ac; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: invoked on session %d", __func__, __LINE__, sessionId); pSession = &sme_qos_cb.sessionInfo[sessionId]; @@ -4781,7 +4781,7 @@ QDF_STATUS sme_qos_process_handoff_assoc_req_ev(tpAniSirGlobal pMac, case SME_QOS_HANDOFF: /* print error msg */ if (pSession->ftHandoffInProgress) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: %d: SME_QOS_CSR_HANDOFF_ASSOC_REQ received in " "SME_QOS_HANDOFF state with FT in progress", @@ -4792,7 +4792,7 @@ QDF_STATUS sme_qos_process_handoff_assoc_req_ev(tpAniSirGlobal pMac, case SME_QOS_CLOSED: case SME_QOS_INIT: default: - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d AC %d is in wrong state %d", __func__, __LINE__, sessionId, ac, pACInfo->curr_state); @@ -4834,7 +4834,7 @@ QDF_STATUS sme_qos_process_handoff_success_ev(tpAniSirGlobal pMac, sme_QosACInfo *pACInfo; uint8_t ac; QDF_STATUS status = QDF_STATUS_E_FAILURE; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: invoked on session %d", __func__, __LINE__, sessionId); pSession = &sme_qos_cb.sessionInfo[sessionId]; @@ -4865,7 +4865,7 @@ QDF_STATUS sme_qos_process_handoff_success_ev(tpAniSirGlobal pMac, state may be SME_QOS_REQUESTED */ if (pSession->ftHandoffInProgress) break; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d AC %d is in wrong state %d", __func__, __LINE__, sessionId, ac, pACInfo->curr_state); @@ -4892,7 +4892,7 @@ QDF_STATUS sme_qos_process_handoff_failure_ev(tpAniSirGlobal pMac, sme_QosSessionInfo *pSession; sme_QosACInfo *pACInfo; uint8_t ac; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: invoked on session %d", __func__, __LINE__, sessionId); pSession = &sme_qos_cb.sessionInfo[sessionId]; @@ -4925,7 +4925,7 @@ QDF_STATUS sme_qos_process_handoff_failure_ev(tpAniSirGlobal pMac, case SME_QOS_REQUESTED: case SME_QOS_QOS_ON: default: - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d AC %d is in wrong state %d", __func__, __LINE__, sessionId, ac, pACInfo->curr_state); @@ -4958,7 +4958,7 @@ QDF_STATUS sme_qos_process_disconnect_ev(tpAniSirGlobal pMac, uint8_t sessionId, void *pEvent_info) { sme_QosSessionInfo *pSession; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: invoked on session %d", __func__, __LINE__, sessionId); pSession = &sme_qos_cb.sessionInfo[sessionId]; @@ -4968,7 +4968,7 @@ QDF_STATUS sme_qos_process_disconnect_ev(tpAniSirGlobal pMac, uint8_t sessionId, */ if ((pSession->handoffRequested) && !pSession->ftHandoffInProgress) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: no need for state transition, should " "already be in handoff state", __func__, __LINE__); if ((pSession->ac_info[0].curr_state != SME_QOS_HANDOFF) || @@ -5019,12 +5019,12 @@ QDF_STATUS sme_qos_process_join_req_ev(tpAniSirGlobal pMac, uint8_t sessionId, { sme_QosSessionInfo *pSession; sme_QosEdcaAcType ac; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: invoked on session %d", __func__, __LINE__, sessionId); pSession = &sme_qos_cb.sessionInfo[sessionId]; if (pSession->handoffRequested) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: no need for state transition, should " "already be in handoff state", __func__, __LINE__); if ((pSession->ac_info[0].curr_state != SME_QOS_HANDOFF) || @@ -5077,11 +5077,11 @@ QDF_STATUS sme_qos_process_preauth_success_ind(tpAniSirGlobal mac_ctx, uint8_t tspec_mask_status = 0; uint8_t tspec_pending_status = 0; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL("invoked on SME session %d"), sessionid); if (NULL == sme_session) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("sme_session is NULL")); return QDF_STATUS_E_INVAL; } @@ -5102,7 +5102,7 @@ QDF_STATUS sme_qos_process_preauth_success_ind(tpAniSirGlobal mac_ctx, case SME_QOS_CLOSED: case SME_QOS_INIT: default: - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Session %d AC %d is in wrong state %d"), sessionid, ac, ac_info->curr_state); CDF_ASSERT(0); @@ -5118,7 +5118,7 @@ QDF_STATUS sme_qos_process_preauth_success_ind(tpAniSirGlobal mac_ctx, /* Data is accessed from saved PreAuth Rsp */ if (NULL == sme_session->ftSmeContext.psavedFTPreAuthRsp) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("psavedFTPreAuthRsp is NULL")); return QDF_STATUS_E_INVAL; } @@ -5144,7 +5144,7 @@ QDF_STATUS sme_qos_process_preauth_success_ind(tpAniSirGlobal mac_ctx, tspec_pending_status = ac_info->tspec_pending; tspec_mask_status = ac_info->tspec_mask_status; cdf_mem_zero(ac_info->ricIdentifier, SME_QOS_TSPEC_INDEX_MAX); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("AC %d ==> TSPEC status = %d, tspec pending = %d"), ac, tspec_mask_status, tspec_pending_status); @@ -5206,13 +5206,13 @@ QDF_STATUS sme_qos_process_add_ts_failure_rsp(tpAniSirGlobal pMac, uint8_t tspec_pending; sme_QosWmmUpType up = (sme_QosWmmUpType) pRsp->tspec.tsinfo.traffic.userPrio; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: invoked on session %d for UP %d", __func__, __LINE__, sessionId, up); ac = sme_qos_up_to_ac(up); if (SME_QOS_EDCA_AC_MAX == ac) { /* err msg */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: invalid AC %d from UP %d", __func__, __LINE__, ac, up); return QDF_STATUS_E_FAILURE; @@ -5222,7 +5222,7 @@ QDF_STATUS sme_qos_process_add_ts_failure_rsp(tpAniSirGlobal pMac, /* is there a TSPEC request pending on this AC? */ tspec_pending = pACInfo->tspec_pending; if (!tspec_pending) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d an AddTS is not pending on AC %d", __func__, __LINE__, sessionId, ac); CDF_ASSERT(0); @@ -5237,7 +5237,7 @@ QDF_STATUS sme_qos_process_add_ts_failure_rsp(tpAniSirGlobal pMac, if (!QDF_IS_STATUS_SUCCESS (sme_qos_find_all_in_flow_list (pMac, search_key, sme_qos_add_ts_failure_fnp))) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d no match found for ac = %d", __func__, __LINE__, sessionId, search_key.key.ac_type); @@ -5281,7 +5281,7 @@ static QDF_STATUS sme_qos_update_tspec_mask(uint8_t sessionid, sme_QosSessionInfo *qos_session; sme_QosACInfo *ac_info; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL("invoked on session %d for AC %d TSPEC %d"), sessionid, search_key.key.ac_type, new_tspec_mask); @@ -5290,7 +5290,7 @@ static QDF_STATUS sme_qos_update_tspec_mask(uint8_t sessionid, if (search_key.key.ac_type < SME_QOS_EDCA_AC_MAX) { ac_info = &qos_session->ac_info[search_key.key.ac_type]; } else { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL("Exceeded the array bounds")); CDF_ASSERT(0); return QDF_STATUS_E_FAILURE; @@ -5298,7 +5298,7 @@ static QDF_STATUS sme_qos_update_tspec_mask(uint8_t sessionid, list_elt = csr_ll_peek_head(&sme_qos_cb.flow_list, false); if (!list_elt) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Flow List empty, nothing to update")); return QDF_STATUS_E_FAILURE; } @@ -5317,7 +5317,7 @@ static QDF_STATUS sme_qos_update_tspec_mask(uint8_t sessionid, if ((search_key.key.ac_type == flow_info->ac_type) && (search_key.direction == flow_info->QoSInfo.ts_info.direction)) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL("Flow %d matches"), flow_info->QosFlowID); ac_info->num_flows[flow_info->tspec_mask - 1]--; @@ -5327,7 +5327,7 @@ static QDF_STATUS sme_qos_update_tspec_mask(uint8_t sessionid, } else if (search_key.index & SME_QOS_SEARCH_KEY_INDEX_5) { if ((search_key.key.ac_type == flow_info->ac_type) && (search_key.tspec_mask == flow_info->tspec_mask)) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL("Flow %d matches"), flow_info->QosFlowID); ac_info->num_flows[flow_info->tspec_mask - 1]--; @@ -5374,14 +5374,14 @@ QDF_STATUS sme_qos_process_add_ts_success_rsp(tpAniSirGlobal pMac, WLAN_HOST_DIAG_EVENT_DEF(qos, host_event_wlan_qos_payload_type); host_log_qos_tspec_pkt_type *log_ptr = NULL; #endif /* FEATURE_WLAN_DIAG_SUPPORT */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: invoked on session %d for UP %d", __func__, __LINE__, sessionId, up); pSession = &sme_qos_cb.sessionInfo[sessionId]; ac = sme_qos_up_to_ac(up); if (SME_QOS_EDCA_AC_MAX == ac) { /* err msg */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: invalid AC %d from UP %d", __func__, __LINE__, ac, up); return QDF_STATUS_E_FAILURE; @@ -5390,7 +5390,7 @@ QDF_STATUS sme_qos_process_add_ts_success_rsp(tpAniSirGlobal pMac, /* is there a TSPEC request pending on this AC? */ tspec_pending = pACInfo->tspec_pending; if (!tspec_pending) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d an AddTS is not pending on AC %d", __func__, __LINE__, sessionId, ac); return QDF_STATUS_E_FAILURE; @@ -5412,7 +5412,7 @@ QDF_STATUS sme_qos_process_add_ts_success_rsp(tpAniSirGlobal pMac, ~(1 << (SME_QOS_EDCA_AC_VO - ac)); } } else { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Exceeded the array bounds of pACInfo->requested_QosInfo", __func__, __LINE__); CDF_ASSERT(0); @@ -5464,7 +5464,7 @@ QDF_STATUS sme_qos_process_add_ts_success_rsp(tpAniSirGlobal pMac, pACInfo->curr_QoSInfo[tspec_pending - 1].medium_time = pRsp->tspec.mediumTime; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: On session %d AddTspec Medium Time %d", __func__, __LINE__, sessionId, pRsp->tspec.mediumTime); @@ -5510,7 +5510,7 @@ QDF_STATUS sme_qos_process_add_ts_success_rsp(tpAniSirGlobal pMac, if (!QDF_IS_STATUS_SUCCESS (sme_qos_find_all_in_flow_list (pMac, search_key, sme_qos_add_ts_success_fnp))) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d no match found for ac %d", __func__, __LINE__, sessionId, search_key.key.ac_type); @@ -5609,16 +5609,16 @@ QDF_STATUS sme_qos_aggregate_params(sme_QosWmmTspecInfo *pInput_Tspec_Info, sme_QosWmmTspecInfo *pUpdated_Tspec_Info) { sme_QosWmmTspecInfo TspecInfo; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: invoked", __func__, __LINE__); if (!pInput_Tspec_Info) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: input is NULL, nothing to aggregate", __func__, __LINE__); return QDF_STATUS_E_FAILURE; } if (!pCurrent_Tspec_Info) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Current is NULL, can't aggregate", __func__, __LINE__); return QDF_STATUS_E_FAILURE; @@ -5634,7 +5634,7 @@ QDF_STATUS sme_qos_aggregate_params(sme_QosWmmTspecInfo *pInput_Tspec_Info, (pCurrent_Tspec_Info->ts_info.direction != pInput_Tspec_Info->ts_info.direction)) { TspecInfo.min_service_interval = - CDF_MIN(pCurrent_Tspec_Info->min_service_interval, + QDF_MIN(pCurrent_Tspec_Info->min_service_interval, pInput_Tspec_Info->min_service_interval); } else if (pInput_Tspec_Info->min_service_interval) { TspecInfo.min_service_interval = @@ -5645,7 +5645,7 @@ QDF_STATUS sme_qos_aggregate_params(sme_QosWmmTspecInfo *pInput_Tspec_Info, (pCurrent_Tspec_Info->ts_info.direction != pInput_Tspec_Info->ts_info.direction)) { TspecInfo.max_service_interval = - CDF_MIN(pCurrent_Tspec_Info->max_service_interval, + QDF_MIN(pCurrent_Tspec_Info->max_service_interval, pInput_Tspec_Info->max_service_interval); } else { TspecInfo.max_service_interval = @@ -5664,14 +5664,14 @@ QDF_STATUS sme_qos_aggregate_params(sme_QosWmmTspecInfo *pInput_Tspec_Info, Max MSDU size : these sizes are `maxed' -------------------------------------------------------------------------*/ TspecInfo.maximum_msdu_size = - CDF_MAX(pCurrent_Tspec_Info->maximum_msdu_size, + QDF_MAX(pCurrent_Tspec_Info->maximum_msdu_size, pInput_Tspec_Info->maximum_msdu_size); /*------------------------------------------------------------------------- Inactivity interval : these sizes are `maxed' -------------------------------------------------------------------------*/ TspecInfo.inactivity_interval = - CDF_MAX(pCurrent_Tspec_Info->inactivity_interval, + QDF_MAX(pCurrent_Tspec_Info->inactivity_interval, pInput_Tspec_Info->inactivity_interval); /*------------------------------------------------------------------------- @@ -5680,12 +5680,12 @@ QDF_STATUS sme_qos_aggregate_params(sme_QosWmmTspecInfo *pInput_Tspec_Info, -------------------------------------------------------------------------*/ if (pCurrent_Tspec_Info->delay_bound) { TspecInfo.delay_bound = - CDF_MIN(pCurrent_Tspec_Info->delay_bound, + QDF_MIN(pCurrent_Tspec_Info->delay_bound, pInput_Tspec_Info->delay_bound); } else { TspecInfo.delay_bound = pInput_Tspec_Info->delay_bound; } - TspecInfo.max_burst_size = CDF_MAX(pCurrent_Tspec_Info->max_burst_size, + TspecInfo.max_burst_size = QDF_MAX(pCurrent_Tspec_Info->max_burst_size, pInput_Tspec_Info->max_burst_size); /*------------------------------------------------------------------------- @@ -5696,7 +5696,7 @@ QDF_STATUS sme_qos_aggregate_params(sme_QosWmmTspecInfo *pInput_Tspec_Info, These sizes are not added: but `maxed' -------------------------------------------------------------------------*/ TspecInfo.nominal_msdu_size = - CDF_MAX(pCurrent_Tspec_Info->nominal_msdu_size & ~SME_QOS_16BIT_MSB, + QDF_MAX(pCurrent_Tspec_Info->nominal_msdu_size & ~SME_QOS_16BIT_MSB, pInput_Tspec_Info->nominal_msdu_size & ~SME_QOS_16BIT_MSB); if (((pCurrent_Tspec_Info->nominal_msdu_size == 0) || @@ -5788,11 +5788,11 @@ static QDF_STATUS sme_qos_update_params(uint8_t sessionId, sme_QosACInfo *pACInfo; sme_QosFlowInfoEntry *flow_info = NULL; sme_QosWmmTspecInfo Tspec_Info; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: invoked on session %d for AC %d TSPEC %d", __func__, __LINE__, sessionId, ac, tspec_mask); if (!pTspec_Info) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: output is NULL, can't aggregate", __func__, __LINE__); return QDF_STATUS_E_FAILURE; @@ -5800,7 +5800,7 @@ static QDF_STATUS sme_qos_update_params(uint8_t sessionId, cdf_mem_zero(&Tspec_Info, sizeof(sme_QosWmmTspecInfo)); pEntry = csr_ll_peek_head(&sme_qos_cb.flow_list, false); if (!pEntry) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Flow List empty, nothing to update", __func__, __LINE__); return QDF_STATUS_E_FAILURE; @@ -5820,14 +5820,14 @@ static QDF_STATUS sme_qos_update_params(uint8_t sessionId, if ((sessionId == flow_info->sessionId) && (ac == flow_info->ac_type) && (tspec_mask == flow_info->tspec_mask)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Flow %d matches", __func__, __LINE__, flow_info->QosFlowID); if ((SME_QOS_REASON_RELEASE == flow_info->reason) || (SME_QOS_REASON_MODIFY == flow_info->reason)) { /* msg */ - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Skipping Flow %d as it is marked " "for release/modify", __func__, @@ -5837,7 +5837,7 @@ static QDF_STATUS sme_qos_update_params(uint8_t sessionId, (sme_qos_aggregate_params (&flow_info->QoSInfo, &Tspec_Info, NULL))) { /* err msg */ - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: sme_qos_aggregate_params() failed", __func__, __LINE__); @@ -5866,7 +5866,7 @@ sme_QosWmmUpType sme_qos_ac_to_up(sme_QosEdcaAcType ac) if (ac >= 0 && ac < SME_QOS_EDCA_AC_MAX) { up = sme_qos_a_cto_up_map[ac]; } - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, "%s: %d: ac = %d up = %d returned", __func__, __LINE__, ac, up); return up; @@ -5886,7 +5886,7 @@ sme_QosEdcaAcType sme_qos_up_to_ac(sme_QosWmmUpType up) if (up >= 0 && up < SME_QOS_WMM_UP_MAX) { ac = sme_qos_u_pto_ac_map[up]; } - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, "%s: %d: up = %d ac = %d returned", __func__, __LINE__, up, ac); return ac; @@ -5914,7 +5914,7 @@ static void sme_qos_state_transition(uint8_t sessionId, pACInfo = &pSession->ac_info[ac]; pACInfo->prev_state = pACInfo->curr_state; pACInfo->curr_state = new_state; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: On session %d new state=%d, old state=%d, for AC=%d", __func__, __LINE__, sessionId, pACInfo->curr_state, pACInfo->prev_state, ac); @@ -5940,7 +5940,7 @@ tListElem *sme_qos_find_in_flow_list(sme_QosSearchInfo search_key) list_elt = csr_ll_peek_head(&sme_qos_cb.flow_list, false); if (!list_elt) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Flow List empty, can't search")); return NULL; } @@ -5958,21 +5958,21 @@ tListElem *sme_qos_find_in_flow_list(sme_QosSearchInfo search_key) if (search_key.index & SME_QOS_SEARCH_KEY_INDEX_1) { if (search_key.key.QosFlowID == flow_info->QosFlowID) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL("match found on flowID, ending search")); break; } } else if (search_key.index & SME_QOS_SEARCH_KEY_INDEX_2) { if (search_key.key.ac_type == flow_info->ac_type) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL("match found on ac, ending search")); break; } } else if (search_key.index & SME_QOS_SEARCH_KEY_INDEX_3) { if (search_key.key.reason == flow_info->reason) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL("match found on reason, ending search")); break; @@ -5981,7 +5981,7 @@ tListElem *sme_qos_find_in_flow_list(sme_QosSearchInfo search_key) if ((search_key.key.ac_type == flow_info->ac_type) && (search_key.direction == flow_info->QoSInfo.ts_info.direction)) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL("match found on reason, ending search")); break; @@ -6019,7 +6019,7 @@ QDF_STATUS sme_qos_find_all_in_flow_list(tpAniSirGlobal mac_ctx, list_elt = csr_ll_peek_head(&sme_qos_cb.flow_list, false); if (!list_elt) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Flow List empty, can't search")); return QDF_STATUS_E_FAILURE; } @@ -6037,25 +6037,25 @@ QDF_STATUS sme_qos_find_all_in_flow_list(tpAniSirGlobal mac_ctx, if ((search_key.index & SME_QOS_SEARCH_KEY_INDEX_1) && (search_key.key.QosFlowID == flow_info->QosFlowID)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL("match found on flowID, ending search")); status = fnp(mac_ctx, list_elt); if (QDF_STATUS_E_FAILURE == status) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Failed to process entry")); break; } } else if ((search_key.index & SME_QOS_SEARCH_KEY_INDEX_2) && (search_key.key.ac_type == flow_info->ac_type)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL("match found on ac, ending search")); ac_type = flow_info->ac_type; flow_info->hoRenewal = qos_session->ac_info[ac_type].hoRenewal; status = fnp(mac_ctx, list_elt); if (QDF_STATUS_E_FAILURE == status) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Failed to process entry")); break; @@ -6082,7 +6082,7 @@ bool sme_qos_is_acm(tpAniSirGlobal pMac, tSirBssDescription *pSirBssDesc, bool ret_val = false; tDot11fBeaconIEs *pIesLocal; if (!pSirBssDesc) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: pSirBssDesc is NULL", __func__, __LINE__); return false; } @@ -6096,7 +6096,7 @@ bool sme_qos_is_acm(tpAniSirGlobal pMac, tSirBssDescription *pSirBssDesc, (csr_get_parsed_bss_description_ies (pMac, pSirBssDesc, &pIesLocal))) { /* err msg */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: csr_get_parsed_bss_description_ies() failed", __func__, __LINE__); return false; @@ -6124,7 +6124,7 @@ bool sme_qos_is_acm(tpAniSirGlobal pMac, tSirBssDescription *pSirBssDesc, ret_val = true; break; default: - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: unknown AC = %d", __func__, __LINE__, ac); /* Assert */ @@ -6132,7 +6132,7 @@ bool sme_qos_is_acm(tpAniSirGlobal pMac, tSirBssDescription *pSirBssDesc, break; } } /* IS_QOS_BSS */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: ACM = %d for AC = %d", __func__, __LINE__, ret_val, ac); if (NULL == pIes) { @@ -6163,7 +6163,7 @@ static QDF_STATUS sme_qos_buffer_existing_flows(tpAniSirGlobal mac_ctx, list_entry = csr_ll_peek_head(&sme_qos_cb.flow_list, false); if (!list_entry) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL("Flow List empty, nothing to buffer")); return QDF_STATUS_E_FAILURE; } @@ -6198,13 +6198,13 @@ static QDF_STATUS sme_qos_buffer_existing_flows(tpAniSirGlobal mac_ctx, if (!QDF_IS_STATUS_SUCCESS (sme_qos_buffer_cmd(&cmd, true))) - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("couldn't buffer the setup request" " for flow %d in handoff state"), flow_info->QosFlowID); else - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL("buffered a setup request for " "flow %d in handoff state"), @@ -6216,13 +6216,13 @@ static QDF_STATUS sme_qos_buffer_existing_flows(tpAniSirGlobal mac_ctx, cmd.u.releaseCmdInfo.QosFlowID = flow_info->QosFlowID; if (!QDF_IS_STATUS_SUCCESS (sme_qos_buffer_cmd(&cmd, true))) - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("couldn't buffer the release req" " for flow %d in handoff state"), flow_info->QosFlowID); else - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL("buffered a release request for " "flow %d in handoff state"), @@ -6236,20 +6236,20 @@ static QDF_STATUS sme_qos_buffer_existing_flows(tpAniSirGlobal mac_ctx, cmd.u.modifyCmdInfo.QoSInfo = flow_info->QoSInfo; if (!QDF_IS_STATUS_SUCCESS (sme_qos_buffer_cmd(&cmd, true))) - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("couldn't buffer the modify req" " for flow %d in handoff state"), flow_info->QosFlowID); else - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL("buffered a modify request for " "flow %d in handoff state"), flow_info->QosFlowID); } /* delete the entry from Flow List */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL("Deleting original entry at %p with flowID %d"), flow_info, flow_info->QosFlowID); csr_ll_remove_entry(&sme_qos_cb.flow_list, list_entry, true); @@ -6278,7 +6278,7 @@ static QDF_STATUS sme_qos_delete_existing_flows(tpAniSirGlobal pMac, sme_QosFlowInfoEntry *flow_info = NULL; pEntry = csr_ll_peek_head(&sme_qos_cb.flow_list, true); if (!pEntry) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, "%s: %d: Flow List empty, nothing to delete", __func__, __LINE__); return QDF_STATUS_E_FAILURE; @@ -6297,7 +6297,7 @@ static QDF_STATUS sme_qos_delete_existing_flows(tpAniSirGlobal pMac, SME_QOS_STATUS_RELEASE_QOS_LOST_IND, flow_info->QosFlowID); } - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Deleting entry at %p with flowID %d", __func__, __LINE__, flow_info, flow_info->QosFlowID); @@ -6326,13 +6326,13 @@ QDF_STATUS sme_qos_buffer_cmd(sme_QosCmdInfo *pcmd, bool insert_head) { sme_QosSessionInfo *pSession; sme_QosCmdInfoEntry *pentry = NULL; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Invoked", __func__, __LINE__); pentry = (sme_QosCmdInfoEntry *) cdf_mem_malloc(sizeof(sme_QosCmdInfoEntry)); if (!pentry) { /* err msg */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Memory allocation failure", __func__, __LINE__); return QDF_STATUS_E_NOMEM; @@ -6369,14 +6369,14 @@ static QDF_STATUS sme_qos_process_buffered_cmd(uint8_t session_id) QDF_STATUS cdf_ret_status = QDF_STATUS_SUCCESS; sme_QosCmdInfo *qos_cmd = NULL; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL("Invoked on session %d"), session_id); qos_session = &sme_qos_cb.sessionInfo[session_id]; if (!csr_ll_is_list_empty(&qos_session->bufferedCommandList, false)) { list_elt = csr_ll_remove_head(&qos_session->bufferedCommandList, true); if (!list_elt) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("no more buffered commands on session %d"), session_id); qos_session->readyForPowerSave = true; @@ -6395,7 +6395,7 @@ static QDF_STATUS sme_qos_process_buffered_cmd(uint8_t session_id) qos_cmd->u.setupCmdInfo.QosFlowID, true, qos_cmd->u.setupCmdInfo.hoRenewal); if (SME_QOS_STATUS_SETUP_FAILURE_RSP == hdd_status) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("sme_qos_internal_setup_req failed on session %d"), session_id); @@ -6407,7 +6407,7 @@ static QDF_STATUS sme_qos_process_buffered_cmd(uint8_t session_id) qos_cmd->u.releaseCmdInfo.QosFlowID, true); if (SME_QOS_STATUS_RELEASE_FAILURE_RSP == hdd_status) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("sme_qos_internal_release_req failed on session %d"), session_id); @@ -6421,7 +6421,7 @@ static QDF_STATUS sme_qos_process_buffered_cmd(uint8_t session_id) true); if (SME_QOS_STATUS_MODIFY_SETUP_FAILURE_RSP == hdd_status) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("sme_qos_internal_modify_req failed on session %d"), session_id); @@ -6436,7 +6436,7 @@ static QDF_STATUS sme_qos_process_buffered_cmd(uint8_t session_id) qos_cmd->u.resendCmdInfo.tspecMask); if (SME_QOS_STATUS_MODIFY_SETUP_FAILURE_RSP == hdd_status) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("sme_qos_re_request_add_ts failed on session %d"), session_id); @@ -6444,7 +6444,7 @@ static QDF_STATUS sme_qos_process_buffered_cmd(uint8_t session_id) } break; default: - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("On session %d unknown cmd = %d"), session_id, qos_cmd->command); CDF_ASSERT(0); @@ -6453,7 +6453,7 @@ static QDF_STATUS sme_qos_process_buffered_cmd(uint8_t session_id) /* buffered command has been processed, reclaim the memory */ cdf_mem_free(pcmd); } else { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL("cmd buffer empty")); qos_session->readyForPowerSave = true; } @@ -6475,13 +6475,13 @@ static QDF_STATUS sme_qos_delete_buffered_requests(tpAniSirGlobal pMac, sme_QosSessionInfo *pSession; sme_QosCmdInfoEntry *pcmd = NULL; tListElem *pEntry = NULL, *pNextEntry = NULL; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Invoked on session %d", __func__, __LINE__, sessionId); pSession = &sme_qos_cb.sessionInfo[sessionId]; pEntry = csr_ll_peek_head(&pSession->bufferedCommandList, true); if (!pEntry) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, "%s: %d: Buffered List empty, nothing to delete on session %d", __func__, __LINE__, sessionId); return QDF_STATUS_E_FAILURE; @@ -6489,7 +6489,7 @@ static QDF_STATUS sme_qos_delete_buffered_requests(tpAniSirGlobal pMac, while (pEntry) { pNextEntry = csr_ll_next(&pSession->bufferedCommandList, pEntry, true); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: %d: deleting entry from buffered List", __func__, __LINE__); /* delete the entry from Flow List */ @@ -6522,7 +6522,7 @@ QDF_STATUS sme_qos_save_assoc_info(sme_QosSessionInfo *pSession, tSirBssDescription *pBssDesc = NULL; uint32_t bssLen = 0; if (NULL == pAssoc_info) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: pAssoc_info is NULL", __func__, __LINE__); return QDF_STATUS_E_FAILURE; } @@ -6536,7 +6536,7 @@ QDF_STATUS sme_qos_save_assoc_info(sme_QosSessionInfo *pSession, /* save the bss Descriptor */ pBssDesc = (tSirBssDescription *) cdf_mem_malloc(bssLen); if (!pBssDesc) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: couldn't allocate memory for the bss Descriptor", __func__, __LINE__); return QDF_STATUS_E_NOMEM; @@ -6570,7 +6570,7 @@ QDF_STATUS sme_qos_setup_fnp(tpAniSirGlobal pMac, tListElem *pEntry) sme_QosStatusType hdd_status = SME_QOS_STATUS_SETUP_MODIFIED_IND; sme_QosEdcaAcType ac; if (!pEntry) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Entry is NULL", __func__, __LINE__); CDF_ASSERT(0); return QDF_STATUS_E_FAILURE; @@ -6585,7 +6585,7 @@ QDF_STATUS sme_qos_setup_fnp(tpAniSirGlobal pMac, tListElem *pEntry) &pACInfo->curr_QoSInfo[flow_info-> tspec_mask - 1], hdd_status, flow_info->QosFlowID); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Entry with flowID = %d getting notified", __func__, __LINE__, flow_info->QosFlowID); } @@ -6611,7 +6611,7 @@ QDF_STATUS sme_qos_modification_notify_fnp(tpAniSirGlobal pMac, tListElem *pEntr sme_QosStatusType hdd_status = SME_QOS_STATUS_SETUP_MODIFIED_IND; sme_QosEdcaAcType ac; if (!pEntry) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Entry is NULL", __func__, __LINE__); CDF_ASSERT(0); return QDF_STATUS_E_FAILURE; @@ -6626,7 +6626,7 @@ QDF_STATUS sme_qos_modification_notify_fnp(tpAniSirGlobal pMac, tListElem *pEntr &pACInfo->curr_QoSInfo[flow_info-> tspec_mask - 1], hdd_status, flow_info->QosFlowID); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Entry with flowID = %d getting notified", __func__, __LINE__, flow_info->QosFlowID); } @@ -6648,7 +6648,7 @@ QDF_STATUS sme_qos_modify_fnp(tpAniSirGlobal pMac, tListElem *pEntry) { sme_QosFlowInfoEntry *flow_info = NULL; if (!pEntry) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Entry is NULL", __func__, __LINE__); CDF_ASSERT(0); return QDF_STATUS_E_FAILURE; @@ -6661,7 +6661,7 @@ QDF_STATUS sme_qos_modify_fnp(tpAniSirGlobal pMac, tListElem *pEntry) break; case SME_QOS_REASON_MODIFY: /* delete the original entry from Flow List */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Deleting original entry at %p with flowID %d", __func__, __LINE__, flow_info, flow_info->QosFlowID); csr_ll_remove_entry(&sme_qos_cb.flow_list, pEntry, true); @@ -6696,7 +6696,7 @@ QDF_STATUS sme_qos_del_ts_ind_fnp(tpAniSirGlobal pMac, tListElem *pEntry) sme_QosStatusType status; if (!pEntry) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Entry is NULL", __func__, __LINE__); CDF_ASSERT(0); return QDF_STATUS_E_FAILURE; @@ -6710,7 +6710,7 @@ QDF_STATUS sme_qos_del_ts_ind_fnp(tpAniSirGlobal pMac, tListElem *pEntry) lock_status = sme_acquire_global_lock(&pMac->sme); if (!QDF_IS_STATUS_SUCCESS(lock_status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Unable to obtain lock", __func__, __LINE__); return SME_QOS_STATUS_RELEASE_FAILURE_RSP; } @@ -6718,7 +6718,7 @@ QDF_STATUS sme_qos_del_ts_ind_fnp(tpAniSirGlobal pMac, tListElem *pEntry) status = sme_qos_internal_release_req(pMac, flow_info->QosFlowID, false); sme_release_global_lock(&pMac->sme); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: QoS Release return status on Flow %d is %d", __func__, __LINE__, flow_info->QosFlowID, status); @@ -6749,7 +6749,7 @@ sme_qos_reassoc_success_ev_fnp(tpAniSirGlobal mac_ctx, sme_QosEdcaAcType ac; QDF_STATUS pmc_status = QDF_STATUS_E_FAILURE; if (!entry) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Entry is NULL", __func__, __LINE__); CDF_ASSERT(0); return QDF_STATUS_E_FAILURE; @@ -6843,7 +6843,7 @@ sme_qos_reassoc_success_ev_fnp(tpAniSirGlobal mac_ctx, } } else { /* delete the entry from Flow List */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL("Deleting entry at %p with flowID %d"), flow_info, flow_info->QosFlowID); csr_ll_remove_entry(&sme_qos_cb.flow_list, entry, true); @@ -6880,7 +6880,7 @@ QDF_STATUS sme_qos_add_ts_failure_fnp(tpAniSirGlobal pMac, tListElem *pEntry) sme_QosStatusType hdd_status = SME_QOS_STATUS_SETUP_FAILURE_RSP; sme_QosEdcaAcType ac; if (!pEntry) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Entry is NULL", __func__, __LINE__); CDF_ASSERT(0); return QDF_STATUS_E_FAILURE; @@ -6930,7 +6930,7 @@ QDF_STATUS sme_qos_add_ts_failure_fnp(tpAniSirGlobal pMac, tListElem *pEntry) flow_info->QosFlowID); } /* delete the entry from Flow List */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Deleting entry at %p with flowID %d", __func__, __LINE__, flow_info, flow_info->QosFlowID); csr_ll_remove_entry(&sme_qos_cb.flow_list, pEntry, true); @@ -6977,7 +6977,7 @@ QDF_STATUS sme_qos_add_ts_success_fnp(tpAniSirGlobal mac_ctx, uint8_t tspec_index; if (!entry) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Entry is NULL")); CDF_ASSERT(0); return QDF_STATUS_E_FAILURE; @@ -6988,7 +6988,7 @@ QDF_STATUS sme_qos_add_ts_success_fnp(tpAniSirGlobal mac_ctx, ac_info = &qos_session->ac_info[ac]; tspec_index = ac_info->tspec_pending - 1; if (flow_info->tspec_mask != ac_info->tspec_pending) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL(" No need to notify the HDD, the ADDTS " "success is not for index = %d of the AC = %d"), flow_info->tspec_mask, ac); @@ -7110,7 +7110,7 @@ QDF_STATUS sme_qos_add_ts_success_fnp(tpAniSirGlobal mac_ctx, } } if (delete_entry) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL("Deleting entry at %p with flowID %d"), flow_info, flow_info->QosFlowID); /* delete the entry from Flow List */ @@ -7168,7 +7168,7 @@ void sme_qos_update_hand_off(uint8_t sessionId, bool updateHandOff) { sme_QosSessionInfo *pSession; pSession = &sme_qos_cb.sessionInfo[sessionId]; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, "%s: %d: handoffRequested %d updateHandOff %d", __func__, __LINE__, pSession->handoffRequested, updateHandOff); @@ -7242,7 +7242,7 @@ QDF_STATUS sme_offload_qos_process_out_of_uapsd_mode(tpAniSirGlobal pMac, pEntry = csr_ll_peek_head(&sme_qos_cb.flow_list, false); if (!pEntry) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Flow List empty, can't search", __func__, __LINE__); return QDF_STATUS_E_FAILURE; @@ -7277,7 +7277,7 @@ QDF_STATUS sme_offload_qos_process_into_uapsd_mode(tpAniSirGlobal pMac, pEntry = csr_ll_peek_head(&sme_qos_cb.flow_list, false); if (!pEntry) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Flow List empty, can't search", __func__, __LINE__); return QDF_STATUS_E_FAILURE; @@ -7348,7 +7348,7 @@ bool sme_qos_is_ts_info_ack_policy_valid(tpAniSirGlobal pMac, sme_QosSessionInfo *pSession; QDF_STATUS hstatus; if (!CSR_IS_SESSION_VALID(pMac, sessionId)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Session Id %d is invalid", __func__, __LINE__, sessionId); return false; @@ -7357,14 +7357,14 @@ bool sme_qos_is_ts_info_ack_policy_valid(tpAniSirGlobal pMac, pSession = &sme_qos_cb.sessionInfo[sessionId]; if (!pSession->sessionActive) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Session %d is inactive", __func__, __LINE__, sessionId); return false; } if (!pSession->assocInfo.pBssDesc) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Session %d has an Invalid BSS Descriptor", __func__, __LINE__, sessionId); return false; @@ -7374,7 +7374,7 @@ bool sme_qos_is_ts_info_ack_policy_valid(tpAniSirGlobal pMac, pSession->assocInfo.pBssDesc, &pIes); if (!QDF_IS_STATUS_SUCCESS(hstatus)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d unable to parse BSS IEs", __func__, __LINE__, sessionId); return false; @@ -7385,7 +7385,7 @@ bool sme_qos_is_ts_info_ack_policy_valid(tpAniSirGlobal pMac, if (!pIes->HTCaps.present && pQoSInfo->ts_info.ack_policy == SME_QOS_WMM_TS_ACK_POLICY_HT_IMMEDIATE_BLOCK_ACK) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d HT Caps aren't present but application set ack policy to HT ", __func__, __LINE__, sessionId); @@ -7424,7 +7424,7 @@ static QDF_STATUS qos_issue_command(tpAniSirGlobal pMac, uint8_t sessionId, do { pCommand = sme_get_command_buffer(pMac); if (!pCommand) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: fail to get command buffer for command %d", __func__, __LINE__, cmdType); break; @@ -7438,7 +7438,7 @@ static QDF_STATUS qos_issue_command(tpAniSirGlobal pMac, uint8_t sessionId, pCommand->u.qosCmd.tspecInfo = *pQoSInfo; pCommand->u.qosCmd.ac = ac; } else { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: NULL pointer passed", __func__, __LINE__); @@ -7451,7 +7451,7 @@ static QDF_STATUS qos_issue_command(tpAniSirGlobal pMac, uint8_t sessionId, pCommand->u.qosCmd.tspec_mask = tspec_mask; break; default: - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: invalid command type %d", __func__, __LINE__, cmdType); status = QDF_STATUS_E_INVAL; @@ -7492,7 +7492,7 @@ bool qos_process_command(tpAniSirGlobal pMac, tSmeCmd *pCommand) } break; default: - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: invalid command type %d", __func__, __LINE__, pCommand->command); break; @@ -7524,7 +7524,7 @@ sme_QosStatusType sme_qos_re_request_add_ts(tpAniSirGlobal mac_ctx, sme_QosStatusType status = SME_QOS_STATUS_MODIFY_SETUP_FAILURE_RSP; sme_QosCmdInfo cmd; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL(" Invoked on session %d for AC %d TSPEC %d"), session_id, ac, tspec_mask); session = &sme_qos_cb.sessionInfo[session_id]; @@ -7541,7 +7541,7 @@ sme_QosStatusType sme_qos_re_request_add_ts(tpAniSirGlobal mac_ctx, * followed by Reassoc. */ if (sme_qos_is_rsp_pending(session_id, ac)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL(" On session %d buffering the AddTS request " "for AC %d in state %d as Addts is pending " "on other AC or waiting for full power"), @@ -7555,7 +7555,7 @@ sme_QosStatusType sme_qos_re_request_add_ts(tpAniSirGlobal mac_ctx, cmd.u.resendCmdInfo.tspecMask = tspec_mask; cmd.u.resendCmdInfo.QoSInfo = *qos_info; if (!QDF_IS_STATUS_SUCCESS(sme_qos_buffer_cmd(&cmd, false))) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("On session %d unable to buffer the AddTS " "request for AC %d TSPEC %d in state %d"), @@ -7576,9 +7576,9 @@ sme_QosStatusType sme_qos_re_request_add_ts(tpAniSirGlobal mac_ctx, /* if ACM, send out a new ADDTS */ ac_info->hoRenewal = true; status = sme_qos_setup(mac_ctx, session_id, qos_info, ac); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL("sme_qos_setup returned in SME_QOS_QOS_ON state")); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL("sme_qos_setup AC %d with status =%d"), ac, status); if (SME_QOS_STATUS_SETUP_REQ_PENDING_RSP != status) { /* we aren't waiting for a response from the AP */ @@ -7594,11 +7594,11 @@ sme_QosStatusType sme_qos_re_request_add_ts(tpAniSirGlobal mac_ctx, status) || (SME_QOS_STATUS_SETUP_SUCCESS_IND_APSD_PENDING == status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("UAPSD is setup already status = %d "), status); } else { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("sme_qos_setup return status = %d "), status); } @@ -7606,7 +7606,7 @@ sme_QosStatusType sme_qos_re_request_add_ts(tpAniSirGlobal mac_ctx, break; case SME_QOS_HANDOFF: case SME_QOS_REQUESTED: - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Re-Add request in state = %d buffer the request"), ac_info->curr_state); cmd.command = SME_QOS_RESEND_REQ; @@ -7616,7 +7616,7 @@ sme_QosStatusType sme_qos_re_request_add_ts(tpAniSirGlobal mac_ctx, cmd.u.resendCmdInfo.tspecMask = tspec_mask; cmd.u.resendCmdInfo.QoSInfo = *qos_info; if (!QDF_IS_STATUS_SUCCESS(sme_qos_buffer_cmd(&cmd, false))) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL(" couldn't buf the read request state = %d"), ac_info->curr_state); /* unable to buffer the request @@ -7631,7 +7631,7 @@ sme_QosStatusType sme_qos_re_request_add_ts(tpAniSirGlobal mac_ctx, case SME_QOS_LINK_UP: default: /* print error msg, */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("ReAdd request in unexpected state = %d"), ac_info->curr_state); /* unable to service the request @@ -7666,7 +7666,7 @@ static QDF_STATUS sme_qos_request_reassoc(tpAniSirGlobal pMac, uint8_t sessionId sme_QosSessionInfo *pSession; sme_QosACInfo *pACInfo; QDF_STATUS status; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Invoked on session %d with UAPSD mask 0x%X", __func__, __LINE__, sessionId, pModFields->uapsd_mask); pSession = &sme_qos_cb.sessionInfo[sessionId]; @@ -7678,7 +7678,7 @@ static QDF_STATUS sme_qos_request_reassoc(tpAniSirGlobal pMac, uint8_t sessionId sme_QosEdcaAcType ac; for (ac = SME_QOS_EDCA_AC_BE; ac < SME_QOS_EDCA_AC_MAX; ac++) { pACInfo = &pSession->ac_info[ac]; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: %d: AC[%d] is in state [%d]", __func__, __LINE__, ac, pACInfo->curr_state); /* If it is already in HANDOFF state, don't do anything since we */ @@ -7700,7 +7700,7 @@ static uint32_t sme_qos_assign_flow_id(void) if (SME_QOS_MAX_FLOW_ID == flowId) { /* The Flow ID wrapped. This is obviously not a real life scenario */ /* but handle it to keep the software test folks happy */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, "%s: %d: Software Test made the flow counter wrap, " "QoS may no longer be functional", __func__, __LINE__); diff --git a/core/sme/src/rrm/sme_rrm.c b/core/sme/src/rrm/sme_rrm.c index f6fa055d23..a29ca96489 100644 --- a/core/sme/src/rrm/sme_rrm.c +++ b/core/sme/src/rrm/sme_rrm.c @@ -72,7 +72,7 @@ #define RRM_ROAM_SCORE_NEIGHBOR_IAPP_LIST 30 #endif -v_TIME_t rrm_scan_timer; +unsigned long rrm_scan_timer; /** * rrm_ll_purge_neighbor_cache() -Purges all the entries in the neighbor cache @@ -209,7 +209,7 @@ sme_rrm_send_beacon_report_xmit_ind(tpAniSirGlobal mac_ctx, beacon_rep->duration = rrm_ctx->duration[0]; beacon_rep->regClass = rrm_ctx->regClass; cdf_mem_copy(beacon_rep->bssId, rrm_ctx->sessionBssId.bytes, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); i = 0; while (cur_result) { @@ -446,7 +446,7 @@ static QDF_STATUS sme_rrm_send_scan_result(tpAniSirGlobal mac_ctx, cdf_mem_zero(scanresults_arr, sizeof(next_result) * SIR_BCN_REPORT_MAX_BSS_DESC); filter.BSSIDs.numOfBSSIDs = 1; - filter.BSSIDs.bssid = (struct cdf_mac_addr *)&rrm_ctx->bssId; + filter.BSSIDs.bssid = (struct qdf_mac_addr *)&rrm_ctx->bssId; if (rrm_ctx->ssId.length) { filter.SSIDs.SSIDList = @@ -679,7 +679,7 @@ QDF_STATUS sme_rrm_issue_scan_req(tpAniSirGlobal mac_ctx) scan_req.bcnRptReqScan = true; scan_req.scanType = scan_type; cdf_mem_copy(&scan_req.bssid.bytes, sme_rrm_ctx->bssId, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); if (sme_rrm_ctx->ssId.length) { scan_req.SSIDs.numOfSSIDs = 1; scan_req.SSIDs.SSIDList = @@ -905,7 +905,7 @@ QDF_STATUS sme_rrm_process_beacon_report_req_ind(tpAniSirGlobal pMac, void *pMsg pSmeRrmContext->token = pBeaconReq->uDialogToken; pSmeRrmContext->regClass = pBeaconReq->channelInfo.regulatoryClass; pSmeRrmContext->randnIntvl = - CDF_MAX(pBeaconReq->randomizationInterval, + QDF_MAX(pBeaconReq->randomizationInterval, pSmeRrmContext->rrmConfig.max_randn_interval); pSmeRrmContext->currentIndex = 0; pSmeRrmContext->msgSource = pBeaconReq->msgSource; @@ -1183,7 +1183,7 @@ QDF_STATUS sme_rrm_process_neighbor_report(tpAniSirGlobal pMac, void *pMsgBuf) /* Get the session id */ status = csr_roam_get_session_id_from_bssid(pMac, - (struct cdf_mac_addr *) pNeighborRpt->bssId, + (struct qdf_mac_addr *) pNeighborRpt->bssId, (uint32_t *) &sessionId); if (QDF_IS_STATUS_SUCCESS(status)) { #ifdef FEATURE_WLAN_ESE @@ -1278,7 +1278,7 @@ end: QDF_STATUS sme_rrm_msg_processor(tpAniSirGlobal pMac, uint16_t msg_type, void *pMsgBuf) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL(" Msg = %d for RRM measurement"), msg_type); /* switch on the msg type & make the state transition accordingly */ @@ -1293,7 +1293,7 @@ QDF_STATUS sme_rrm_msg_processor(tpAniSirGlobal pMac, uint16_t msg_type, default: /* err msg */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("sme_rrm_msg_processor:unknown msg type = %d"), msg_type); @@ -1360,12 +1360,12 @@ QDF_STATUS rrm_open(tpAniSirGlobal pMac) pSmeRrmContext->rrmConfig.max_randn_interval = 50; /* ms */ qdf_status = cdf_mc_timer_init(&pSmeRrmContext->IterMeasTimer, - CDF_TIMER_TYPE_SW, + QDF_TIMER_TYPE_SW, rrm_iter_meas_timer_handle, (void *)pMac); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "rrm_open: Fail to init timer"); return QDF_STATUS_E_FAILURE; @@ -1373,12 +1373,12 @@ QDF_STATUS rrm_open(tpAniSirGlobal pMac) qdf_status = cdf_mc_timer_init(&pSmeRrmContext->neighborReqControlInfo. - neighborRspWaitTimer, CDF_TIMER_TYPE_SW, + neighborRspWaitTimer, QDF_TIMER_TYPE_SW, rrm_neighbor_rsp_timeout_handler, (void *)pMac); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "rrm_open: Fail to init timer"); return QDF_STATUS_E_FAILURE; @@ -1389,7 +1389,7 @@ QDF_STATUS rrm_open(tpAniSirGlobal pMac) cdf_ret_status = csr_ll_open(pMac->hHdd, &pSmeRrmContext->neighborReportCache); if (QDF_STATUS_SUCCESS != cdf_ret_status) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "rrm_open: Fail to open neighbor cache result"); return QDF_STATUS_E_FAILURE; } @@ -1418,7 +1418,7 @@ QDF_STATUS rrm_close(tpAniSirGlobal pMac) cdf_mc_timer_get_current_state(&pSmeRrmContext->IterMeasTimer)) { qdf_status = cdf_mc_timer_stop(&pSmeRrmContext->IterMeasTimer); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Timer stop fail")); } } @@ -1426,7 +1426,7 @@ QDF_STATUS rrm_close(tpAniSirGlobal pMac) qdf_status = cdf_mc_timer_destroy(&pSmeRrmContext->IterMeasTimer); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Fail to destroy timer")); } @@ -1439,7 +1439,7 @@ QDF_STATUS rrm_close(tpAniSirGlobal pMac) cdf_mc_timer_stop(&pSmeRrmContext->neighborReqControlInfo. neighborRspWaitTimer); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, FL("Timer stop fail")); } } @@ -1448,7 +1448,7 @@ QDF_STATUS rrm_close(tpAniSirGlobal pMac) cdf_mc_timer_destroy(&pSmeRrmContext->neighborReqControlInfo. neighborRspWaitTimer); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, FL("Fail to destroy timer")); } diff --git a/core/utils/epping/inc/epping_internal.h b/core/utils/epping/inc/epping_internal.h index 2675c703dc..49a62fc35b 100644 --- a/core/utils/epping/inc/epping_internal.h +++ b/core/utils/epping/inc/epping_internal.h @@ -68,7 +68,7 @@ -------------------------------------------------------------------------*/ #define EPPING_MAX_ADAPTERS 1 -#define EPPING_LOG(level, args ...) CDF_TRACE(CDF_MODULE_ID_HDD, level, ## args) +#define EPPING_LOG(level, args ...) CDF_TRACE(QDF_MODULE_ID_HDD, level, ## args) struct epping_cookie { HTC_PACKET HtcPkt; /* HTC packet wrapper */ @@ -135,10 +135,10 @@ typedef enum { typedef struct epping_adapter_s { epping_context_t *pEpping_ctx; - enum tCDF_ADAPTER_MODE device_mode; + enum tQDF_ADAPTER_MODE device_mode; /** Handle to the network device */ struct net_device *dev; - struct cdf_mac_addr macAddressCurrent; + struct qdf_mac_addr macAddressCurrent; uint8_t sessionId; /* for mboxping */ cdf_spinlock_t data_lock; @@ -183,7 +183,7 @@ void epping_refill(void *ctx, HTC_ENDPOINT_ID Endpoint); /* epping_txrx signatures */ epping_adapter_t *epping_add_adapter(epping_context_t *pEpping_ctx, tSirMacAddr macAddr, - enum tCDF_ADAPTER_MODE device_mode); + enum tQDF_ADAPTER_MODE device_mode); void epping_destroy_adapter(epping_adapter_t *pAdapter); int epping_connect_service(epping_context_t *pEpping_ctx); #ifdef HIF_PCI diff --git a/core/utils/epping/src/epping_helper.c b/core/utils/epping/src/epping_helper.c index 0e8e3ecd2f..12602324fb 100644 --- a/core/utils/epping/src/epping_helper.c +++ b/core/utils/epping/src/epping_helper.c @@ -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. * @@ -165,9 +165,9 @@ void epping_hex_dump(void *data, int buf_len, const char *str) void *epping_get_cdf_ctx(void) { - cdf_device_t *p_cdf_ctx; + qdf_device_t *p_cdf_ctx; - p_cdf_ctx = cds_get_context(CDF_MODULE_ID_CDF_DEVICE); + p_cdf_ctx = cds_get_context(QDF_MODULE_ID_QDF_DEVICE); return p_cdf_ctx; } diff --git a/core/utils/epping/src/epping_main.c b/core/utils/epping/src/epping_main.c index 1171134da2..5bb56dcc59 100644 --- a/core/utils/epping/src/epping_main.c +++ b/core/utils/epping/src/epping_main.c @@ -121,11 +121,11 @@ void epping_disable(void) epping_destroy_adapter(pEpping_ctx->epping_adapter); pEpping_ctx->epping_adapter = NULL; } - hif_disable_isr(cds_get_context(CDF_MODULE_ID_HIF)); - hif_reset_soc(cds_get_context(CDF_MODULE_ID_HIF)); - htc_stop(cds_get_context(CDF_MODULE_ID_HTC)); + hif_disable_isr(cds_get_context(QDF_MODULE_ID_HIF)); + hif_reset_soc(cds_get_context(QDF_MODULE_ID_HIF)); + htc_stop(cds_get_context(QDF_MODULE_ID_HTC)); epping_cookie_cleanup(pEpping_ctx); - htc_destroy(cds_get_context(CDF_MODULE_ID_HTC)); + htc_destroy(cds_get_context(QDF_MODULE_ID_HTC)); } /** @@ -177,7 +177,7 @@ int epping_enable(struct device *parent_dev) int ret = 0; epping_context_t *pEpping_ctx = NULL; cds_context_type *p_cds_context = NULL; - cdf_device_t cdf_ctx; + qdf_device_t cdf_ctx; HTC_INIT_INFO htcInfo; struct hif_opaque_softc *scn; tSirMacAddr adapter_macAddr; @@ -208,9 +208,9 @@ int epping_enable(struct device *parent_dev) /* Initialize the timer module */ cdf_timer_module_init(); - scn = cds_get_context(CDF_MODULE_ID_HIF); + scn = cds_get_context(QDF_MODULE_ID_HIF); if (!scn) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, "%s: scn is null!", __func__); return -1; } @@ -224,7 +224,7 @@ int epping_enable(struct device *parent_dev) #ifndef FEATURE_BMI_2 /* Initialize BMI and Download firmware */ 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__); bmi_cleanup(ol_ctx); return -1; @@ -236,18 +236,18 @@ int epping_enable(struct device *parent_dev) htcInfo.pContext = ol_ctx; htcInfo.TargetFailure = ol_target_failure; htcInfo.TargetSendSuspendComplete = epping_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 */ p_cds_context->htc_ctx = htc_create(scn, &htcInfo, cdf_ctx); if (!p_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__); bmi_cleanup(ol_ctx); return -1; } pEpping_ctx->HTCHandle = - cds_get_context(CDF_MODULE_ID_HTC); + cds_get_context(QDF_MODULE_ID_HTC); if (pEpping_ctx->HTCHandle == NULL) { EPPING_LOG(CDF_TRACE_LEVEL_FATAL, "%s: HTCHandle is NULL", __func__); @@ -284,7 +284,7 @@ int epping_enable(struct device *parent_dev) if (ret == 0) { pEpping_ctx->epping_adapter = epping_add_adapter(pEpping_ctx, adapter_macAddr, - CDF_STA_MODE); + QDF_STA_MODE); } if (ret < 0 || pEpping_ctx->epping_adapter == NULL) { EPPING_LOG(CDF_TRACE_LEVEL_FATAL, diff --git a/core/utils/epping/src/epping_txrx.c b/core/utils/epping/src/epping_txrx.c index d703ac9c4e..0f8bbaab67 100644 --- a/core/utils/epping/src/epping_txrx.c +++ b/core/utils/epping/src/epping_txrx.c @@ -343,7 +343,7 @@ static struct net_device_ops epping_drv_ops = { epping_adapter_t *epping_add_adapter(epping_context_t *pEpping_ctx, tSirMacAddr macAddr, - enum tCDF_ADAPTER_MODE device_mode) + enum tQDF_ADAPTER_MODE device_mode) { struct net_device *dev; epping_adapter_t *pAdapter; @@ -371,7 +371,7 @@ epping_adapter_t *epping_add_adapter(epping_context_t *pEpping_ctx, cdf_nbuf_queue_init(&pAdapter->nodrop_queue); pAdapter->epping_timer_state = EPPING_TX_TIMER_STOPPED; qdf_timer_init(epping_get_cdf_ctx(), &pAdapter->epping_timer, - epping_timer_expire, dev, CDF_TIMER_TYPE_SW); + epping_timer_expire, dev, QDF_TIMER_TYPE_SW); dev->type = ARPHRD_IEEE80211; dev->netdev_ops = &epping_drv_ops; dev->watchdog_timeo = 5 * HZ; /* XXX */ diff --git a/core/utils/fwlog/dbglog_host.c b/core/utils/fwlog/dbglog_host.c index a2eaf57fca..6de19c5ec3 100644 --- a/core/utils/fwlog/dbglog_host.c +++ b/core/utils/fwlog/dbglog_host.c @@ -55,11 +55,11 @@ #if defined(DEBUG) -static bool appstarted = false; -static bool senddriverstatus = false; +static bool appstarted; +static bool senddriverstatus; static int cnss_diag_pid = INVALID_PID; -static int get_version = 0; -static int gprint_limiter = 0; +static int get_version; +static int gprint_limiter; static ATH_DEBUG_MASK_DESCRIPTION g_fwlog_debug_description[] = { {FWLOG_DEBUG, "fwlog"}, @@ -1869,7 +1869,7 @@ static int diag_fw_handler(ol_scn_t scn, uint8_t *data, uint32_t datalen) gprint_limiter = true; } /* Always returns zero */ - return (0); + return 0; } /* @@ -1953,7 +1953,7 @@ int dbglog_parse_debug_logs(ol_scn_t scn, uint8_t *data, uint32_t datalen) A_UINT32 moduleid; A_UINT16 vapid; A_UINT16 numargs; - cdf_size_t length; + qdf_size_t length; A_UINT32 dropped; WMI_DEBUG_MESG_EVENTID_param_tlvs *param_buf; uint8_t *datap; @@ -2053,7 +2053,7 @@ int dbglog_parse_debug_logs(ol_scn_t scn, uint8_t *data, uint32_t datalen) count += numargs + 2; /* 32 bit Time stamp + 32 bit Dbg header */ } /* Always returns zero */ - return (0); + return 0; } void dbglog_reg_modprint(A_UINT32 mod_id, module_dbg_print printfn) @@ -2191,8 +2191,8 @@ dbglog_sta_powersave_print_handler(A_UINT32 mod_id, switch (dbg_id) { case DBGLOG_DBGID_SM_FRAMEWORK_PROXY_DBGLOG_MSG: dbglog_sm_print(timestamp, vap_id, numargs, args, "STA PS", - states, CDF_ARRAY_SIZE(states), events, - CDF_ARRAY_SIZE(events)); + states, QDF_ARRAY_SIZE(states), events, + QDF_ARRAY_SIZE(events)); break; case PS_STA_PM_ARB_REQUEST: if (numargs == 4) { @@ -2298,7 +2298,7 @@ dbglog_sta_powersave_print_handler(A_UINT32 mod_id, A_UINT32 param = args[0]; A_UINT32 value = args[1]; - if (param < CDF_ARRAY_SIZE(params)) { + if (param < QDF_ARRAY_SIZE(params)) { if (params[param].is_time_param) { dbglog_printf(timestamp, vap_id, "STA PS SET_PARAM %s => %u (us)", @@ -2411,20 +2411,20 @@ dbglog_ibss_powersave_print_handler(A_UINT32 mod_id, case WLAN_IBSS_PS_SUB_MODULE_IBSS_NW_SM: dbglog_sm_print(timestamp, vap_id, numargs, args, "IBSS PS NW", nw_states, - CDF_ARRAY_SIZE(nw_states), events, - CDF_ARRAY_SIZE(events)); + QDF_ARRAY_SIZE(nw_states), events, + QDF_ARRAY_SIZE(events)); break; case WLAN_IBSS_PS_SUB_MODULE_IBSS_SELF_PS: dbglog_sm_print(timestamp, vap_id, numargs, args, "IBSS PS Self", ps_states, - CDF_ARRAY_SIZE(ps_states), events, - CDF_ARRAY_SIZE(events)); + QDF_ARRAY_SIZE(ps_states), events, + QDF_ARRAY_SIZE(events)); break; case WLAN_IBSS_PS_SUB_MODULE_IBSS_PEER_PS: dbglog_sm_print(timestamp, vap_id, numargs, args, "IBSS PS Peer", peer_ps_states, - CDF_ARRAY_SIZE(peer_ps_states), events, - CDF_ARRAY_SIZE(events)); + QDF_ARRAY_SIZE(peer_ps_states), events, + QDF_ARRAY_SIZE(events)); break; default: break; @@ -3049,8 +3049,8 @@ dbglog_wal_print_handler(A_UINT32 mod_id, switch (dbg_id) { case DBGLOG_DBGID_SM_FRAMEWORK_PROXY_DBGLOG_MSG: dbglog_sm_print(timestamp, vap_id, numargs, args, "TID PAUSE", - states, CDF_ARRAY_SIZE(states), events, - CDF_ARRAY_SIZE(events)); + states, QDF_ARRAY_SIZE(states), events, + QDF_ARRAY_SIZE(events)); break; case WAL_DBGID_SET_POWER_STATE: if (numargs == 3) { @@ -3188,8 +3188,8 @@ dbglog_scan_print_handler(A_UINT32 mod_id, switch (dbg_id) { case DBGLOG_DBGID_SM_FRAMEWORK_PROXY_DBGLOG_MSG: dbglog_sm_print(timestamp, vap_id, numargs, args, "SCAN", - states, CDF_ARRAY_SIZE(states), events, - CDF_ARRAY_SIZE(events)); + states, QDF_ARRAY_SIZE(states), events, + QDF_ARRAY_SIZE(events)); break; default: return false; @@ -3719,8 +3719,8 @@ dbglog_beacon_print_handler(A_UINT32 mod_id, switch (dbg_id) { case DBGLOG_DBGID_SM_FRAMEWORK_PROXY_DBGLOG_MSG: dbglog_sm_print(timestamp, vap_id, numargs, args, "EARLY_RX", - states, CDF_ARRAY_SIZE(states), events, - CDF_ARRAY_SIZE(events)); + states, QDF_ARRAY_SIZE(states), events, + QDF_ARRAY_SIZE(events)); break; case BEACON_EVENT_EARLY_RX_BMISS_STATUS: if (numargs == 3) { @@ -3826,8 +3826,8 @@ A_BOOL dbglog_smps_print_handler(A_UINT32 mod_id, switch (dbg_id) { case DBGLOG_DBGID_SM_FRAMEWORK_PROXY_DBGLOG_MSG: dbglog_sm_print(timestamp, vap_id, numargs, args, "STA_SMPS SM", - states, CDF_ARRAY_SIZE(states), events, - CDF_ARRAY_SIZE(events)); + states, QDF_ARRAY_SIZE(states), events, + QDF_ARRAY_SIZE(events)); break; case STA_SMPS_DBGID_CREATE_PDEV_INSTANCE: dbglog_printf(timestamp, vap_id, "STA_SMPS Create PDEV ctx %#x", @@ -3944,8 +3944,8 @@ dbglog_p2p_print_handler(A_UINT32 mod_id, switch (dbg_id) { case DBGLOG_DBGID_SM_FRAMEWORK_PROXY_DBGLOG_MSG: dbglog_sm_print(timestamp, vap_id, numargs, args, "P2P GO PS", - states, CDF_ARRAY_SIZE(states), events, - CDF_ARRAY_SIZE(events)); + states, QDF_ARRAY_SIZE(states), events, + QDF_ARRAY_SIZE(events)); break; default: return false; @@ -3984,8 +3984,8 @@ dbglog_pcielp_print_handler(A_UINT32 mod_id, switch (dbg_id) { case DBGLOG_DBGID_SM_FRAMEWORK_PROXY_DBGLOG_MSG: dbglog_sm_print(timestamp, vap_id, numargs, args, "PCIELP", - states, CDF_ARRAY_SIZE(states), events, - CDF_ARRAY_SIZE(events)); + states, QDF_ARRAY_SIZE(states), events, + QDF_ARRAY_SIZE(events)); break; default: return false; @@ -4235,7 +4235,7 @@ int cnss_diag_msg_callback(struct sk_buff *skb) \return - 0 for success, non zero for failure --------------------------------------------------------------------------*/ -int cnss_diag_notify_wlan_close() +int cnss_diag_notify_wlan_close(void) { /* Send nl msg about the wlan close */ if (INVALID_PID != cnss_diag_pid) { @@ -4257,7 +4257,7 @@ int cnss_diag_notify_wlan_close() \return - 0 for success, non zero for failure --------------------------------------------------------------------------*/ -int cnss_diag_activate_service() +int cnss_diag_activate_service(void) { int ret = 0; @@ -4283,7 +4283,7 @@ dbglog_wow_print_handler(A_UINT32 mod_id, if (4 == numargs) { dbglog_printf(timestamp, vap_id, "Enable NS offload, for sender %02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x\ - :%02x%02x:%02x%02x:%02x%02x", *(A_UINT8 *) &args[0], *((A_UINT8 *) &args[0] + 1), + :%02x%02x:%02x%02x:%02x%02x", *(A_UINT8 *) &args[0], *((A_UINT8 *) &args[0] + 1), *((A_UINT8 *) &args[0] + 2), *((A_UINT8 *) &args[0] + 3), *(A_UINT8 *) &args[1], *((A_UINT8 *) &args[1] + 1), *((A_UINT8 *) &args[1] + 2), *((A_UINT8 *) &args[1] + 3), *(A_UINT8 *) &args[2], *((A_UINT8 *) &args[2] + 1), *((A_UINT8 *) &args[2] + 2), *((A_UINT8 *) &args[2] + 3), *(A_UINT8 *) &args[3], *((A_UINT8 *) &args[3] + 1), *((A_UINT8 *) &args[3] + 2), *((A_UINT8 *) &args[3] + 3)); @@ -4315,7 +4315,7 @@ dbglog_wow_print_handler(A_UINT32 mod_id, if (4 == numargs) { dbglog_printf(timestamp, vap_id, "NS requested from %02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x\ - :%02x%02x:%02x%02x:%02x%02x", *(A_UINT8 *) &args[0], *((A_UINT8 *) &args[0] + 1), + :%02x%02x:%02x%02x:%02x%02x", *(A_UINT8 *) &args[0], *((A_UINT8 *) &args[0] + 1), *((A_UINT8 *) &args[0] + 2), *((A_UINT8 *) &args[0] + 3), *(A_UINT8 *) &args[1], *((A_UINT8 *) &args[1] + 1), *((A_UINT8 *) &args[1] + 2), *((A_UINT8 *) &args[1] + 3), *(A_UINT8 *) &args[2], *((A_UINT8 *) &args[2] + 1), *((A_UINT8 *) &args[2] + 2), *((A_UINT8 *) &args[2] + 3), *(A_UINT8 *) &args[3], *((A_UINT8 *) &args[3] + 1), *((A_UINT8 *) &args[3] + 2), *((A_UINT8 *) &args[3] + 3)); @@ -4327,7 +4327,7 @@ dbglog_wow_print_handler(A_UINT32 mod_id, if (4 == numargs) { dbglog_printf(timestamp, vap_id, "NS replied to %02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x\ - :%02x%02x:%02x%02x:%02x%02x", *(A_UINT8 *) &args[0], *((A_UINT8 *) &args[0] + 1), + :%02x%02x:%02x%02x:%02x%02x", *(A_UINT8 *) &args[0], *((A_UINT8 *) &args[0] + 1), *((A_UINT8 *) &args[0] + 2), *((A_UINT8 *) &args[0] + 3), *(A_UINT8 *) &args[1], *((A_UINT8 *) &args[1] + 1), *((A_UINT8 *) &args[1] + 2), *((A_UINT8 *) &args[1] + 3), *(A_UINT8 *) &args[2], *((A_UINT8 *) &args[2] + 1), *((A_UINT8 *) &args[2] + 2), *((A_UINT8 *) &args[2] + 3), *(A_UINT8 *) &args[3], *((A_UINT8 *) &args[3] + 1), *((A_UINT8 *) &args[3] + 2), *((A_UINT8 *) &args[3] + 3)); diff --git a/core/utils/host_diag_log/inc/host_diag_core_event.h b/core/utils/host_diag_log/inc/host_diag_core_event.h index 623db35d7e..0c8d963e73 100644 --- a/core/utils/host_diag_log/inc/host_diag_core_event.h +++ b/core/utils/host_diag_log/inc/host_diag_core_event.h @@ -25,7 +25,7 @@ * to the Linux Foundation. */ -#if !defined( __HOST_DIAG_CORE_EVENT_H ) +#if !defined(__HOST_DIAG_CORE_EVENT_H) #define __HOST_DIAG_CORE_EVENT_H /**========================================================================= @@ -43,7 +43,7 @@ /*-------------------------------------------------------------------------- Include Files ------------------------------------------------------------------------*/ -#include "cdf_types.h" +#include "qdf_types.h" #include "cds_pack_align.h" #include "i_host_diag_core_event.h" diff --git a/core/utils/host_diag_log/inc/host_diag_core_log.h b/core/utils/host_diag_log/inc/host_diag_core_log.h index a5090113cb..6d53539aea 100644 --- a/core/utils/host_diag_log/inc/host_diag_core_log.h +++ b/core/utils/host_diag_log/inc/host_diag_core_log.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( __HOST_DIAG_CORE_LOG_H ) +#if !defined(__HOST_DIAG_CORE_LOG_H) #define __HOST_DIAG_CORE_LOG_H /**========================================================================= @@ -43,7 +43,7 @@ /*-------------------------------------------------------------------------- Include Files ------------------------------------------------------------------------*/ -#include "cdf_types.h" +#include "qdf_types.h" #include "i_host_diag_core_log.h" /*-------------------------------------------------------------------------- @@ -98,8 +98,8 @@ typedef struct { log_hdr_type hdr; uint8_t eventId; uint8_t channelSetting; - struct cdf_mac_addr bssid; - struct cdf_mac_addr peer_macaddr; + struct qdf_mac_addr bssid; + struct qdf_mac_addr peer_macaddr; uint8_t ssid[HOST_LOG_MAX_SSID_SIZE]; uint8_t operatingChannel; uint8_t beaconInterval; diff --git a/core/utils/host_diag_log/inc/log_codes.h b/core/utils/host_diag_log/inc/log_codes.h index 462ce9cc83..4683349982 100644 --- a/core/utils/host_diag_log/inc/log_codes.h +++ b/core/utils/host_diag_log/inc/log_codes.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. * @@ -30,7 +30,7 @@ /*=========================================================================== - Log Code Definitions + Log Code Definitions General Description This file contains log code definitions and is shared with the tools. @@ -52,7 +52,7 @@ /*=========================================================================== - Edit History + Edit History $Header: //source/qcom/qct/core/services/diag/api/inc/main/latest/log_codes.h#9 $ @@ -72,12 +72,12 @@ 05/16/01 sfh Reserved log code 155. 05/08/01 sfh Reserved log codes 150 - 154. 04/06/01 lad Added definitions of base IDs (such as LOG_WCDMA_BASE_C). - This is currently using temporary ID values in the 0x1000 - range. + This is currently using temporary ID values in the 0x1000 + range. 02/23/01 lad Created file from DMSS log.h. Log codes only ===========================================================================*/ -#include +#include /* ------------------------------------------------------------------------- * Data Declarations @@ -2014,7 +2014,7 @@ #define LOG_1X_LAST_C ((0x8E0) + LOG_1X_BASE_C) /* This is only here for old (pre equipment ID update) logging code */ -#define LOG_LAST_C ( LOG_1X_LAST_C & 0xFFF ) +#define LOG_LAST_C (LOG_1X_LAST_C & 0xFFF) /* ------------------------------------------------------------------------- * APPS LOG definition: diff --git a/core/utils/host_diag_log/src/host_diag_log.c b/core/utils/host_diag_log/src/host_diag_log.c index 168ccd7dec..0e1c570fe1 100644 --- a/core/utils/host_diag_log/src/host_diag_log.c +++ b/core/utils/host_diag_log/src/host_diag_log.c @@ -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. * @@ -33,7 +33,7 @@ DEPENDENCIES: ============================================================================*/ -#include "cdf_types.h" +#include "qdf_types.h" #include "i_host_diag_core_log.h" #include "host_diag_core_event.h" #include "wlan_nlink_common.h" @@ -62,7 +62,7 @@ typedef struct event_report_s { This function sets the logging code in the given log record. \param - ptr - Pointer to the log header type. - - code - log code. + - code - log code. \return - None --------------------------------------------------------------------------*/ @@ -82,7 +82,7 @@ void host_diag_log_set_code(void *ptr, uint16_t code) This function sets the length field in the given log record. \param - ptr - Pointer to the log header type. - - length - log length. + - length - log length. \return - None @@ -117,7 +117,7 @@ void host_diag_log_submit(void *plog_hdr_ptr) uint16_t total_len; if (cds_is_load_or_unload_in_progress()) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, "%s: Unloading/Loading in Progress. Ignore!!!", __func__); return; @@ -134,7 +134,7 @@ void host_diag_log_submit(void *plog_hdr_ptr) pBuf = (uint8_t *) cdf_mem_malloc(total_len); if (!pBuf) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "cdf_mem_malloc failed"); return; } @@ -214,7 +214,7 @@ void host_diag_event_report_payload(uint16_t event_Id, uint16_t length, uint16_t total_len; if (cds_is_load_or_unload_in_progress()) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, "%s: Unloading/Loading in Progress. Ignore!!!", __func__); return; @@ -229,7 +229,7 @@ void host_diag_event_report_payload(uint16_t event_Id, uint16_t length, pBuf = (uint8_t *) cdf_mem_malloc(total_len); if (!pBuf) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "cdf_mem_malloc failed"); return; } @@ -250,7 +250,7 @@ void host_diag_event_report_payload(uint16_t event_Id, uint16_t length, if (ptt_sock_send_msg_to_app (wmsg, 0, ANI_NL_MSG_PUMAC, INVALID_PID) < 0) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "Ptt Socket error sending message to the app!!"); cdf_mem_free((void *)wmsg); return; diff --git a/core/utils/host_diag_log/src/i_host_diag_core_event.h b/core/utils/host_diag_log/src/i_host_diag_core_event.h index cd4d0c3d55..3a411c46be 100644 --- a/core/utils/host_diag_log/src/i_host_diag_core_event.h +++ b/core/utils/host_diag_log/src/i_host_diag_core_event.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_HOST_DIAG_CORE_EVENT_H ) +#if !defined(__I_HOST_DIAG_CORE_EVENT_H) #define __I_HOST_DIAG_CORE_EVENT_H /**========================================================================= @@ -41,7 +41,7 @@ /*-------------------------------------------------------------------------- Include Files ------------------------------------------------------------------------*/ -#include +#include #ifdef FEATURE_WLAN_DIAG_SUPPORT #include #endif @@ -61,23 +61,23 @@ void host_diag_event_report_payload(uint16_t event_Id, uint16_t length, /*--------------------------------------------------------------------------- Allocate an event payload holder ---------------------------------------------------------------------------*/ -#define WLAN_HOST_DIAG_EVENT_DEF( payload_name, payload_type ) \ +#define WLAN_HOST_DIAG_EVENT_DEF(payload_name, payload_type) \ payload_type(payload_name) /*--------------------------------------------------------------------------- Report the event ---------------------------------------------------------------------------*/ -#define WLAN_HOST_DIAG_EVENT_REPORT( payload_ptr, ev_id ) \ +#define WLAN_HOST_DIAG_EVENT_REPORT(payload_ptr, ev_id) \ do { \ - host_diag_event_report_payload( ev_id, \ - sizeof( *(payload_ptr) ), \ - (void *)(payload_ptr) ); \ + host_diag_event_report_payload(ev_id, \ + sizeof(*(payload_ptr)), \ + (void *)(payload_ptr)); \ } while (0) #else /* FEATURE_WLAN_DIAG_SUPPORT */ -#define WLAN_HOST_DIAG_EVENT_DEF( payload_name, payload_type ) -#define WLAN_HOST_DIAG_EVENT_REPORT( payload_ptr, ev_id ) +#define WLAN_HOST_DIAG_EVENT_DEF(payload_name, payload_type) +#define WLAN_HOST_DIAG_EVENT_REPORT(payload_ptr, ev_id) #endif /* FEATURE_WLAN_DIAG_SUPPORT */ diff --git a/core/utils/host_diag_log/src/i_host_diag_core_log.h b/core/utils/host_diag_log/src/i_host_diag_core_log.h index d670d5339f..8695171022 100644 --- a/core/utils/host_diag_log/src/i_host_diag_core_log.h +++ b/core/utils/host_diag_log/src/i_host_diag_core_log.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. * @@ -25,7 +25,7 @@ * to the Linux Foundation. */ -#if !defined( __I_HOST_DIAG_CORE_LOG_H ) +#if !defined(__I_HOST_DIAG_CORE_LOG_H) #define __I_HOST_DIAG_CORE_LOG_H #ifdef FEATURE_WLAN_DIAG_SUPPORT @@ -45,7 +45,7 @@ /*-------------------------------------------------------------------------- Include Files ------------------------------------------------------------------------*/ -#include +#include #include /*-------------------------------------------------------------------------- @@ -81,10 +81,10 @@ void host_diag_log_submit(void *plog_hdr_ptr); Allocate an event payload holder ---------------------------------------------------------------------------*/ -#define WLAN_HOST_DIAG_LOG_ALLOC( payload_ptr, payload_type, log_code ) \ +#define WLAN_HOST_DIAG_LOG_ALLOC(payload_ptr, payload_type, log_code) \ do { \ - payload_ptr = ( payload_type *)cdf_mem_malloc(sizeof(payload_type)); \ - if(payload_ptr) { \ + payload_ptr = (payload_type *)cdf_mem_malloc(sizeof(payload_type)); \ + if (payload_ptr) { \ cdf_mem_zero(payload_ptr, sizeof(payload_type)); \ host_diag_log_set_code(payload_ptr, log_code); \ host_diag_log_set_length(payload_ptr, sizeof(payload_type)); \ @@ -94,10 +94,10 @@ void host_diag_log_submit(void *plog_hdr_ptr); /*--------------------------------------------------------------------------- Report the event ---------------------------------------------------------------------------*/ -#define WLAN_HOST_DIAG_LOG_REPORT( payload_ptr ) \ +#define WLAN_HOST_DIAG_LOG_REPORT(payload_ptr) \ do { \ - if(payload_ptr) { \ - host_diag_log_submit( payload_ptr); \ + if (payload_ptr) { \ + host_diag_log_submit(payload_ptr); \ cdf_mem_free(payload_ptr); \ } \ } while (0) @@ -105,20 +105,18 @@ void host_diag_log_submit(void *plog_hdr_ptr); /*--------------------------------------------------------------------------- Free the payload ---------------------------------------------------------------------------*/ -#define WLAN_HOST_DIAG_LOG_FREE( payload_ptr ) \ - do \ - { \ - if( payload_ptr) \ - { \ +#define WLAN_HOST_DIAG_LOG_FREE(payload_ptr) \ + do { \ + if (payload_ptr) { \ cdf_mem_free(payload_ptr); \ } \ } while (0) #else /* FEATURE_WLAN_DIAG_SUPPORT */ -#define WLAN_HOST_DIAG_LOG_ALLOC( payload_ptr, payload_type, log_code ) -#define WLAN_HOST_DIAG_LOG_REPORT( payload_ptr ) -#define WLAN_HOST_DIAG_LOG_FREE( payload_ptr ) +#define WLAN_HOST_DIAG_LOG_ALLOC(payload_ptr, payload_type, log_code) +#define WLAN_HOST_DIAG_LOG_REPORT(payload_ptr) +#define WLAN_HOST_DIAG_LOG_FREE(payload_ptr) #endif /* FEATURE_WLAN_DIAG_SUPPORT */ diff --git a/core/utils/logging/src/wlan_logging_sock_svc.c b/core/utils/logging/src/wlan_logging_sock_svc.c index 09fec12a88..0e3e1d3a00 100644 --- a/core/utils/logging/src/wlan_logging_sock_svc.c +++ b/core/utils/logging/src/wlan_logging_sock_svc.c @@ -41,7 +41,7 @@ #include #define LOGGING_TRACE(level, args ...) \ - CDF_TRACE(CDF_MODULE_ID_HDD, level, ## args) + CDF_TRACE(QDF_MODULE_ID_HDD, level, ## args) /* Global variables */ @@ -162,14 +162,14 @@ static int wlan_send_sock_msg_to_app(tAniHdr *wmsg, int radio, * * Return: True if the module belongs to data path, false otherwise */ -static bool is_data_path_module(CDF_MODULE_ID mod_id) +static bool is_data_path_module(QDF_MODULE_ID mod_id) { switch (mod_id) { - case CDF_MODULE_ID_HDD_DATA: - case CDF_MODULE_ID_HDD_SAP_DATA: - case CDF_MODULE_ID_HTC: - case CDF_MODULE_ID_TXRX: - case CDF_MODULE_ID_HIF: + case QDF_MODULE_ID_HDD_DATA: + case QDF_MODULE_ID_HDD_SAP_DATA: + case QDF_MODULE_ID_HTC: + case QDF_MODULE_ID_TXRX: + case QDF_MODULE_ID_HIF: return true; default: return false; @@ -181,7 +181,7 @@ static void set_default_logtoapp_log_level(void) int i; /* module id 0 is reserved */ - for (i = 1; i < CDF_MODULE_ID_MAX; i++) { + for (i = 1; i < QDF_MODULE_ID_MAX; i++) { if (is_data_path_module(i)) cdf_trace_set_module_trace_level(i, CDF_DATA_PATH_TRACE_LEVEL); @@ -194,13 +194,13 @@ static void clear_default_logtoapp_log_level(void) { int module; - for (module = 0; module < CDF_MODULE_ID_MAX; module++) { + for (module = 0; module < QDF_MODULE_ID_MAX; module++) { cdf_trace_set_value(module, CDF_TRACE_LEVEL_NONE, false); cdf_trace_set_value(module, CDF_TRACE_LEVEL_FATAL, true); cdf_trace_set_value(module, CDF_TRACE_LEVEL_ERROR, true); } - cdf_trace_set_value(CDF_MODULE_ID_RSV4, CDF_TRACE_LEVEL_NONE, + cdf_trace_set_value(QDF_MODULE_ID_RSV4, CDF_TRACE_LEVEL_NONE, false); } diff --git a/core/utils/nlink/src/wlan_nlink_srv.c b/core/utils/nlink/src/wlan_nlink_srv.c index c9f78f6fa4..e113404987 100644 --- a/core/utils/nlink/src/wlan_nlink_srv.c +++ b/core/utils/nlink/src/wlan_nlink_srv.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. * @@ -71,7 +71,7 @@ int nl_srv_init(void) if (nl_srv_sock != NULL) { memset(nl_srv_msg_handler, 0, sizeof(nl_srv_msg_handler)); } else { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "NLINK: netlink_kernel_create failed"); retcode = -ECONNREFUSED; } @@ -103,7 +103,7 @@ int nl_srv_register(tWlanNlModTypes msg_type, nl_srv_msg_callback msg_handler) msg_handler != NULL) { nl_srv_msg_handler[msg_type - WLAN_NL_MSG_BASE] = msg_handler; } else { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, "NLINK: nl_srv_register failed for msg_type %d", msg_type); retcode = -EINVAL; @@ -123,7 +123,7 @@ int nl_srv_unregister(tWlanNlModTypes msg_type, nl_srv_msg_callback msg_handler) (nl_srv_msg_handler[msg_type - WLAN_NL_MSG_BASE] == msg_handler)) { nl_srv_msg_handler[msg_type - WLAN_NL_MSG_BASE] = NULL; } else { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, "NLINK: nl_srv_unregister failed for msg_type %d", msg_type); retcode = -EINVAL; @@ -147,7 +147,7 @@ int nl_srv_ucast(struct sk_buff *skb, int dst_pid, int flag) err = netlink_unicast(nl_srv_sock, skb, dst_pid, flag); if (err < 0) - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, "NLINK: netlink_unicast to pid[%d] failed, ret[0x%X]", dst_pid, err); @@ -174,7 +174,7 @@ int nl_srv_bcast(struct sk_buff *skb) WLAN_NLINK_MCAST_GRP_ID, flags); if (err < 0) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, "NLINK: netlink_broadcast failed err = %d", err); } return err; @@ -207,7 +207,7 @@ static void nl_srv_rcv_skb(struct sk_buff *skb) nlh = (struct nlmsghdr *)skb->data; if (nlh->nlmsg_len < sizeof(*nlh) || skb->len < nlh->nlmsg_len) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, "NLINK: Invalid " "Netlink message: skb[%p], len[%d], nlhdr[%p], nlmsg_len[%d]", skb, skb->len, nlh, nlh->nlmsg_len); @@ -232,7 +232,7 @@ static void nl_srv_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) /* Only requests are handled by kernel now */ if (!(nlh->nlmsg_flags & NLM_F_REQUEST)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, "NLINK: Received Invalid NL Req type [%x]", nlh->nlmsg_flags); return; @@ -242,7 +242,7 @@ static void nl_srv_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) /* Unknown message */ if (type < WLAN_NL_MSG_BASE || type >= WLAN_NL_MSG_MAX) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, "NLINK: Received Invalid NL Msg type [%x]", type); return; } @@ -252,13 +252,13 @@ static void nl_srv_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) * Drop any message with invalid length */ if (nlh->nlmsg_len < NLMSG_LENGTH(sizeof(tAniMsgHdr))) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, "NLINK: Received NL Msg with invalid len[%x]", nlh->nlmsg_len); return; } - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "NLINK: Received NL msg type [%d]", type); /* turn type into dispatch table offset */ @@ -268,7 +268,7 @@ static void nl_srv_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) if (nl_srv_msg_handler[type] != NULL) { (nl_srv_msg_handler[type])(skb); } else { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, "NLINK: No handler for Netlink Msg [0x%X]", type); } } @@ -282,7 +282,7 @@ static void nl_srv_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) * Return: Return -EPERM if the service is not initialized * */ -int nl_srv_is_initialized() +int nl_srv_is_initialized(void) { if (nl_srv_sock) return 0; diff --git a/core/utils/pktlog/linux_ac.c b/core/utils/pktlog/linux_ac.c index a514ea3c25..a7f6d6a3e1 100644 --- a/core/utils/pktlog/linux_ac.c +++ b/core/utils/pktlog/linux_ac.c @@ -85,8 +85,8 @@ static ssize_t pktlog_read(struct file *file, char *buf, size_t nbytes, static struct file_operations pktlog_fops = { open: pktlog_open, release:pktlog_release, - mmap: pktlog_mmap, - read: pktlog_read, + mmap : pktlog_mmap, + read : pktlog_read, }; /* @@ -96,7 +96,7 @@ static struct file_operations pktlog_fops = { static struct ol_pktlog_dev_t *get_pl_handle(struct hif_opaque_softc *scn) { ol_txrx_pdev_handle pdev_txrx_handle; - pdev_txrx_handle = cds_get_context(CDF_MODULE_ID_TXRX); + pdev_txrx_handle = cds_get_context(QDF_MODULE_ID_TXRX); if (!pdev_txrx_handle) return NULL; return pdev_txrx_handle->pl_dev; @@ -105,7 +105,7 @@ static struct ol_pktlog_dev_t *get_pl_handle(struct hif_opaque_softc *scn) void ol_pl_set_name(hif_opaque_softc_handle scn, net_device_handle dev) { ol_txrx_pdev_handle pdev_txrx_handle; - pdev_txrx_handle = cds_get_context(CDF_MODULE_ID_TXRX); + pdev_txrx_handle = cds_get_context(QDF_MODULE_ID_TXRX); if (pdev_txrx_handle && pdev_txrx_handle->pl_dev && dev) pdev_txrx_handle->pl_dev->name = dev->name; } @@ -124,7 +124,7 @@ int pktlog_alloc_buf(struct hif_opaque_softc *scn) struct page *vpg; struct ath_pktlog_info *pl_info; ol_txrx_pdev_handle pdev_txrx_handle; - pdev_txrx_handle = cds_get_context(CDF_MODULE_ID_TXRX); + pdev_txrx_handle = cds_get_context(QDF_MODULE_ID_TXRX); if (!pdev_txrx_handle || !pdev_txrx_handle->pl_dev) { printk(PKTLOG_TAG @@ -138,7 +138,8 @@ int pktlog_alloc_buf(struct hif_opaque_softc *scn) page_cnt = (sizeof(*(pl_info->buf)) + pl_info->buf_size) / PAGE_SIZE; - if ((pl_info->buf = vmalloc((page_cnt + 2) * PAGE_SIZE)) == NULL) { + pl_info->buf = vmalloc((page_cnt + 2) * PAGE_SIZE); + if (pl_info->buf == NULL) { printk(PKTLOG_TAG "%s: Unable to allocate buffer " "(%d pages)\n", __func__, page_cnt); @@ -166,7 +167,7 @@ void pktlog_release_buf(struct hif_opaque_softc *scn) struct page *vpg; struct ath_pktlog_info *pl_info; ol_txrx_pdev_handle pdev_txrx_handle; - pdev_txrx_handle = cds_get_context(CDF_MODULE_ID_TXRX); + pdev_txrx_handle = cds_get_context(QDF_MODULE_ID_TXRX); if (!pdev_txrx_handle || !pdev_txrx_handle->pl_dev) { printk(PKTLOG_TAG @@ -527,7 +528,7 @@ static int pktlog_release(struct inode *i, struct file *f) } #ifndef MIN -#define MIN(a,b) (((a) < (b)) ? (a) : (b)) +#define MIN(a, b) (((a) < (b)) ? (a) : (b)) #endif /** @@ -544,7 +545,7 @@ int pktlog_send_per_pkt_stats_to_user(void) ssize_t ret_val; struct host_log_pktlog_info *pktlog = NULL; ol_txrx_pdev_handle txrx_pdev = - cds_get_context(CDF_MODULE_ID_TXRX); + cds_get_context(QDF_MODULE_ID_TXRX); struct ath_pktlog_info *pl_info; bool read_complete; uint32_t num_bytes_read = 0; @@ -848,7 +849,7 @@ pktlog_read(struct file *file, char *buf, size_t nbytes, loff_t *ppos) count = 0; if (*ppos < bufhdr_size) { - count = CDF_MIN((bufhdr_size - *ppos), rem_len); + count = QDF_MIN((bufhdr_size - *ppos), rem_len); if (copy_to_user(buf, ((char *)&log_buf->bufhdr) + *ppos, count)) return -EFAULT; @@ -894,7 +895,7 @@ pktlog_read(struct file *file, char *buf, size_t nbytes, loff_t *ppos) if (ppos_data > end_offset) goto rd_done; - count = CDF_MIN(rem_len, (end_offset - ppos_data + 1)); + count = QDF_MIN(rem_len, (end_offset - ppos_data + 1)); if (copy_to_user(buf + ret_val, log_buf->log_data + ppos_data, count)) return -EFAULT; @@ -902,7 +903,7 @@ pktlog_read(struct file *file, char *buf, size_t nbytes, loff_t *ppos) rem_len -= count; } else { if (ppos_data <= fold_offset) { - count = CDF_MIN(rem_len, (fold_offset - ppos_data + 1)); + count = QDF_MIN(rem_len, (fold_offset - ppos_data + 1)); if (copy_to_user(buf + ret_val, log_buf->log_data + ppos_data, count)) return -EFAULT; @@ -918,7 +919,7 @@ pktlog_read(struct file *file, char *buf, size_t nbytes, loff_t *ppos) (fold_offset - start_offset + 1)); if (ppos_data <= end_offset) { - count = CDF_MIN(rem_len, (end_offset - ppos_data + 1)); + count = QDF_MIN(rem_len, (end_offset - ppos_data + 1)); if (copy_to_user(buf + ret_val, log_buf->log_data + ppos_data, count)) return -EFAULT; diff --git a/core/utils/pktlog/pktlog_ac.c b/core/utils/pktlog/pktlog_ac.c index dfde60ddd6..842ecb5c20 100644 --- a/core/utils/pktlog/pktlog_ac.c +++ b/core/utils/pktlog/pktlog_ac.c @@ -265,7 +265,7 @@ wdi_pktlog_unsubscribe(struct ol_txrx_pdev_t *txrx_pdev, uint32_t log_state) int pktlog_disable(struct hif_opaque_softc *scn) { struct ol_txrx_pdev_t *txrx_pdev = - cds_get_context(CDF_MODULE_ID_TXRX); + cds_get_context(QDF_MODULE_ID_TXRX); struct ol_pktlog_dev_t *pl_dev; struct ath_pktlog_info *pl_info; @@ -294,7 +294,7 @@ void pktlog_init(struct hif_opaque_softc *scn) { struct ath_pktlog_info *pl_info; ol_txrx_pdev_handle pdev_txrx_handle; - pdev_txrx_handle = cds_get_context(CDF_MODULE_ID_TXRX); + pdev_txrx_handle = cds_get_context(QDF_MODULE_ID_TXRX); if (pdev_txrx_handle == NULL || pdev_txrx_handle->pl_dev == NULL || @@ -339,7 +339,7 @@ int pktlog_enable(struct hif_opaque_softc *scn, int32_t log_state) return -1; } - txrx_pdev = cds_get_context(CDF_MODULE_ID_TXRX); + txrx_pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (!txrx_pdev) { printk("%s: Invalid txrx_pdev context\n", __func__); ASSERT(0); @@ -414,7 +414,7 @@ int pktlog_enable(struct hif_opaque_softc *scn, int32_t log_state) int pktlog_setsize(struct hif_opaque_softc *scn, int32_t size) { ol_txrx_pdev_handle pdev_txrx_handle = - cds_get_context(CDF_MODULE_ID_TXRX); + cds_get_context(QDF_MODULE_ID_TXRX); struct ol_pktlog_dev_t *pl_dev; struct ath_pktlog_info *pl_info; diff --git a/core/utils/pktlog/pktlog_internal.c b/core/utils/pktlog/pktlog_internal.c index 23c01b456f..c2f7b0758e 100644 --- a/core/utils/pktlog/pktlog_internal.c +++ b/core/utils/pktlog/pktlog_internal.c @@ -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. * @@ -439,7 +439,7 @@ A_STATUS process_tx_info(struct ol_txrx_pdev_t *txrx_pdev, void *data) cdf_nbuf_peek_header(netbuf, &addr, &len); if (len < (2 * IEEE80211_ADDR_LEN)) { - cdf_print("TX frame does not have a valid" + qdf_print("TX frame does not have a valid" " address\n"); return -1; } @@ -589,11 +589,11 @@ A_STATUS process_rate_find(void *pdev, void *data) uint32_t *pl_tgt_hdr; if (!pdev) { - cdf_print("Invalid pdev in %s\n", __func__); + qdf_print("Invalid pdev in %s\n", __func__); return A_ERROR; } if (!data) { - cdf_print("Invalid data in %s\n", __func__); + qdf_print("Invalid data in %s\n", __func__); return A_ERROR; } diff --git a/core/utils/ptt/inc/wlan_ptt_sock_svc.h b/core/utils/ptt/inc/wlan_ptt_sock_svc.h index c59b92fcef..07ec6f7c5a 100644 --- a/core/utils/ptt/inc/wlan_ptt_sock_svc.h +++ b/core/utils/ptt/inc/wlan_ptt_sock_svc.h @@ -32,7 +32,7 @@ #ifndef PTT_SOCK_SVC_H #define PTT_SOCK_SVC_H #include -#include +#include #include #include #include diff --git a/core/utils/ptt/src/wlan_ptt_sock_svc.c b/core/utils/ptt/src/wlan_ptt_sock_svc.c index dce3cfd80f..b63799e1cb 100644 --- a/core/utils/ptt/src/wlan_ptt_sock_svc.c +++ b/core/utils/ptt/src/wlan_ptt_sock_svc.c @@ -31,17 +31,17 @@ ******************************************************************************/ #ifdef PTT_SOCK_SVC_ENABLE #include -#include +#include #include #include #include #include -#include +#include #include #define PTT_SOCK_DEBUG #ifdef PTT_SOCK_DEBUG -#define PTT_TRACE(level, args ...) CDF_TRACE(CDF_MODULE_ID_CDF, level, ## args) +#define PTT_TRACE(level, args ...) CDF_TRACE(QDF_MODULE_ID_QDF, level, ## args) #else #define PTT_TRACE(level, args ...) #endif @@ -56,13 +56,13 @@ static void ptt_sock_dump_buf(const unsigned char *pbuf, int cnt) int i; for (i = 0; i < cnt; i++) { if ((i % 16) == 0) - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, "\n%p:", pbuf); - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO, " %02X", + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, " %02X", *pbuf); pbuf++; } - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO, "\n"); + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, "\n"); } #endif diff --git a/core/wma/inc/wma.h b/core/wma/inc/wma.h index 478d3d71b9..fb396a75b7 100644 --- a/core/wma/inc/wma.h +++ b/core/wma/inc/wma.h @@ -29,14 +29,14 @@ #define WMA_H #include "a_types.h" -#include "cdf_types.h" +#include "qdf_types.h" #include "osapi_linux.h" #include "htc_packet.h" #include "i_qdf_event.h" #include "wmi_services.h" #include "wmi_unified.h" #include "wmi_version.h" -#include "cdf_types.h" +#include "qdf_types.h" #include "cfg_api.h" #include "qdf_status.h" #include "cds_sched.h" @@ -93,21 +93,21 @@ #define WMA_11P_CHANNEL_END (184) #define WMA_LOGD(args ...) \ - CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_DEBUG, ## args) + CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_DEBUG, ## args) #define WMA_LOGI(args ...) \ - CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_INFO, ## args) + CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_INFO, ## args) #define WMA_LOGW(args ...) \ - CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_WARN, ## args) + CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_WARN, ## args) #define WMA_LOGE(args ...) \ - CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, ## args) + CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, ## args) #define WMA_LOGP(args ...) \ - CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_FATAL, ## args) + CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_FATAL, ## args) #define WMA_DEBUG_ALWAYS #ifdef WMA_DEBUG_ALWAYS #define WMA_LOGA(args ...) \ - CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_FATAL, ## args) + CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_FATAL, ## args) #else #define WMA_LOGA(args ...) #endif @@ -466,7 +466,7 @@ enum wma_tdls_peer_reason { struct wma_mem_chunk { uint32_t *vaddr; uint32_t paddr; - cdf_dma_mem_context(memctx); + qdf_dma_mem_context(memctx); uint32_t len; uint32_t req_id; }; @@ -928,7 +928,7 @@ typedef struct { struct utf_event_info { uint8_t *data; uint32_t length; - cdf_size_t offset; + qdf_size_t offset; uint8_t currentSeq; uint8_t expectedSeq; }; @@ -1197,7 +1197,7 @@ typedef struct { #endif bool wmi_ready; uint32_t wlan_init_status; - cdf_device_t cdf_dev; + qdf_device_t cdf_dev; uint32_t phy_capability; uint32_t max_frag_entry; uint32_t wmi_service_bitmap[WMI_SERVICE_BM_SIZE]; @@ -1215,7 +1215,7 @@ typedef struct { qdf_event_t tx_queue_empty_event; pWMAAckFnTxComp umac_ota_ack_cb[SIR_MAC_MGMT_RESERVED15]; pWMAAckFnTxComp umac_data_ota_ack_cb; - v_TIME_t last_umac_data_ota_timestamp; + unsigned long last_umac_data_ota_timestamp; cdf_nbuf_t last_umac_data_nbuf; bool needShutdown; uint32_t num_mem_chunks; @@ -1399,7 +1399,7 @@ typedef enum { * @driverType: driver type (production/FTM) * @uConfigBufferLen: length of config buffer */ -typedef struct cdf_packed sHalMacStartParameter { +typedef struct qdf_packed sHalMacStartParameter { tDriverType driverType; uint32_t uConfigBufferLen; diff --git a/core/wma/inc/wma_if.h b/core/wma/inc/wma_if.h index 554e915b6f..104739325a 100644 --- a/core/wma/inc/wma_if.h +++ b/core/wma/inc/wma_if.h @@ -28,7 +28,7 @@ #ifndef _HALMSGAPI_H_ #define _HALMSGAPI_H_ -#include "cdf_types.h" +#include "qdf_types.h" #include "sir_api.h" #include "sir_params.h" @@ -155,7 +155,7 @@ typedef enum { typedef struct sAniBeaconStruct { uint32_t beaconLength; tSirMacMgmtHdr macHdr; -} cdf_packed tAniBeaconStruct, *tpAniBeaconStruct; +} qdf_packed tAniBeaconStruct, *tpAniBeaconStruct; /** * struct sAniProbeRspStruct - probeRsp template structure @@ -164,7 +164,7 @@ typedef struct sAniBeaconStruct { typedef struct sAniProbeRspStruct { tSirMacMgmtHdr macHdr; /* probeRsp body follows here */ -} cdf_packed tAniProbeRspStruct, *tpAniProbeRspStruct; +} qdf_packed tAniProbeRspStruct, *tpAniProbeRspStruct; /** * struct tAddStaParams - add sta related parameters @@ -373,7 +373,7 @@ typedef struct { tSirKeys key[SIR_MAC_MAX_NUM_OF_DEFAULT_KEYS]; uint8_t singleTidRc; uint8_t smesessionId; - struct cdf_mac_addr peer_macaddr; + struct qdf_mac_addr peer_macaddr; QDF_STATUS status; uint8_t sessionId; uint8_t sendRsp; @@ -390,7 +390,7 @@ typedef struct { * @key: key data */ typedef struct sLimMlmSetKeysReq { - struct cdf_mac_addr peer_macaddr; + struct qdf_mac_addr peer_macaddr; uint8_t sessionId; /* Added For BT-AMP Support */ uint8_t smesessionId; /* Added for drivers based on wmi interface */ uint16_t aid; @@ -678,7 +678,7 @@ typedef struct { * @oemDataReq: OEM Data request */ typedef struct { - struct cdf_mac_addr selfMacAddr; + struct qdf_mac_addr selfMacAddr; QDF_STATUS status; uint8_t data_len; uint8_t *data; @@ -1155,15 +1155,15 @@ typedef struct sControlTxParams { * Request Type = SIR_HAL_SET_MAX_TX_POWER_REQ */ typedef struct sMaxTxPowerParams { - struct cdf_mac_addr bssId; - struct cdf_mac_addr selfStaMacAddr; + struct qdf_mac_addr bssId; + struct qdf_mac_addr selfStaMacAddr; /* In request, * power == MaxTx power to be used. * In response, * power == tx power used for management frames. */ int8_t power; - enum tCDF_ADAPTER_MODE dev_mode; + enum tQDF_ADAPTER_MODE dev_mode; } tMaxTxPowerParams, *tpMaxTxPowerParams; /** @@ -1187,7 +1187,7 @@ typedef struct sMaxTxPowerPerBandParams { */ struct add_sta_self_params { tSirMacAddr self_mac_addr; - enum tCDF_ADAPTER_MODE curr_device_mode; + enum tQDF_ADAPTER_MODE curr_device_mode; uint32_t type; uint32_t sub_type; uint8_t session_id; @@ -1382,7 +1382,7 @@ typedef struct sBeaconFilterMsg { uint16_t ieNum; uint8_t bssIdx; uint8_t reserved; -} cdf_packed tBeaconFilterMsg, *tpBeaconFilterMsg; +} qdf_packed tBeaconFilterMsg, *tpBeaconFilterMsg; /** * struct tEidByteInfo - Eid byte info @@ -1396,7 +1396,7 @@ typedef struct sEidByteInfo { uint8_t value; uint8_t bitMask; uint8_t ref; -} cdf_packed tEidByteInfo, *tpEidByteInfo; +} qdf_packed tEidByteInfo, *tpEidByteInfo; /** * struct tBeaconFilterIe - beacon filter IE @@ -1408,7 +1408,7 @@ typedef struct sBeaconFilterIe { uint8_t elementId; uint8_t checkIePresence; tEidByteInfo byte; -} cdf_packed tBeaconFilterIe, *tpBeaconFilterIe; +} qdf_packed tBeaconFilterIe, *tpBeaconFilterIe; /** * struct tDisableIntraBssFwd - intra bss forward parameters @@ -1418,7 +1418,7 @@ typedef struct sBeaconFilterIe { typedef struct sDisableIntraBssFwd { uint16_t sessionId; bool disableintrabssfwd; -} cdf_packed tDisableIntraBssFwd, *tpDisableIntraBssFwd; +} qdf_packed tDisableIntraBssFwd, *tpDisableIntraBssFwd; #ifdef WLAN_FEATURE_STATS_EXT /** diff --git a/core/wma/inc/wma_internal.h b/core/wma/inc/wma_internal.h index 66015f67d5..c822ffcbbb 100644 --- a/core/wma/inc/wma_internal.h +++ b/core/wma/inc/wma_internal.h @@ -988,7 +988,7 @@ static inline int wma_get_wow_bus_suspend(tp_wma_handle wma) return qdf_atomic_read(&wma->is_wow_bus_suspended); } -QDF_STATUS wma_resume_req(tp_wma_handle wma, enum cdf_suspend_type type); +QDF_STATUS wma_resume_req(tp_wma_handle wma, enum qdf_suspend_type type); QDF_STATUS wma_wow_add_pattern(tp_wma_handle wma, struct wow_add_pattern *ptrn); @@ -1000,7 +1000,7 @@ QDF_STATUS wma_wow_enter(tp_wma_handle wma, tpSirHalWowlEnterParams info); QDF_STATUS wma_wow_exit(tp_wma_handle wma, tpSirHalWowlExitParams info); -QDF_STATUS wma_suspend_req(tp_wma_handle wma, enum cdf_suspend_type type); +QDF_STATUS wma_suspend_req(tp_wma_handle wma, enum qdf_suspend_type type); void wma_calculate_and_update_conn_state(tp_wma_handle wma); void wma_update_conn_state(tp_wma_handle wma, uint32_t conn_mask); void wma_update_conn_state(tp_wma_handle wma, uint32_t conn_mask); diff --git a/core/wma/inc/wma_tgt_cfg.h b/core/wma/inc/wma_tgt_cfg.h index 1d834b5d53..6b4cf5c3ff 100644 --- a/core/wma/inc/wma_tgt_cfg.h +++ b/core/wma/inc/wma_tgt_cfg.h @@ -154,7 +154,7 @@ struct wma_tgt_cfg { uint8_t band_cap; uint32_t reg_domain; uint32_t eeprom_rd_ext; - struct cdf_mac_addr hw_macaddr; + struct qdf_mac_addr hw_macaddr; struct wma_tgt_services services; struct wma_tgt_ht_cap ht_cap; #ifdef WLAN_FEATURE_11AC diff --git a/core/wma/inc/wma_types.h b/core/wma/inc/wma_types.h index 8180e06e32..2b4e72ff2b 100644 --- a/core/wma/inc/wma_types.h +++ b/core/wma/inc/wma_types.h @@ -463,7 +463,7 @@ #define wma_tx_frame(hHal, pFrmBuf, frmLen, frmType, txDir, tid, pCompFunc, \ pData, txFlag, sessionid, channel_freq) \ (QDF_STATUS)( wma_tx_packet( \ - cds_get_context(CDF_MODULE_ID_WMA), \ + cds_get_context(QDF_MODULE_ID_WMA), \ (pFrmBuf), \ (frmLen), \ (frmType), \ @@ -481,7 +481,7 @@ pCompFunc, pData, pCBackFnTxComp, txFlag, sessionid, tdlsflag, \ channel_freq) \ (QDF_STATUS)( wma_tx_packet( \ - cds_get_context(CDF_MODULE_ID_WMA), \ + cds_get_context(QDF_MODULE_ID_WMA), \ (pFrmBuf), \ (frmLen), \ (frmType), \ diff --git a/core/wma/src/wma_data.c b/core/wma/src/wma_data.c index cb2c41a562..3b655d8ca7 100644 --- a/core/wma/src/wma_data.c +++ b/core/wma/src/wma_data.c @@ -46,7 +46,7 @@ #include "wlan_tgt_def_config.h" #include "cdf_nbuf.h" -#include "cdf_types.h" +#include "qdf_types.h" #include "ol_txrx_api.h" #include "cdf_memory.h" #include "ol_txrx_types.h" @@ -856,7 +856,7 @@ wma_data_tx_ack_comp_hdlr(void *wma_context, cdf_nbuf_t netbuf, int32_t status) return; } - pdev = cds_get_context(CDF_MODULE_ID_TXRX); + pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (NULL == pdev) { WMA_LOGE("%s: Failed to get pdev", __func__); @@ -897,7 +897,7 @@ wma_data_tx_ack_comp_hdlr(void *wma_context, cdf_nbuf_t netbuf, int32_t status) free_nbuf: /* unmap and freeing the tx buf as txrx is not taking care */ - cdf_nbuf_unmap_single(pdev->osdev, netbuf, CDF_DMA_TO_DEVICE); + cdf_nbuf_unmap_single(pdev->osdev, netbuf, QDF_DMA_TO_DEVICE); cdf_nbuf_free(netbuf); } @@ -1001,7 +1001,7 @@ QDF_STATUS wma_set_enable_disable_mcc_adaptive_scheduler(uint32_t uint16_t len = sizeof(wmi_resmgr_adaptive_ocs_enable_disable_cmd_fixed_param); - wma = cds_get_context(CDF_MODULE_ID_WMA); + wma = cds_get_context(QDF_MODULE_ID_WMA); if (NULL == wma) { WMA_LOGE("%s : Failed to get wma", __func__); return QDF_STATUS_E_FAULT; @@ -1066,7 +1066,7 @@ QDF_STATUS wma_set_mcc_channel_time_latency CDF_ASSERT(0); return QDF_STATUS_E_FAILURE; } - pMac = cds_get_context(CDF_MODULE_ID_PE); + pMac = cds_get_context(QDF_MODULE_ID_PE); if (!pMac) { WMA_LOGE("%s:NULL pMac ptr. Exiting", __func__); CDF_ASSERT(0); @@ -1190,7 +1190,7 @@ QDF_STATUS wma_set_mcc_channel_time_quota CDF_ASSERT(0); return QDF_STATUS_E_FAILURE; } - pMac = cds_get_context(CDF_MODULE_ID_PE); + pMac = cds_get_context(QDF_MODULE_ID_PE); if (!pMac) { WMA_LOGE("%s:NULL pMac ptr. Exiting", __func__); CDF_ASSERT(0); @@ -1299,7 +1299,7 @@ void wma_set_linkstate(tp_wma_handle wma, tpLinkStateParams params) goto out; } - pdev = cds_get_context(CDF_MODULE_ID_TXRX); + pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (NULL == pdev) { WMA_LOGE("%s: Unable to get TXRX context", __func__); @@ -1812,7 +1812,7 @@ QDF_STATUS wma_process_init_thermal_info(tp_wma_handle wma, return QDF_STATUS_E_FAILURE; } - curr_pdev = cds_get_context(CDF_MODULE_ID_TXRX); + curr_pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (NULL == curr_pdev) { WMA_LOGE("%s: Failed to get pdev", __func__); return QDF_STATUS_E_FAILURE; @@ -1898,7 +1898,7 @@ static void wma_set_thermal_level_ind(u_int8_t level) sme_msg.bodyptr = NULL; sme_msg.bodyval = level; - qdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); + qdf_status = cds_mq_post_message(QDF_MODULE_ID_SME, &sme_msg); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) WMA_LOGE(FL( "Fail to post set thermal level ind msg")); @@ -1925,7 +1925,7 @@ QDF_STATUS wma_process_set_thermal_level(tp_wma_handle wma, return QDF_STATUS_E_FAILURE; } - curr_pdev = cds_get_context(CDF_MODULE_ID_TXRX); + curr_pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (NULL == curr_pdev) { WMA_LOGE("%s: Failed to get pdev", __func__); return QDF_STATUS_E_FAILURE; @@ -2081,7 +2081,7 @@ int wma_thermal_mgmt_evt_handler(void *handle, uint8_t *event, param_buf = (WMI_THERMAL_MGMT_EVENTID_param_tlvs *) event; - curr_pdev = cds_get_context(CDF_MODULE_ID_TXRX); + curr_pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (NULL == curr_pdev) { WMA_LOGE("%s: Failed to get pdev", __func__); return -EINVAL; @@ -2354,7 +2354,7 @@ mgmt_wmi_unified_cmd_send(tp_wma_handle wma_handle, void *tx_frame, int32_t cmd_len; uint64_t dma_addr; struct wmi_desc_t *wmi_desc = NULL; - void *cdf_ctx = cds_get_context(CDF_MODULE_ID_CDF_DEVICE); + void *cdf_ctx = cds_get_context(QDF_MODULE_ID_QDF_DEVICE); uint8_t *bufp; int32_t bufp_len = (frmLen < mgmt_tx_dl_frm_len) ? frmLen : mgmt_tx_dl_frm_len; @@ -2393,7 +2393,7 @@ mgmt_wmi_unified_cmd_send(tp_wma_handle wma_handle, void *tx_frame, sizeof(uint32_t))); bufp += WMI_TLV_HDR_SIZE; cdf_mem_copy(bufp, pData, bufp_len); - cdf_nbuf_map_single(cdf_ctx, tx_frame, CDF_DMA_TO_DEVICE); + cdf_nbuf_map_single(cdf_ctx, tx_frame, QDF_DMA_TO_DEVICE); dma_addr = cdf_nbuf_get_frag_paddr(tx_frame, 0); cmd->paddr_lo = (uint32_t)(dma_addr & 0xffffffff); #if defined(HELIUMPLUS_PADDR64) @@ -2481,7 +2481,7 @@ QDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen, return QDF_STATUS_E_FAILURE; } - pMac = cds_get_context(CDF_MODULE_ID_PE); + pMac = cds_get_context(QDF_MODULE_ID_PE); if (!pMac) { WMA_LOGE("pMac Handle is NULL"); return QDF_STATUS_E_FAILURE; @@ -2598,12 +2598,12 @@ QDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen, cdf_nbuf_t ret; cdf_nbuf_t skb = (cdf_nbuf_t) tx_frame; ol_txrx_pdev_handle pdev = - cds_get_context(CDF_MODULE_ID_TXRX); + cds_get_context(QDF_MODULE_ID_TXRX); struct wma_decap_info_t decap_info; struct ieee80211_frame *wh = (struct ieee80211_frame *)cdf_nbuf_data(skb); - v_TIME_t curr_timestamp = cdf_mc_timer_get_system_ticks(); + unsigned long curr_timestamp = cdf_mc_timer_get_system_ticks(); if (pdev == NULL) { WMA_LOGE("%s: pdev pointer is not available", __func__); @@ -2654,7 +2654,7 @@ QDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen, cdf_mem_set(skb->cb, sizeof(skb->cb), 0); /* Do the DMA Mapping */ - cdf_nbuf_map_single(pdev->osdev, skb, CDF_DMA_TO_DEVICE); + cdf_nbuf_map_single(pdev->osdev, skb, QDF_DMA_TO_DEVICE); /* Terminate the (single-element) list of tx frames */ skb->next = NULL; @@ -2672,7 +2672,7 @@ QDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen, if (ret) { WMA_LOGE("TxRx Rejected. Fail to do Tx"); cdf_nbuf_unmap_single(pdev->osdev, skb, - CDF_DMA_TO_DEVICE); + QDF_DMA_TO_DEVICE); /* Call Download Cb so that umac can free the buffer */ if (tx_frm_download_comp_cb) tx_frm_download_comp_cb(wma_handle->mac_context, @@ -2896,7 +2896,7 @@ void ol_rx_err(ol_pdev_handle pdev, uint8_t vdev_id, enum ol_rx_err_type err_type, cdf_nbuf_t rx_frame, uint64_t *pn, uint8_t key_id) { - tp_wma_handle wma = cds_get_context(CDF_MODULE_ID_WMA); + tp_wma_handle wma = cds_get_context(QDF_MODULE_ID_WMA); tpSirSmeMicFailureInd mic_err_ind; struct ether_header *eth_hdr; cds_msg_t cds_msg; @@ -2924,15 +2924,15 @@ void ol_rx_err(ol_pdev_handle pdev, uint8_t vdev_id, mic_err_ind->length = sizeof(*mic_err_ind); mic_err_ind->sessionId = vdev_id; cdf_copy_macaddr(&mic_err_ind->bssId, - (struct cdf_mac_addr *) &wma->interfaces[vdev_id].bssid); + (struct qdf_mac_addr *) &wma->interfaces[vdev_id].bssid); cdf_mem_copy(mic_err_ind->info.taMacAddr, - (struct cdf_mac_addr *) peer_mac_addr, + (struct qdf_mac_addr *) peer_mac_addr, sizeof(tSirMacAddr)); cdf_mem_copy(mic_err_ind->info.srcMacAddr, - (struct cdf_mac_addr *) eth_hdr->ether_shost, + (struct qdf_mac_addr *) eth_hdr->ether_shost, sizeof(tSirMacAddr)); cdf_mem_copy(mic_err_ind->info.dstMacAddr, - (struct cdf_mac_addr *) eth_hdr->ether_dhost, + (struct qdf_mac_addr *) eth_hdr->ether_dhost, sizeof(tSirMacAddr)); mic_err_ind->info.keyId = key_id; mic_err_ind->info.multicast = @@ -2966,7 +2966,7 @@ void wma_tx_abort(uint8_t vdev_id) uint32_t peer_tid_bitmap = PEER_ALL_TID_BITMASK; struct wma_txrx_node *iface; - wma = cds_get_context(CDF_MODULE_ID_WMA); + wma = cds_get_context(QDF_MODULE_ID_WMA); if (NULL == wma) { WMA_LOGE("%s: wma is NULL", __func__); return; @@ -3096,7 +3096,7 @@ wma_indicate_err( switch (err_type) { case OL_RX_ERR_TKIP_MIC: { - tp_wma_handle wma = cds_get_context(CDF_MODULE_ID_WMA); + tp_wma_handle wma = cds_get_context(QDF_MODULE_ID_WMA); tpSirSmeMicFailureInd mic_err_ind; cds_msg_t cds_msg; uint8_t vdev_id; @@ -3120,19 +3120,19 @@ wma_indicate_err( mic_err_ind->length = sizeof(*mic_err_ind); vdev_id = err_info->u.mic_err.vdev_id; cdf_copy_macaddr(&mic_err_ind->bssId, - (struct cdf_mac_addr *) &wma->interfaces[vdev_id].bssid); + (struct qdf_mac_addr *) &wma->interfaces[vdev_id].bssid); WMA_LOGE("MIC error: BSSID:%02x:%02x:%02x:%02x:%02x:%02x\n", mic_err_ind->bssId.bytes[0], mic_err_ind->bssId.bytes[1], mic_err_ind->bssId.bytes[2], mic_err_ind->bssId.bytes[3], mic_err_ind->bssId.bytes[4], mic_err_ind->bssId.bytes[5]); cdf_mem_copy(mic_err_ind->info.taMacAddr, - (struct cdf_mac_addr *) err_info->u.mic_err.ta, + (struct qdf_mac_addr *) err_info->u.mic_err.ta, sizeof(tSirMacAddr)); cdf_mem_copy(mic_err_ind->info.srcMacAddr, - (struct cdf_mac_addr *) err_info->u.mic_err.sa, + (struct qdf_mac_addr *) err_info->u.mic_err.sa, sizeof(tSirMacAddr)); cdf_mem_copy(mic_err_ind->info.dstMacAddr, - (struct cdf_mac_addr *) err_info->u.mic_err.da, + (struct qdf_mac_addr *) err_info->u.mic_err.da, sizeof(tSirMacAddr)); mic_err_ind->info.keyId = err_info->u.mic_err.key_id; mic_err_ind->info.multicast = diff --git a/core/wma/src/wma_dev_if.c b/core/wma/src/wma_dev_if.c index 2372a7a6ea..32d26b4ebe 100644 --- a/core/wma/src/wma_dev_if.c +++ b/core/wma/src/wma_dev_if.c @@ -46,7 +46,7 @@ #include "wlan_tgt_def_config.h" #include "cdf_nbuf.h" -#include "cdf_types.h" +#include "qdf_types.h" #include "ol_txrx_api.h" #include "cdf_memory.h" #include "ol_txrx_types.h" @@ -87,8 +87,8 @@ void *wma_find_vdev_by_addr(tp_wma_handle wma, uint8_t *addr, for (i = 0; i < wma->max_bssid; i++) { if (cdf_is_macaddr_equal( - (struct cdf_mac_addr *) wma->interfaces[i].addr, - (struct cdf_mac_addr *) addr) == true) { + (struct qdf_mac_addr *) wma->interfaces[i].addr, + (struct qdf_mac_addr *) addr) == true) { *vdev_id = i; return wma->interfaces[i].handle; } @@ -168,8 +168,8 @@ void *wma_find_vdev_by_bssid(tp_wma_handle wma, uint8_t *bssid, for (i = 0; i < wma->max_bssid; i++) { if (cdf_is_macaddr_equal( - (struct cdf_mac_addr *) wma->interfaces[i].bssid, - (struct cdf_mac_addr *) bssid) == true) { + (struct qdf_mac_addr *) wma->interfaces[i].bssid, + (struct qdf_mac_addr *) bssid) == true) { *vdev_id = i; return wma->interfaces[i].handle; } @@ -485,7 +485,7 @@ void wma_vdev_detach_callback(void *ctx) QDF_STATUS status = QDF_STATUS_SUCCESS; cds_msg_t sme_msg = { 0 }; - wma = cds_get_context(CDF_MODULE_ID_WMA); + wma = cds_get_context(QDF_MODULE_ID_WMA); if (!wma || !iface->del_staself_req) { WMA_LOGP("%s: wma %p iface %p", __func__, wma, @@ -521,7 +521,7 @@ void wma_vdev_detach_callback(void *ctx) sme_msg.bodyptr = param; sme_msg.bodyval = 0; - status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); + status = cds_mq_post_message(QDF_MODULE_ID_SME, &sme_msg); if (!QDF_IS_STATUS_SUCCESS(status)) { WMA_LOGE("Failed to post eWNI_SME_ADD_STA_SELF_RSP"); cdf_mem_free(param); @@ -552,7 +552,7 @@ static QDF_STATUS wma_self_peer_remove(tp_wma_handle wma_handle, WMA_LOGE("P2P Device: removing self peer %pM", del_sta_self_req_param->self_mac_addr); - pdev = cds_get_context(CDF_MODULE_ID_TXRX); + pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (NULL == pdev) { WMA_LOGE("%s: Failed to get pdev", __func__); return QDF_STATUS_E_FAULT; @@ -664,7 +664,7 @@ out: sme_msg.bodyptr = del_sta_self_req_param; sme_msg.bodyval = 0; - status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); + status = cds_mq_post_message(QDF_MODULE_ID_SME, &sme_msg); if (!QDF_IS_STATUS_SUCCESS(status)) { WMA_LOGE("Failed to post eWNI_SME_DEL_STA_SELF_RSP"); cdf_mem_free(del_sta_self_req_param); @@ -906,7 +906,7 @@ int wma_vdev_start_resp_handler(void *handle, uint8_t *cmd_param_info, struct wma_target_req *req_msg; struct wma_txrx_node *iface; #ifdef FEATURE_AP_MCC_CH_AVOIDANCE - tpAniSirGlobal mac_ctx = cds_get_context(CDF_MODULE_ID_PE); + tpAniSirGlobal mac_ctx = cds_get_context(QDF_MODULE_ID_PE); if (NULL == mac_ctx) { WMA_LOGE("%s: Failed to get mac_ctx", __func__); return -EINVAL; @@ -1526,8 +1526,8 @@ static void wma_recreate_ibss_vdev_and_bss_peer(tp_wma_handle wma, } cdf_copy_macaddr( - (struct cdf_mac_addr *) &(add_sta_self_param.self_mac_addr), - (struct cdf_mac_addr *) &(vdev->mac_addr)); + (struct qdf_mac_addr *) &(add_sta_self_param.self_mac_addr), + (struct qdf_mac_addr *) &(vdev->mac_addr)); add_sta_self_param.session_id = vdev_id; add_sta_self_param.type = WMI_VDEV_TYPE_IBSS; add_sta_self_param.sub_type = 0; @@ -1536,7 +1536,7 @@ static void wma_recreate_ibss_vdev_and_bss_peer(tp_wma_handle wma, /* delete old ibss vdev */ del_sta_param.session_id = vdev_id; cdf_mem_copy((void *)del_sta_param.self_mac_addr, - (void *)&(vdev->mac_addr), CDF_MAC_ADDR_SIZE); + (void *)&(vdev->mac_addr), QDF_MAC_ADDR_SIZE); wma_vdev_detach(wma, &del_sta_param, 0); /* create new vdev for ibss */ @@ -1676,7 +1676,7 @@ int wma_vdev_stop_resp_handler(void *handle, uint8_t *cmd_param_info, struct wma_txrx_node *iface; int32_t status = 0; #ifdef FEATURE_AP_MCC_CH_AVOIDANCE - tpAniSirGlobal mac_ctx = cds_get_context(CDF_MODULE_ID_PE); + tpAniSirGlobal mac_ctx = cds_get_context(QDF_MODULE_ID_PE); if (NULL == mac_ctx) { WMA_LOGE("%s: Failed to get mac_ctx", __func__); return -EINVAL; @@ -1710,7 +1710,7 @@ int wma_vdev_stop_resp_handler(void *handle, uint8_t *cmd_param_info, __func__, resp_event->vdev_id); return -EINVAL; } - pdev = cds_get_context(CDF_MODULE_ID_TXRX); + pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (!pdev) { WMA_LOGE("%s: pdev is NULL", __func__); status = -EINVAL; @@ -1780,7 +1780,7 @@ int wma_vdev_stop_resp_handler(void *handle, uint8_t *cmd_param_info, "template memory %p", __func__, bcn, bcn->buf); if (bcn->dma_mapped) cdf_nbuf_unmap_single(pdev->osdev, bcn->buf, - CDF_DMA_TO_DEVICE); + QDF_DMA_TO_DEVICE); cdf_nbuf_free(bcn->buf); cdf_mem_free(bcn); wma->interfaces[resp_event->vdev_id].beacon = NULL; @@ -1835,10 +1835,10 @@ ol_txrx_vdev_handle wma_vdev_attach(tp_wma_handle wma_handle, uint8_t generateRsp) { ol_txrx_vdev_handle txrx_vdev_handle = NULL; - 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); enum wlan_op_mode txrx_vdev_type; QDF_STATUS status = QDF_STATUS_SUCCESS; - struct sAniSirGlobal *mac = cds_get_context(CDF_MODULE_ID_PE); + struct sAniSirGlobal *mac = cds_get_context(QDF_MODULE_ID_PE); uint32_t cfg_val; uint16_t val16; int ret; @@ -2060,7 +2060,7 @@ end: sme_msg.bodyptr = self_sta_req; sme_msg.bodyval = 0; - status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); + status = cds_mq_post_message(QDF_MODULE_ID_SME, &sme_msg); if (!QDF_IS_STATUS_SUCCESS(status)) { WMA_LOGE("Failed to post eWNI_SME_ADD_STA_SELF_RSP"); cdf_mem_free(self_sta_req); @@ -2090,7 +2090,7 @@ QDF_STATUS wma_vdev_start(tp_wma_handle wma, tpAniSirGlobal mac_ctx = NULL; struct ath_dfs *dfs; - mac_ctx = cds_get_context(CDF_MODULE_ID_PE); + mac_ctx = cds_get_context(QDF_MODULE_ID_PE); if (mac_ctx == NULL) { WMA_LOGE("%s: vdev start failed as mac_ctx is NULL", __func__); return QDF_STATUS_E_FAILURE; @@ -2552,7 +2552,7 @@ void wma_hold_req_timer(void *data) struct wma_target_req *tgt_req = (struct wma_target_req *)data; struct wma_target_req *msg; - wma = cds_get_context(CDF_MODULE_ID_WMA); + wma = cds_get_context(QDF_MODULE_ID_WMA); if (NULL == wma) { WMA_LOGE(FL("Failed to get wma")); goto free_tgt_req; @@ -2630,7 +2630,7 @@ struct wma_target_req *wma_fill_hold_req(tp_wma_handle wma, req->msg_type = msg_type; req->type = type; req->user_data = params; - cdf_mc_timer_init(&req->event_timeout, CDF_TIMER_TYPE_SW, + cdf_mc_timer_init(&req->event_timeout, QDF_TIMER_TYPE_SW, wma_hold_req_timer, req); cdf_mc_timer_start(&req->event_timeout, timeout); cdf_spin_lock_bh(&wma->wma_hold_req_q_lock); @@ -2688,21 +2688,21 @@ void wma_vdev_resp_timer(void *data) QDF_STATUS status = QDF_STATUS_SUCCESS; cds_msg_t sme_msg = { 0 }; #ifdef FEATURE_AP_MCC_CH_AVOIDANCE - tpAniSirGlobal mac_ctx = cds_get_context(CDF_MODULE_ID_PE); + tpAniSirGlobal mac_ctx = cds_get_context(QDF_MODULE_ID_PE); if (NULL == mac_ctx) { WMA_LOGE("%s: Failed to get mac_ctx", __func__); goto free_tgt_req; } #endif /* FEATURE_AP_MCC_CH_AVOIDANCE */ - wma = cds_get_context(CDF_MODULE_ID_WMA); + wma = cds_get_context(QDF_MODULE_ID_WMA); if (NULL == wma) { WMA_LOGE("%s: Failed to get wma", __func__); goto free_tgt_req; } - pdev = cds_get_context(CDF_MODULE_ID_TXRX); + pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (NULL == pdev) { WMA_LOGE("%s: Failed to get pdev", __func__); @@ -2788,7 +2788,7 @@ void wma_vdev_resp_timer(void *data) "template memory %p", __func__, bcn, bcn->buf); if (bcn->dma_mapped) cdf_nbuf_unmap_single(pdev->osdev, bcn->buf, - CDF_DMA_TO_DEVICE); + QDF_DMA_TO_DEVICE); cdf_nbuf_free(bcn->buf); cdf_mem_free(bcn); wma->interfaces[tgt_req->vdev_id].beacon = NULL; @@ -2827,7 +2827,7 @@ void wma_vdev_resp_timer(void *data) sme_msg.bodyptr = iface->del_staself_req; sme_msg.bodyval = 0; - status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); + status = cds_mq_post_message(QDF_MODULE_ID_SME, &sme_msg); if (!QDF_IS_STATUS_SUCCESS(status)) { WMA_LOGE("Failed to post eWNI_SME_ADD_STA_SELF_RSP"); cdf_mem_free(iface->del_staself_req); @@ -2938,7 +2938,7 @@ struct wma_target_req *wma_fill_vdev_req(tp_wma_handle wma, req->msg_type = msg_type; req->type = type; req->user_data = params; - cdf_mc_timer_init(&req->event_timeout, CDF_TIMER_TYPE_SW, + cdf_mc_timer_init(&req->event_timeout, QDF_TIMER_TYPE_SW, wma_vdev_resp_timer, req); cdf_mc_timer_start(&req->event_timeout, timeout); cdf_spin_lock_bh(&wma->vdev_respq_lock); @@ -3068,7 +3068,7 @@ static void wma_add_bss_ap_mode(tp_wma_handle wma, tpAddBssParams add_bss) #endif /* WLAN_FEATURE_11W */ struct sir_hw_mode_params hw_mode = {0}; - pdev = cds_get_context(CDF_MODULE_ID_TXRX); + pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (NULL == pdev) { WMA_LOGE("%s: Failed to get pdev", __func__); @@ -3210,7 +3210,7 @@ static void wma_add_bss_ibss_mode(tp_wma_handle wma, tpAddBssParams add_bss) goto send_fail_resp; } WMA_LOGD("%s: add_bss->sessionId = %d", __func__, vdev_id); - pdev = cds_get_context(CDF_MODULE_ID_TXRX); + pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (NULL == pdev) { WMA_LOGE("%s: Failed to get pdev", __func__); @@ -3235,17 +3235,17 @@ static void wma_add_bss_ibss_mode(tp_wma_handle wma, tpAddBssParams add_bss) /* remove the non-ibss vdev */ cdf_copy_macaddr( - (struct cdf_mac_addr *) &(del_sta_param.self_mac_addr), - (struct cdf_mac_addr *) &(vdev->mac_addr)); + (struct qdf_mac_addr *) &(del_sta_param.self_mac_addr), + (struct qdf_mac_addr *) &(vdev->mac_addr)); del_sta_param.session_id = vdev_id; del_sta_param.status = 0; wma_vdev_detach(wma, &del_sta_param, 0); /* create new vdev for ibss */ - cdf_copy_macaddr((struct cdf_mac_addr *) & + cdf_copy_macaddr((struct qdf_mac_addr *) & (add_sta_self_param.self_mac_addr), - (struct cdf_mac_addr *) &(add_bss->selfMacAddr)); + (struct qdf_mac_addr *) &(add_bss->selfMacAddr)); add_sta_self_param.session_id = vdev_id; add_sta_self_param.type = WMI_VDEV_TYPE_IBSS; add_sta_self_param.sub_type = 0; @@ -3402,7 +3402,7 @@ static void wma_add_bss_sta_mode(tp_wma_handle wma, tpAddBssParams add_bss) int ret = 0; int pps_val = 0; bool roam_synch_in_progress = false; - tpAniSirGlobal pMac = cds_get_context(CDF_MODULE_ID_PE); + tpAniSirGlobal pMac = cds_get_context(QDF_MODULE_ID_PE); struct sir_hw_mode_params hw_mode = {0}; bool peer_assoc_sent = false; @@ -3411,7 +3411,7 @@ static void wma_add_bss_sta_mode(tp_wma_handle wma, tpAddBssParams add_bss) goto send_fail_resp; } - pdev = cds_get_context(CDF_MODULE_ID_TXRX); + pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (NULL == pdev) { WMA_LOGE("%s Failed to get pdev", __func__); @@ -3699,8 +3699,8 @@ void wma_add_bss(tp_wma_handle wma, tpAddBssParams params) switch (params->halPersona) { - case CDF_SAP_MODE: - case CDF_P2P_GO_MODE: + case QDF_SAP_MODE: + case QDF_P2P_GO_MODE: /*If current bring up SAP/P2P channel matches the previous *radar found channel then reset the last_radar_found_chan *variable to avoid race conditions. @@ -3713,7 +3713,7 @@ void wma_add_bss(tp_wma_handle wma, tpAddBssParams params) break; #ifdef QCA_IBSS_SUPPORT - case CDF_IBSS_MODE: + case QDF_IBSS_MODE: wma_add_bss_ibss_mode(wma, params); break; #endif @@ -3784,7 +3784,7 @@ static void wma_add_sta_req_ap_mode(tp_wma_handle wma, tpAddStaParams add_sta) struct wma_target_req *msg; bool peer_assoc_cnf = false; - pdev = cds_get_context(CDF_MODULE_ID_TXRX); + pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (NULL == pdev) { WMA_LOGE("%s: Failed to find pdev", __func__); @@ -3986,7 +3986,7 @@ static void wma_add_tdls_sta(tp_wma_handle wma, tpAddStaParams add_sta) __func__, add_sta->staType, add_sta->staIdx, add_sta->updateSta, add_sta->bssId, add_sta->staMac); - pdev = cds_get_context(CDF_MODULE_ID_TXRX); + pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (NULL == pdev) { WMA_LOGE("%s: Failed to find pdev", __func__); @@ -4132,7 +4132,7 @@ static void wma_add_sta_req_sta_mode(tp_wma_handle wma, tpAddStaParams params) } #endif - pdev = cds_get_context(CDF_MODULE_ID_TXRX); + pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (NULL == pdev) { WMA_LOGE("%s: Unable to get pdev", __func__); @@ -4347,7 +4347,7 @@ static void wma_delete_sta_req_ap_mode(tp_wma_handle wma, struct ol_txrx_peer_t *peer; struct wma_target_req *msg; - pdev = cds_get_context(CDF_MODULE_ID_TXRX); + pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (NULL == pdev) { WMA_LOGE("%s: Failed to get pdev", __func__); @@ -4415,7 +4415,7 @@ static void wma_del_tdls_sta(tp_wma_handle wma, tpDeleteStaParams del_sta) struct ol_txrx_peer_t *peer; tTdlsPeerStateParams *peerStateParams; - pdev = cds_get_context(CDF_MODULE_ID_TXRX); + pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (NULL == pdev) { WMA_LOGE("%s: Failed to find pdev", __func__); @@ -4641,7 +4641,7 @@ void wma_delete_bss(tp_wma_handle wma, tpDeleteBssParams params) ol_txrx_vdev_handle txrx_vdev = NULL; bool roam_synch_in_progress = false; - pdev = cds_get_context(CDF_MODULE_ID_TXRX); + pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (NULL == pdev) { WMA_LOGE("%s:Unable to get TXRX context", __func__); diff --git a/core/wma/src/wma_dfs_interface.c b/core/wma/src/wma_dfs_interface.c index a9bc97b857..be1022d21c 100644 --- a/core/wma/src/wma_dfs_interface.c +++ b/core/wma/src/wma_dfs_interface.c @@ -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. * @@ -51,7 +51,7 @@ int ol_if_dfs_attach(struct ieee80211com *ic, void *ptr, void *radar_info) { struct ath_dfs_caps *pCap = (struct ath_dfs_caps *)ptr; - cdf_print("%s: called; ptr=%p, radar_info=%p\n", + qdf_print("%s: called; ptr=%p, radar_info=%p\n", __func__, ptr, radar_info); pCap->ath_chip_is_bb_tlv = 1; diff --git a/core/wma/src/wma_features.c b/core/wma/src/wma_features.c index 57736436a1..0c032b2b44 100644 --- a/core/wma/src/wma_features.c +++ b/core/wma/src/wma_features.c @@ -47,7 +47,7 @@ #include "wlan_tgt_def_config.h" #include "cdf_nbuf.h" -#include "cdf_types.h" +#include "qdf_types.h" #include "ol_txrx_api.h" #include "cdf_memory.h" #include "ol_txrx_types.h" @@ -128,7 +128,7 @@ static int wma_post_auto_shutdown_msg(void) sme_msg.bodyptr = auto_sh_evt; sme_msg.bodyval = 0; - qdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); + qdf_status = cds_mq_post_message(QDF_MODULE_ID_SME, &sme_msg); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGE("Fail to post eWNI_SME_AUTO_SHUTDOWN_IND msg to SME"); cdf_mem_free(auto_sh_evt); @@ -217,7 +217,7 @@ QDF_STATUS wma_get_snr(tAniGetSnrReq *psnr_req) tp_wma_handle wma_handle = NULL; struct wma_txrx_node *intr; - wma_handle = cds_get_context(CDF_MODULE_ID_WMA); + wma_handle = cds_get_context(QDF_MODULE_ID_WMA); if (NULL == wma_handle) { WMA_LOGE("%s : Failed to get wma_handle", __func__); @@ -1308,7 +1308,7 @@ static int wma_lphb_handler(tp_wma_handle wma, uint8_t *event) sme_msg.bodyptr = slphb_indication; sme_msg.bodyval = 0; - qdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); + qdf_status = cds_mq_post_message(QDF_MODULE_ID_SME, &sme_msg); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGE("Fail to post eWNI_SME_LPHB_IND msg to SME"); cdf_mem_free(slphb_indication); @@ -2178,13 +2178,13 @@ static int wma_unified_phyerr_rx_event_handler(void *handle, uint8_t *bufp; wmi_single_phyerr_rx_event *ev; struct ieee80211com *ic = wma->dfs_ic; - cdf_size_t n; + qdf_size_t n; A_UINT64 tsf64 = 0; int phy_err_code = 0; A_UINT32 phy_err_mask = 0; int error = 0; tpAniSirGlobal mac_ctx = - (tpAniSirGlobal)cds_get_context(CDF_MODULE_ID_PE); + (tpAniSirGlobal)cds_get_context(QDF_MODULE_ID_PE); bool enable_log = false; int max_dfs_buf_length = 0; @@ -2946,7 +2946,7 @@ int wma_wow_wakeup_host_event(void *handle, uint8_t *event, param_buf->wow_packet_buffer + 4, wow_buf_pkt_len, WOW_REASON_PATTERN_MATCH_FOUND); - cdf_trace_hex_dump(CDF_MODULE_ID_WMA, + cdf_trace_hex_dump(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_DEBUG, param_buf->wow_packet_buffer + 4, wow_buf_pkt_len); @@ -2970,7 +2970,7 @@ int wma_wow_wakeup_host_event(void *handle, uint8_t *event, cdf_mem_copy((uint8_t *) &wow_buf_pkt_len, param_buf->wow_packet_buffer, 4); WMA_LOGD("wow_packet_buffer dump"); - cdf_trace_hex_dump(CDF_MODULE_ID_WMA, + cdf_trace_hex_dump(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_DEBUG, param_buf->wow_packet_buffer, wow_buf_pkt_len); @@ -3003,7 +3003,7 @@ int wma_wow_wakeup_host_event(void *handle, uint8_t *event, cdf_mem_copy((u_int8_t *) &wow_buf_pkt_len, param_buf->wow_packet_buffer, 4); WMA_LOGD("wow_packet_buffer dump"); - cdf_trace_hex_dump(CDF_MODULE_ID_WMA, + cdf_trace_hex_dump(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_DEBUG, param_buf->wow_packet_buffer, wow_buf_pkt_len); if (wow_buf_pkt_len >= sizeof(param)) { @@ -3252,11 +3252,11 @@ static QDF_STATUS wma_send_wow_patterns_to_fw(tp_wma_handle wma, bitmap_pattern->pattern_offset, user); WMA_LOGI("Pattern : "); - CDF_TRACE_HEX_DUMP(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_INFO, + CDF_TRACE_HEX_DUMP(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_INFO, &bitmap_pattern->patternbuf[0], bitmap_pattern->pattern_len); WMA_LOGI("Mask : "); - CDF_TRACE_HEX_DUMP(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_INFO, + CDF_TRACE_HEX_DUMP(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_INFO, &bitmap_pattern->bitmaskbuf[0], bitmap_pattern->pattern_len); buf_ptr += sizeof(WOW_BITMAP_PATTERN_T); @@ -3545,7 +3545,7 @@ QDF_STATUS wma_enable_wow_in_fw(WMA_HANDLE handle) int host_credits; int wmi_pending_cmds; #ifdef CONFIG_CNSS - tpAniSirGlobal pMac = cds_get_context(CDF_MODULE_ID_PE); + tpAniSirGlobal pMac = cds_get_context(QDF_MODULE_ID_PE); if (NULL == pMac) { WMA_LOGE("%s: Unable to get PE context", __func__); @@ -3652,7 +3652,7 @@ QDF_STATUS wma_enable_wow_in_fw(WMA_HANDLE handle) WMA_LOGD("WOW enabled successfully in fw: credits:%d" "pending_cmds: %d", host_credits, wmi_pending_cmds); - scn = cds_get_context(CDF_MODULE_ID_HIF); + scn = cds_get_context(QDF_MODULE_ID_HIF); if (scn == NULL) { WMA_LOGE("%s: Failed to get HIF context", __func__); @@ -3678,9 +3678,9 @@ error: * * Return: CDF status */ -QDF_STATUS wma_resume_req(tp_wma_handle wma, enum cdf_suspend_type type) +QDF_STATUS wma_resume_req(tp_wma_handle wma, enum qdf_suspend_type type) { - if (type == CDF_SYSTEM_SUSPEND) { + if (type == QDF_SYSTEM_SUSPEND) { wma->no_of_resume_ind++; if (wma->no_of_resume_ind < wma_get_vdev_count(wma)) @@ -4196,11 +4196,11 @@ void wma_apply_lphb(tp_wma_handle wma) {} #endif /* FEATURE_WLAN_LPHB */ static void wma_notify_suspend_req_procesed(tp_wma_handle wma, - enum cdf_suspend_type type) + enum qdf_suspend_type type) { - if (type == CDF_SYSTEM_SUSPEND) + if (type == QDF_SYSTEM_SUSPEND) wma_send_status_to_suspend_ind(wma, true); - else if (type == CDF_RUNTIME_SUSPEND) + else if (type == QDF_RUNTIME_SUSPEND) qdf_event_set(&wma->runtime_suspend); } @@ -4214,9 +4214,9 @@ static void wma_notify_suspend_req_procesed(tp_wma_handle wma, * * Return: CDF status */ -QDF_STATUS wma_suspend_req(tp_wma_handle wma, enum cdf_suspend_type type) +QDF_STATUS wma_suspend_req(tp_wma_handle wma, enum qdf_suspend_type type) { - if (type == CDF_RUNTIME_SUSPEND) + if (type == QDF_RUNTIME_SUSPEND) wmi_set_runtime_pm_inprogress(wma->wmi_handle, true); if (wma_is_wow_applicable(wma)) { @@ -4259,7 +4259,7 @@ static QDF_STATUS wma_send_host_wakeup_ind_to_fw(tp_wma_handle wma) int32_t len; int ret; #ifdef CONFIG_CNSS - tpAniSirGlobal pMac = cds_get_context(CDF_MODULE_ID_PE); + tpAniSirGlobal pMac = cds_get_context(QDF_MODULE_ID_PE); if (NULL == pMac) { WMA_LOGE("%s: Unable to get PE context", __func__); return QDF_STATUS_E_FAILURE; @@ -4559,7 +4559,7 @@ void wma_add_ts_req(tp_wma_handle wma, tAddTsParams *msg) * interval_miliseconds overflow 32 bit */ uint32_t intervalMiliseconds; - 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 (NULL == pdev) { WMA_LOGE("%s: Failed to get pdev", __func__); goto err; @@ -4692,7 +4692,7 @@ static int wma_config_packet_filter(tp_wma_handle wma, cmd->filter_action = PACKET_FILTER_SET_INACTIVE; if (enable) { - cmd->num_params = CDF_MIN( + cmd->num_params = QDF_MIN( WMI_PACKET_FILTER_MAX_CMP_PER_PACKET_FILTER, rcv_filter_param->numFieldParams); cmd->filter_type = rcv_filter_param->filterType; @@ -4823,7 +4823,7 @@ QDF_STATUS wma_process_tsm_stats_req(tp_wma_handle wma_handler, */ uint16_t bin_values[QCA_TX_DELAY_HIST_REPORT_BINS] = { 0, }; - 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 (NULL == pdev) { WMA_LOGE("%s: Failed to get pdev", __func__); @@ -4840,7 +4840,7 @@ QDF_STATUS wma_process_tsm_stats_req(tp_wma_handle wma_handler, pTsmRspParams = (tpAniGetTsmStatsRsp) cdf_mem_malloc(sizeof(tAniGetTsmStatsRsp)); if (NULL == pTsmRspParams) { - CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "%s: CDF MEM Alloc Failure", __func__); CDF_ASSERT(0); cdf_mem_free(pTsmStatsMsg); @@ -4885,7 +4885,7 @@ QDF_STATUS wma_process_tsm_stats_req(tp_wma_handle wma_handler, * Return: 0 for success or error code */ static int wma_add_clear_mcbc_filter(tp_wma_handle wma_handle, uint8_t vdev_id, - struct cdf_mac_addr multicast_addr, + struct qdf_mac_addr multicast_addr, bool clearList) { WMI_SET_MCASTBCAST_FILTER_CMD_fixed_param *cmd; @@ -6191,7 +6191,7 @@ int wma_channel_avoid_evt_handler(void *handle, uint8_t *event, sme_msg.bodyptr = sca_indication; sme_msg.bodyval = 0; - qdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); + qdf_status = cds_mq_post_message(QDF_MODULE_ID_SME, &sme_msg); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGE("Fail to post eWNI_SME_CH_AVOID_IND msg to SME"); cdf_mem_free(sca_indication); @@ -6287,7 +6287,7 @@ void wma_send_regdomain_info_to_fw(uint32_t reg_dmn, uint16_t regdmn2G, wmi_buf_t buf; wmi_pdev_set_regdomain_cmd_fixed_param *cmd; int32_t len = sizeof(*cmd); - tp_wma_handle wma = cds_get_context(CDF_MODULE_ID_WMA); + tp_wma_handle wma = cds_get_context(QDF_MODULE_ID_WMA); int32_t cck_mask_val = 0; int ret = 0; @@ -6349,7 +6349,7 @@ static QDF_STATUS wma_post_runtime_resume_msg(WMA_HANDLE handle) resume_msg.bodyptr = NULL; resume_msg.type = WMA_RUNTIME_PM_RESUME_IND; - return cds_mq_post_message(CDF_MODULE_ID_WMA, &resume_msg); + return cds_mq_post_message(QDF_MODULE_ID_WMA, &resume_msg); } /** @@ -6371,7 +6371,7 @@ static QDF_STATUS wma_post_runtime_suspend_msg(WMA_HANDLE handle) cds_msg.bodyptr = NULL; cds_msg.type = WMA_RUNTIME_PM_SUSPEND_IND; - qdf_status = cds_mq_post_message(CDF_MODULE_ID_WMA, &cds_msg); + qdf_status = cds_mq_post_message(QDF_MODULE_ID_WMA, &cds_msg); if (qdf_status != QDF_STATUS_SUCCESS) goto failure; @@ -6398,9 +6398,9 @@ failure: * * Return: 0 for success or error code */ -static int __wma_bus_suspend(enum cdf_suspend_type type) +static int __wma_bus_suspend(enum qdf_suspend_type type) { - WMA_HANDLE handle = cds_get_context(CDF_MODULE_ID_WMA); + WMA_HANDLE handle = cds_get_context(QDF_MODULE_ID_WMA); if (NULL == handle) { WMA_LOGE("%s: wma context is NULL", __func__); return -EFAULT; @@ -6411,13 +6411,13 @@ static int __wma_bus_suspend(enum cdf_suspend_type type) return -EBUSY; } - if (type == CDF_RUNTIME_SUSPEND) { + if (type == QDF_RUNTIME_SUSPEND) { QDF_STATUS status = wma_post_runtime_suspend_msg(handle); if (status) return qdf_status_to_os_return(status); } - if (type == CDF_SYSTEM_SUSPEND) + if (type == QDF_SYSTEM_SUSPEND) WMA_LOGE("%s: wow mode selected %d", __func__, wma_is_wow_mode_selected(handle)); @@ -6444,7 +6444,7 @@ static int __wma_bus_suspend(enum cdf_suspend_type type) */ int wma_runtime_suspend(void) { - return __wma_bus_suspend(CDF_RUNTIME_SUSPEND); + return __wma_bus_suspend(QDF_RUNTIME_SUSPEND); } /** @@ -6457,7 +6457,7 @@ int wma_runtime_suspend(void) int wma_bus_suspend(void) { - return __wma_bus_suspend(CDF_SYSTEM_SUSPEND); + return __wma_bus_suspend(QDF_SYSTEM_SUSPEND); } /** @@ -6490,7 +6490,7 @@ int wma_runtime_resume(void) { int ret; QDF_STATUS status; - WMA_HANDLE handle = cds_get_context(CDF_MODULE_ID_WMA); + WMA_HANDLE handle = cds_get_context(QDF_MODULE_ID_WMA); if (NULL == handle) { WMA_LOGE("%s: wma context is NULL", __func__); return -EFAULT; @@ -6514,7 +6514,7 @@ int wma_runtime_resume(void) */ int wma_bus_resume(void) { - WMA_HANDLE handle = cds_get_context(CDF_MODULE_ID_WMA); + WMA_HANDLE handle = cds_get_context(QDF_MODULE_ID_WMA); if (NULL == handle) { WMA_LOGE("%s: wma context is NULL", __func__); return -EFAULT; @@ -6539,7 +6539,7 @@ int wma_suspend_target(WMA_HANDLE handle, int disable_target_intr) struct hif_opaque_softc *scn; int ret; #ifdef CONFIG_CNSS - tpAniSirGlobal pmac = cds_get_context(CDF_MODULE_ID_PE); + tpAniSirGlobal pmac = cds_get_context(QDF_MODULE_ID_PE); #endif if (!wma_handle || !wma_handle->wmi_handle) { @@ -6602,7 +6602,7 @@ int wma_suspend_target(WMA_HANDLE handle, int disable_target_intr) return -EFAULT; } - scn = cds_get_context(CDF_MODULE_ID_HIF); + scn = cds_get_context(QDF_MODULE_ID_HIF); if (scn == NULL) { WMA_LOGE("%s: Failed to get HIF context", __func__); @@ -6623,7 +6623,7 @@ int wma_suspend_target(WMA_HANDLE handle, int disable_target_intr) */ void wma_target_suspend_acknowledge(void *context) { - tp_wma_handle wma = cds_get_context(CDF_MODULE_ID_WMA); + tp_wma_handle wma = cds_get_context(QDF_MODULE_ID_WMA); int wow_nack = *((int *)context); if (NULL == wma) { @@ -6653,7 +6653,7 @@ int wma_resume_target(WMA_HANDLE handle) wmi_pdev_resume_cmd_fixed_param *cmd; QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; #ifdef CONFIG_CNSS - tpAniSirGlobal pMac = cds_get_context(CDF_MODULE_ID_PE); + tpAniSirGlobal pMac = cds_get_context(QDF_MODULE_ID_PE); if (NULL == pMac) { WMA_LOGE("%s: Unable to get PE context", __func__); return -EINVAL; @@ -7230,7 +7230,7 @@ int wma_update_tdls_peer_state(WMA_HANDLE handle, /* in case of teardown, remove peer from fw */ if (WMA_TDLS_PEER_STATE_TEARDOWN == peerStateParams->peerState) { - pdev = cds_get_context(CDF_MODULE_ID_TXRX); + pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (!pdev) { WMA_LOGE("%s: Failed to find pdev", __func__); ret = -EIO; @@ -7363,15 +7363,15 @@ void wma_dfs_configure(struct ieee80211com *ic) WMA_LOGI("%s: DFS-FCC domain", __func__); rinfo.dfsdomain = DFS_FCC_DOMAIN; rinfo.dfs_radars = dfs_fcc_radars; - rinfo.numradars = CDF_ARRAY_SIZE(dfs_fcc_radars); + rinfo.numradars = QDF_ARRAY_SIZE(dfs_fcc_radars); rinfo.b5pulses = dfs_fcc_bin5pulses; - rinfo.numb5radars = CDF_ARRAY_SIZE(dfs_fcc_bin5pulses); + rinfo.numb5radars = QDF_ARRAY_SIZE(dfs_fcc_bin5pulses); break; case DFS_ETSI_DOMAIN: WMA_LOGI("%s: DFS-ETSI domain", __func__); rinfo.dfsdomain = DFS_ETSI_DOMAIN; rinfo.dfs_radars = dfs_etsi_radars; - rinfo.numradars = CDF_ARRAY_SIZE(dfs_etsi_radars); + rinfo.numradars = QDF_ARRAY_SIZE(dfs_etsi_radars); rinfo.b5pulses = NULL; rinfo.numb5radars = 0; break; @@ -7379,9 +7379,9 @@ void wma_dfs_configure(struct ieee80211com *ic) WMA_LOGI("%s: DFS-MKK4 domain", __func__); rinfo.dfsdomain = DFS_MKK4_DOMAIN; rinfo.dfs_radars = dfs_mkk4_radars; - rinfo.numradars = CDF_ARRAY_SIZE(dfs_mkk4_radars); + rinfo.numradars = QDF_ARRAY_SIZE(dfs_mkk4_radars); rinfo.b5pulses = dfs_jpn_bin5pulses; - rinfo.numb5radars = CDF_ARRAY_SIZE(dfs_jpn_bin5pulses); + rinfo.numb5radars = QDF_ARRAY_SIZE(dfs_jpn_bin5pulses); break; default: WMA_LOGI("%s: DFS-UNINT domain", __func__); @@ -7605,15 +7605,15 @@ int wma_dfs_indicate_radar(struct ieee80211com *ic, tpAniSirGlobal pmac = NULL; bool indication_status; - wma = cds_get_context(CDF_MODULE_ID_WMA); + wma = cds_get_context(QDF_MODULE_ID_WMA); if (wma == NULL) { WMA_LOGE("%s: DFS- Invalid wma", __func__); return -ENOENT; } - hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); + hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); pmac = (tpAniSirGlobal) - cds_get_context(CDF_MODULE_ID_PE); + cds_get_context(QDF_MODULE_ID_PE); if (!pmac) { WMA_LOGE("%s: Invalid MAC handle", __func__); @@ -7809,7 +7809,7 @@ static QDF_STATUS wma_fw_mem_dump_rsp(uint32_t req_id, uint32_t status) sme_msg.bodyptr = dump_rsp; sme_msg.bodyval = 0; - qdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); + qdf_status = cds_mq_post_message(QDF_MODULE_ID_SME, &sme_msg); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGE(FL("Fail to post fw mem dump ind msg")); cdf_mem_free(dump_rsp); diff --git a/core/wma/src/wma_main.c b/core/wma/src/wma_main.c index 76ae27d22b..a4de6d9d0b 100644 --- a/core/wma/src/wma_main.c +++ b/core/wma/src/wma_main.c @@ -48,7 +48,7 @@ #include "wlan_tgt_def_config.h" #include "cdf_nbuf.h" -#include "cdf_types.h" +#include "qdf_types.h" #include "ol_txrx_api.h" #include "cdf_memory.h" #include "ol_txrx_types.h" @@ -158,7 +158,7 @@ static uint8_t wma_get_number_of_peers_supported(tp_wma_handle wma) struct hif_target_info *tgt_info; struct wma_ini_config *cfg = wma_get_ini_handle(wma); uint8_t max_no_of_peers = cfg ? cfg->max_no_of_peers : MIN_NO_OF_PEERS; - struct hif_opaque_softc *scn = cds_get_context(CDF_MODULE_ID_HIF); + struct hif_opaque_softc *scn = cds_get_context(QDF_MODULE_ID_HIF); if (!scn) { WMA_LOGE("%s: Invalid wma handle", __func__); @@ -270,7 +270,7 @@ int wma_cli_get_command(int vdev_id, int param_id, int vpdev) tp_wma_handle wma; struct wma_txrx_node *intr = NULL; - wma = cds_get_context(CDF_MODULE_ID_WMA); + wma = cds_get_context(QDF_MODULE_ID_WMA); if (NULL == wma) { WMA_LOGE("%s: Invalid wma handle", __func__); @@ -522,7 +522,7 @@ int wma_cli_set2_command(int vdev_id, int param_id, int sval1, msg.bodyptr = iwcmd; if (QDF_STATUS_SUCCESS != - cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { + cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) { WMA_LOGP("%s: Failed to post WMA_CLI_SET_CMD msg", __func__); cdf_mem_free(iwcmd); @@ -732,7 +732,7 @@ static int32_t wma_set_priv_cfg(tp_wma_handle wma_handle, { ol_txrx_pdev_handle pdev; - pdev = cds_get_context(CDF_MODULE_ID_TXRX); + pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (!pdev) { WMA_LOGE("pdev NULL for uc stat"); return -EINVAL; @@ -853,7 +853,7 @@ static void wma_process_cli_set_cmd(tp_wma_handle wma, { int ret = 0, vid = privcmd->param_vdev_id, pps_val = 0; struct wma_txrx_node *intr = wma->interfaces; - tpAniSirGlobal pMac = cds_get_context(CDF_MODULE_ID_PE); + tpAniSirGlobal pMac = cds_get_context(QDF_MODULE_ID_PE); struct qpower_params *qparams = &intr[vid].config.qpower_params; WMA_LOGD("wmihandle %p", wma->wmi_handle); @@ -1593,7 +1593,7 @@ QDF_STATUS wma_open(void *cds_context, { tp_wma_handle wma_handle; HTC_HANDLE htc_handle; - cdf_device_t cdf_dev; + qdf_device_t qdf_dev; void *wmi_handle; QDF_STATUS qdf_status; QDF_STATUS qdf_status; @@ -1601,8 +1601,8 @@ QDF_STATUS wma_open(void *cds_context, WMA_LOGD("%s: Enter", __func__); - cdf_dev = cds_get_context(CDF_MODULE_ID_CDF_DEVICE); - htc_handle = cds_get_context(CDF_MODULE_ID_HTC); + qdf_dev = cds_get_context(QDF_MODULE_ID_QDF_DEVICE); + htc_handle = cds_get_context(QDF_MODULE_ID_HTC); if (!htc_handle) { WMA_LOGP("%s: Invalid HTC handle", __func__); @@ -1610,7 +1610,7 @@ QDF_STATUS wma_open(void *cds_context, } /* Alloc memory for WMA Context */ - qdf_status = cds_alloc_context(cds_context, CDF_MODULE_ID_WMA, + qdf_status = cds_alloc_context(cds_context, QDF_MODULE_ID_WMA, (void **)&wma_handle, sizeof(t_wma_handle)); @@ -1622,7 +1622,7 @@ QDF_STATUS wma_open(void *cds_context, cdf_mem_zero(wma_handle, sizeof(t_wma_handle)); - if (cds_get_conparam() != CDF_GLOBAL_FTM_MODE) { + if (cds_get_conparam() != QDF_GLOBAL_FTM_MODE) { #ifdef FEATURE_WLAN_SCAN_PNO cdf_wake_lock_init(&wma_handle->pno_wake_lock, "wlan_pno_wl"); #endif /* FEATURE_WLAN_SCAN_PNO */ @@ -1648,7 +1648,7 @@ QDF_STATUS wma_open(void *cds_context, wma_handle->wmi_handle = wmi_handle; wma_handle->htc_handle = htc_handle; wma_handle->cds_context = cds_context; - wma_handle->cdf_dev = cdf_dev; + wma_handle->qdf_dev = qdf_dev; wma_handle->max_scan = mac_params->max_scan; /* initialize default target config */ @@ -1709,7 +1709,7 @@ QDF_STATUS wma_open(void *cds_context, goto err_wmi_handle; } #if defined(QCA_WIFI_FTM) - if (cds_get_conparam() == CDF_GLOBAL_FTM_MODE) + if (cds_get_conparam() == QDF_GLOBAL_FTM_MODE) wma_utf_attach(wma_handle); #endif /* QCA_WIFI_FTM */ wma_init_max_no_of_peers(wma_handle, mac_params->maxStation); @@ -1784,7 +1784,7 @@ QDF_STATUS wma_open(void *cds_context, } qdf_status = cdf_mc_timer_init(&wma_handle->service_ready_ext_timer, - CDF_TIMER_TYPE_SW, + QDF_TIMER_TYPE_SW, wma_service_ready_ext_evt_timeout, wma_handle); if (!CDF_IS_STATUS_SUCCESS(qdf_status)) { @@ -2029,7 +2029,7 @@ err_wmi_handle: err_wma_handle: - if (cds_get_conparam() != CDF_GLOBAL_FTM_MODE) { + if (cds_get_conparam() != QDF_GLOBAL_FTM_MODE) { #ifdef FEATURE_WLAN_SCAN_PNO cdf_wake_lock_destroy(&wma_handle->pno_wake_lock); #endif /* FEATURE_WLAN_SCAN_PNO */ @@ -2038,7 +2038,7 @@ err_wma_handle: #endif /* FEATURE_WLAN_EXTSCAN */ cdf_wake_lock_destroy(&wma_handle->wow_wake_lock); } - cds_free_context(cds_context, CDF_MODULE_ID_WMA, wma_handle); + cds_free_context(cds_context, QDF_MODULE_ID_WMA, wma_handle); WMA_LOGD("%s: Exit", __func__); @@ -2060,7 +2060,7 @@ QDF_STATUS wma_pre_start(void *cds_ctx) WMA_LOGD("%s: Enter", __func__); - wma_handle = cds_get_context(CDF_MODULE_ID_WMA); + wma_handle = cds_get_context(QDF_MODULE_ID_WMA); /* Validate the wma_handle */ if (NULL == wma_handle) { @@ -2109,7 +2109,7 @@ void wma_send_msg(tp_wma_handle wma_handle, uint16_t msg_type, { tSirMsgQ msg = { 0 }; uint32_t status = QDF_STATUS_SUCCESS; - tpAniSirGlobal pMac = cds_get_context(CDF_MODULE_ID_PE); + tpAniSirGlobal pMac = cds_get_context(QDF_MODULE_ID_PE); msg.type = msg_type; msg.bodyval = body_val; msg.bodyptr = body_ptr; @@ -2628,7 +2628,7 @@ QDF_STATUS wma_start(void *cds_ctx) int status; WMA_LOGD("%s: Enter", __func__); - wma_handle = cds_get_context(CDF_MODULE_ID_WMA); + wma_handle = cds_get_context(QDF_MODULE_ID_WMA); /* validate the wma_handle */ if (NULL == wma_handle) { @@ -2754,7 +2754,7 @@ QDF_STATUS wma_start(void *cds_ctx) * Tx mgmt attach requires TXRX context which is not created * in FTM mode. So skip the TX mgmt attach. */ - if (cds_get_conparam() == CDF_GLOBAL_FTM_MODE) + if (cds_get_conparam() == QDF_GLOBAL_FTM_MODE) goto end; #endif /* QCA_WIFI_FTM */ @@ -2766,7 +2766,7 @@ QDF_STATUS wma_start(void *cds_ctx) /* Initialize log completion timeout */ qdf_status = cdf_mc_timer_init(&wma_handle->log_completion_timer, - CDF_TIMER_TYPE_SW, + QDF_TIMER_TYPE_SW, wma_log_completion_timeout, wma_handle); if (qdf_status != QDF_STATUS_SUCCESS) { @@ -2842,7 +2842,7 @@ QDF_STATUS wma_stop(void *cds_ctx, uint8_t reason) tp_wma_handle wma_handle; QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; int i; - wma_handle = cds_get_context(CDF_MODULE_ID_WMA); + wma_handle = cds_get_context(QDF_MODULE_ID_WMA); WMA_LOGD("%s: Enter", __func__); @@ -2857,7 +2857,7 @@ QDF_STATUS wma_stop(void *cds_ctx, uint8_t reason) * Tx mgmt detach requires TXRX context which is not created * in FTM mode. So skip the TX mgmt detach. */ - if (cds_get_conparam() == CDF_GLOBAL_FTM_MODE) { + if (cds_get_conparam() == QDF_GLOBAL_FTM_MODE) { qdf_status = QDF_STATUS_SUCCESS; goto end; } @@ -2990,7 +2990,7 @@ QDF_STATUS wma_wmi_service_close(void *cds_ctx) WMA_LOGD("%s: Enter", __func__); - wma_handle = cds_get_context(CDF_MODULE_ID_WMA); + wma_handle = cds_get_context(QDF_MODULE_ID_WMA); /* validate the wma_handle */ if (NULL == wma_handle) { @@ -3014,8 +3014,8 @@ QDF_STATUS wma_wmi_service_close(void *cds_ctx) if (bcn) { if (bcn->dma_mapped) - cdf_nbuf_unmap_single(wma_handle->cdf_dev, - bcn->buf, CDF_DMA_TO_DEVICE); + cdf_nbuf_unmap_single(wma_handle->qdf_dev, + bcn->buf, QDF_DMA_TO_DEVICE); cdf_nbuf_free(bcn->buf); cdf_mem_free(bcn); wma_handle->interfaces[i].beacon = NULL; @@ -3040,7 +3040,7 @@ QDF_STATUS wma_wmi_service_close(void *cds_ctx) cdf_mem_free(wma_handle->interfaces); /* free the wma_handle */ - cds_free_context(wma_handle->cds_context, CDF_MODULE_ID_WMA, + cds_free_context(wma_handle->cds_context, QDF_MODULE_ID_WMA, wma_handle); cdf_mem_free(((p_cds_contextType) cds_ctx)->cfg_ctx); @@ -3064,7 +3064,7 @@ QDF_STATUS wma_wmi_work_close(void *cds_ctx) WMA_LOGD("%s: Enter", __func__); - wma_handle = cds_get_context(CDF_MODULE_ID_WMA); + wma_handle = cds_get_context(QDF_MODULE_ID_WMA); /* validate the wma_handle */ if (NULL == wma_handle) { @@ -3101,7 +3101,7 @@ QDF_STATUS wma_close(void *cds_ctx) WMA_LOGD("%s: Enter", __func__); - wma_handle = cds_get_context(CDF_MODULE_ID_WMA); + wma_handle = cds_get_context(QDF_MODULE_ID_WMA); /* validate the wma_handle */ if (NULL == wma_handle) { @@ -3133,7 +3133,7 @@ QDF_STATUS wma_close(void *cds_ctx) wma_handle->saved_wmi_init_cmd.buf = NULL; } - if (cds_get_conparam() != CDF_GLOBAL_FTM_MODE) { + if (cds_get_conparam() != QDF_GLOBAL_FTM_MODE) { #ifdef FEATURE_WLAN_SCAN_PNO cdf_wake_lock_destroy(&wma_handle->pno_wake_lock); #endif /* FEATURE_WLAN_SCAN_PNO */ @@ -3164,18 +3164,18 @@ QDF_STATUS wma_close(void *cds_ctx) cdf_wake_lock_destroy(&wma_handle->wmi_cmd_rsp_wake_lock); cdf_runtime_lock_deinit(wma_handle->wmi_cmd_rsp_runtime_lock); for (idx = 0; idx < wma_handle->num_mem_chunks; ++idx) { - cdf_os_mem_free_consistent(wma_handle->cdf_dev, + cdf_os_mem_free_consistent(wma_handle->qdf_dev, wma_handle->mem_chunks[idx].len, wma_handle->mem_chunks[idx].vaddr, wma_handle->mem_chunks[idx].paddr, - cdf_get_dma_mem_context( + qdf_get_dma_mem_context( (&(wma_handle->mem_chunks[idx])), memctx)); } #if defined(QCA_WIFI_FTM) /* Detach UTF and unregister the handler */ - if (cds_get_conparam() == CDF_GLOBAL_FTM_MODE) + if (cds_get_conparam() == QDF_GLOBAL_FTM_MODE) wma_utf_detach(wma_handle); #endif /* QCA_WIFI_FTM */ @@ -3213,7 +3213,7 @@ static void wma_update_fw_config(tp_wma_handle wma_handle, */ /* Override the no. of max fragments as per platform configuration */ tgt_cap->wlan_resource_config.max_frag_entries = - CDF_MIN(QCA_OL_11AC_TX_MAX_FRAGS, + QDF_MIN(QCA_OL_11AC_TX_MAX_FRAGS, wma_handle->max_frag_entry); wma_handle->max_frag_entry = tgt_cap->wlan_resource_config.max_frag_entries; @@ -3237,7 +3237,7 @@ static uint32_t wma_alloc_host_mem_chunk(tp_wma_handle wma_handle, uint32_t req_id, uint32_t idx, uint32_t num_units, uint32_t unit_len) { - cdf_dma_addr_t paddr; + qdf_dma_addr_t paddr; if (!num_units || !unit_len) { return 0; } @@ -3245,9 +3245,9 @@ static uint32_t wma_alloc_host_mem_chunk(tp_wma_handle wma_handle, /** reduce the requested allocation by half until allocation succeeds */ while (wma_handle->mem_chunks[idx].vaddr == NULL && num_units) { wma_handle->mem_chunks[idx].vaddr = - cdf_os_mem_alloc_consistent(wma_handle->cdf_dev, + cdf_os_mem_alloc_consistent(wma_handle->qdf_dev, num_units * unit_len, &paddr, - cdf_get_dma_mem_context( + qdf_get_dma_mem_context( (&(wma_handle->mem_chunks[idx])), memctx)); if (wma_handle->mem_chunks[idx].vaddr == NULL) { @@ -3513,7 +3513,7 @@ static inline void wma_update_target_vht_cap(tp_wma_handle wh, static void wma_update_hdd_cfg(tp_wma_handle wma_handle) { struct wma_tgt_cfg tgt_cfg; - void *hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); + void *hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); cdf_mem_zero(&tgt_cfg, sizeof(struct wma_tgt_cfg)); tgt_cfg.reg_domain = wma_handle->reg_cap.eeprom_rd; @@ -3736,7 +3736,7 @@ void wma_init_scan_fw_mode_config(tp_wma_handle wma_handle, uint32_t scan_config, uint32_t fw_config) { - tpAniSirGlobal mac = cds_get_context(CDF_MODULE_ID_PE); + tpAniSirGlobal mac = cds_get_context(QDF_MODULE_ID_PE); WMA_LOGD("%s: Enter", __func__); @@ -4221,7 +4221,7 @@ void wma_setneedshutdown(void *cds_ctx) WMA_LOGD("%s: Enter", __func__); - wma_handle = cds_get_context(CDF_MODULE_ID_WMA); + wma_handle = cds_get_context(QDF_MODULE_ID_WMA); if (NULL == wma_handle) { WMA_LOGP("%s: Invalid arguments", __func__); @@ -4245,7 +4245,7 @@ bool wma_needshutdown(void *cds_ctx) WMA_LOGD("%s: Enter", __func__); - wma_handle = cds_get_context(CDF_MODULE_ID_WMA); + wma_handle = cds_get_context(QDF_MODULE_ID_WMA); if (NULL == wma_handle) { WMA_LOGP("%s: Invalid arguments", __func__); @@ -4291,7 +4291,7 @@ QDF_STATUS wma_wait_for_ready_event(WMA_HANDLE handle) QDF_STATUS wma_set_ppsconfig(uint8_t vdev_id, uint16_t pps_param, int val) { - tp_wma_handle wma = cds_get_context(CDF_MODULE_ID_WMA); + tp_wma_handle wma = cds_get_context(QDF_MODULE_ID_WMA); int ret = -EIO; uint32_t pps_val; @@ -4625,7 +4625,7 @@ void wma_set_wifi_start_packet_stats(void *wma_handle, return; } - scn = cds_get_context(CDF_MODULE_ID_HIF); + scn = cds_get_context(QDF_MODULE_ID_HIF); log_state = ATH_PKTLOG_ANI | ATH_PKTLOG_RCUPDATE | ATH_PKTLOG_RCFIND | ATH_PKTLOG_RX | ATH_PKTLOG_TX | ATH_PKTLOG_TEXT; @@ -4712,7 +4712,7 @@ QDF_STATUS wma_mc_process_msg(void *cds_context, cds_msg_t *msg) WMA_LOGD("msg->type = %x %s", msg->type, mac_trace_get_wma_msg_string(msg->type)); - wma_handle = cds_get_context(CDF_MODULE_ID_WMA); + wma_handle = cds_get_context(QDF_MODULE_ID_WMA); if (NULL == wma_handle) { WMA_LOGP("%s: wma_handle is NULL", __func__); @@ -4960,16 +4960,16 @@ QDF_STATUS wma_mc_process_msg(void *cds_context, cds_msg_t *msg) case WMA_RUNTIME_PM_SUSPEND_IND: wma_calculate_and_update_conn_state(wma_handle); - wma_suspend_req(wma_handle, CDF_RUNTIME_SUSPEND); + wma_suspend_req(wma_handle, QDF_RUNTIME_SUSPEND); break; case WMA_RUNTIME_PM_RESUME_IND: - wma_resume_req(wma_handle, CDF_RUNTIME_SUSPEND); + wma_resume_req(wma_handle, QDF_RUNTIME_SUSPEND); break; case WMA_WLAN_SUSPEND_IND: wma_update_conn_state(wma_handle, msg->bodyval); - wma_suspend_req(wma_handle, CDF_SYSTEM_SUSPEND); + wma_suspend_req(wma_handle, QDF_SYSTEM_SUSPEND); break; case WMA_8023_MULTICAST_LIST_REQ: wma_process_mcbc_set_filter_req(wma_handle, @@ -5108,7 +5108,7 @@ QDF_STATUS wma_mc_process_msg(void *cds_context, cds_msg_t *msg) cdf_mem_free(msg->bodyptr); break; case WMA_WLAN_RESUME_REQ: - wma_resume_req(wma_handle, CDF_SYSTEM_SUSPEND); + wma_resume_req(wma_handle, QDF_SYSTEM_SUSPEND); break; #ifdef WLAN_FEATURE_STATS_EXT @@ -5670,7 +5670,7 @@ int wma_lro_init(struct wma_lro_config_cmd_t *lro_config) msg.bodyptr = iwcmd; if (QDF_STATUS_SUCCESS != - cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { + cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) { WMA_LOGE("Failed to post WMA_LRO_CONFIG_CMD msg!"); cdf_mem_free(iwcmd); return -EAGAIN; diff --git a/core/wma/src/wma_mgmt.c b/core/wma/src/wma_mgmt.c index 02cbc2ebe6..9a22783747 100644 --- a/core/wma/src/wma_mgmt.c +++ b/core/wma/src/wma_mgmt.c @@ -47,7 +47,7 @@ #include "wlan_tgt_def_config.h" #include "cdf_nbuf.h" -#include "cdf_types.h" +#include "qdf_types.h" #include "ol_txrx_api.h" #include "cdf_memory.h" #include "ol_txrx_types.h" @@ -200,10 +200,10 @@ static void wma_send_bcn_buf_ll(tp_wma_handle wma, } if (bcn->dma_mapped) { - cdf_nbuf_unmap_single(pdev->osdev, bcn->buf, CDF_DMA_TO_DEVICE); + cdf_nbuf_unmap_single(pdev->osdev, bcn->buf, QDF_DMA_TO_DEVICE); bcn->dma_mapped = 0; } - ret = cdf_nbuf_map_single(pdev->osdev, bcn->buf, CDF_DMA_TO_DEVICE); + ret = cdf_nbuf_map_single(pdev->osdev, bcn->buf, QDF_DMA_TO_DEVICE); if (ret != QDF_STATUS_SUCCESS) { cdf_nbuf_free(wmi_buf); WMA_LOGE("%s: failed map beacon buf to DMA region", __func__); @@ -268,7 +268,7 @@ int wma_beacon_swba_handler(void *handle, uint8_t *event, uint32_t len) swba_event = param_buf->fixed_param; vdev_map = swba_event->vdev_map; - pdev = cds_get_context(CDF_MODULE_ID_TXRX); + pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (!pdev) { WMA_LOGE("%s: pdev is NULL", __func__); return -EINVAL; @@ -310,7 +310,7 @@ int wma_peer_sta_kickout_event_handler(void *handle, u8 *event, u32 len) WMA_LOGD("%s: Enter", __func__); param_buf = (WMI_PEER_STA_KICKOUT_EVENTID_param_tlvs *) event; kickout_event = param_buf->fixed_param; - pdev = cds_get_context(CDF_MODULE_ID_TXRX); + pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (!pdev) { WMA_LOGE("%s: pdev is NULL", __func__); return -EINVAL; @@ -565,7 +565,7 @@ static inline void wma_get_link_probe_timeout(struct sAniSirGlobal *mac, void wma_set_sap_keepalive(tp_wma_handle wma, uint8_t vdev_id) { uint32_t min_inactive_time, max_inactive_time, max_unresponsive_time; - struct sAniSirGlobal *mac = cds_get_context(CDF_MODULE_ID_PE); + struct sAniSirGlobal *mac = cds_get_context(QDF_MODULE_ID_PE); if (NULL == mac) { WMA_LOGE("%s: Failed to get mac", __func__); @@ -610,7 +610,7 @@ void wma_set_sap_keepalive(tp_wma_handle wma, uint8_t vdev_id) void wma_set_sta_sa_query_param(tp_wma_handle wma, uint8_t vdev_id) { - struct sAniSirGlobal *mac = cds_get_context(CDF_MODULE_ID_PE); + struct sAniSirGlobal *mac = cds_get_context(QDF_MODULE_ID_PE); uint32_t max_retries, retry_interval; wmi_buf_t buf; WMI_PMF_OFFLOAD_SET_SA_QUERY_CMD_fixed_param *cmd; @@ -850,7 +850,7 @@ int32_t wmi_unified_send_peer_assoc(tp_wma_handle wma, } intr = &wma->interfaces[params->smesessionId]; - pdev = cds_get_context(CDF_MODULE_ID_TXRX); + pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (NULL == pdev) { WMA_LOGE("%s: Failed to get pdev", __func__); @@ -1327,7 +1327,7 @@ void wma_update_cfg_params(tp_wma_handle wma, tSirMsgQ *cfgParam) return; } - pmac = cds_get_context(CDF_MODULE_ID_PE); + pmac = cds_get_context(QDF_MODULE_ID_PE); if (NULL == pmac) { WMA_LOGE("%s: Failed to get pmac", __func__); @@ -1806,7 +1806,7 @@ void wma_adjust_ibss_heart_beat_timer(tp_wma_handle wma, */ static void wma_set_ibsskey_helper(tp_wma_handle wma_handle, tpSetBssKeyParams key_info, - struct cdf_mac_addr peer_macaddr) + struct qdf_mac_addr peer_macaddr) { struct wma_set_key_params key_params; wmi_buf_t buf; @@ -1904,7 +1904,7 @@ void wma_set_stakey(tp_wma_handle wma_handle, tpSetStaKeyParams key_info) WMA_LOGD("STA key setup"); /* Get the txRx Pdev handle */ - txrx_pdev = cds_get_context(CDF_MODULE_ID_TXRX); + txrx_pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (!txrx_pdev) { WMA_LOGE("%s:Invalid txrx pdev handle", __func__); key_info->status = QDF_STATUS_E_FAILURE; @@ -2086,7 +2086,7 @@ QDF_STATUS wma_process_update_edca_param_req(WMA_HANDLE handle, WMI_VDEV_SET_WMM_PARAMS_CMDID)) goto fail; - pdev = cds_get_context(CDF_MODULE_ID_TXRX); + pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (pdev) ol_txrx_set_wmm_param(pdev, ol_tx_wmm_param); else @@ -2679,7 +2679,7 @@ int wma_mgmt_tx_completion_handler(void *handle, uint8_t *cmpl_event_params, wmi_mgmt_tx_compl_event_fixed_param *cmpl_params; struct wmi_desc_t *wmi_desc; - ol_txrx_pdev_handle pdev = cds_get_context(CDF_MODULE_ID_TXRX); + ol_txrx_pdev_handle pdev = cds_get_context(QDF_MODULE_ID_TXRX); param_buf = (WMI_MGMT_TX_COMPLETION_EVENTID_param_tlvs *) cmpl_event_params; @@ -2702,7 +2702,7 @@ int wma_mgmt_tx_completion_handler(void *handle, uint8_t *cmpl_event_params, if (wmi_desc->nbuf) cdf_nbuf_unmap_single(pdev->osdev, wmi_desc->nbuf, - CDF_DMA_TO_DEVICE); + QDF_DMA_TO_DEVICE); if (wmi_desc->tx_cmpl_cb) wmi_desc->tx_cmpl_cb(wma_handle->mac_context, wmi_desc->nbuf, 1); @@ -2812,7 +2812,7 @@ void wma_process_update_userpos(tp_wma_handle wma_handle, */ QDF_STATUS wma_set_htconfig(uint8_t vdev_id, uint16_t ht_capab, int value) { - tp_wma_handle wma = cds_get_context(CDF_MODULE_ID_WMA); + tp_wma_handle wma = cds_get_context(QDF_MODULE_ID_WMA); int ret = -EIO; if (NULL == wma) { @@ -2953,7 +2953,7 @@ wma_is_ccmp_pn_replay_attack(void *cds_ctx, struct ieee80211_frame *wh, uint64_t *last_pn, new_pn; uint32_t *rmf_pn_replays; - pdev = cds_get_context(CDF_MODULE_ID_TXRX); + pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (!pdev) { WMA_LOGE("%s: Failed to find pdev", __func__); return true; @@ -3311,11 +3311,11 @@ QDF_STATUS wma_de_register_mgmt_frm_client(void *cds_ctx) tp_wma_handle wma_handle; #ifdef QCA_WIFI_FTM - if (cds_get_conparam() == CDF_GLOBAL_FTM_MODE) + if (cds_get_conparam() == QDF_GLOBAL_FTM_MODE) return QDF_STATUS_SUCCESS; #endif - wma_handle = cds_get_context(CDF_MODULE_ID_WMA); + wma_handle = cds_get_context(QDF_MODULE_ID_WMA); if (!wma_handle) { WMA_LOGE("%s: Failed to get WMA context", __func__); return QDF_STATUS_E_FAILURE; @@ -3350,7 +3350,7 @@ QDF_STATUS wma_register_roaming_callbacks(void *cds_ctx, tpSirBssDescription bss_desc_ptr)) { - tp_wma_handle wma = cds_get_context(CDF_MODULE_ID_WMA); + tp_wma_handle wma = cds_get_context(QDF_MODULE_ID_WMA); if (!wma) { WMA_LOGE("%s: Failed to get WMA context", __func__); @@ -3371,7 +3371,7 @@ QDF_STATUS wma_register_roaming_callbacks(void *cds_ctx, QDF_STATUS wma_register_mgmt_frm_client( void *cds_ctx, wma_mgmt_frame_rx_callback mgmt_frm_rx) { - tp_wma_handle wma_handle = cds_get_context(CDF_MODULE_ID_WMA); + tp_wma_handle wma_handle = cds_get_context(QDF_MODULE_ID_WMA); if (!wma_handle) { WMA_LOGE("%s: Failed to get WMA context", __func__); diff --git a/core/wma/src/wma_ocb.c b/core/wma/src/wma_ocb.c index 1bc71f8ae1..def726d125 100644 --- a/core/wma/src/wma_ocb.c +++ b/core/wma/src/wma_ocb.c @@ -93,7 +93,7 @@ int wma_ocb_set_config_resp(tp_wma_handle wma_handle, uint8_t status) msg.type = eWNI_SME_OCB_SET_CONFIG_RSP; msg.bodyptr = resp; - qdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &msg); + qdf_status = cds_mq_post_message(QDF_MODULE_ID_SME, &msg); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGE(FL("Fail to post msg to SME")); cdf_mem_free(resp); @@ -691,7 +691,7 @@ int wma_ocb_get_tsf_timer_resp_event_handler(void *handle, uint8_t *event_buf, msg.type = eWNI_SME_OCB_GET_TSF_TIMER_RSP; msg.bodyptr = response; - qdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &msg); + qdf_status = cds_mq_post_message(QDF_MODULE_ID_SME, &msg); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGE(FL("Failed to post msg to SME")); cdf_mem_free(response); @@ -814,7 +814,7 @@ int wma_dcc_get_stats_resp_event_handler(void *handle, uint8_t *event_buf, msg.type = eWNI_SME_DCC_GET_STATS_RSP; msg.bodyptr = response; - qdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &msg); + qdf_status = cds_mq_post_message(QDF_MODULE_ID_SME, &msg); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGE(FL("Failed to post msg to SME")); cdf_mem_free(response); @@ -1012,7 +1012,7 @@ int wma_dcc_update_ndl_resp_event_handler(void *handle, uint8_t *event_buf, msg.type = eWNI_SME_DCC_UPDATE_NDL_RSP; msg.bodyptr = resp; - qdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &msg); + qdf_status = cds_mq_post_message(QDF_MODULE_ID_SME, &msg); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGE(FL("Failed to post msg to SME")); cdf_mem_free(resp); @@ -1058,7 +1058,7 @@ int wma_dcc_stats_event_handler(void *handle, uint8_t *event_buf, msg.type = eWNI_SME_DCC_STATS_EVENT; msg.bodyptr = response; - qdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &msg); + qdf_status = cds_mq_post_message(QDF_MODULE_ID_SME, &msg); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGE(FL("Failed to post msg to SME")); cdf_mem_free(response); diff --git a/core/wma/src/wma_power.c b/core/wma/src/wma_power.c index 846e9e7878..1326e28e77 100644 --- a/core/wma/src/wma_power.c +++ b/core/wma/src/wma_power.c @@ -46,7 +46,7 @@ #include "wlan_tgt_def_config.h" #include "cdf_nbuf.h" -#include "cdf_types.h" +#include "qdf_types.h" #include "ol_txrx_api.h" #include "cdf_memory.h" #include "ol_txrx_types.h" @@ -125,7 +125,7 @@ int32_t wmi_unified_set_sta_ps_param(wmi_unified_t wmi_handle, tp_wma_handle wma; struct wma_txrx_node *iface; - wma = cds_get_context(CDF_MODULE_ID_WMA); + wma = cds_get_context(QDF_MODULE_ID_WMA); if (NULL == wma) { WMA_LOGE("%s: wma is NULL", __func__); return -EIO; @@ -415,8 +415,8 @@ void wma_set_tx_power(WMA_HANDLE handle, int ret = -1; void *pdev; - if (tx_pwr_params->dev_mode == CDF_SAP_MODE || - tx_pwr_params->dev_mode == CDF_P2P_GO_MODE) { + if (tx_pwr_params->dev_mode == QDF_SAP_MODE || + tx_pwr_params->dev_mode == QDF_P2P_GO_MODE) { pdev = wma_find_vdev_by_addr(wma_handle, tx_pwr_params->bssId.bytes, &vdev_id); @@ -638,7 +638,7 @@ static int32_t wma_set_force_sleep(tp_wma_handle wma, int32_t ret; uint32_t cfg_data_val = 0; /* get mac to acess CFG data base */ - struct sAniSirGlobal *mac = cds_get_context(CDF_MODULE_ID_PE); + struct sAniSirGlobal *mac = cds_get_context(QDF_MODULE_ID_PE); uint32_t rx_wake_policy; uint32_t tx_wake_threshold; uint32_t pspoll_count; @@ -655,7 +655,7 @@ static int32_t wma_set_force_sleep(tp_wma_handle wma, /* Set Tx/Rx Data InActivity Timeout */ if (wlan_cfg_get_int(mac, WNI_CFG_PS_DATA_INACTIVITY_TIMEOUT, &cfg_data_val) != eSIR_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Failed to get WNI_CFG_PS_DATA_INACTIVITY_TIMEOUT"); cfg_data_val = POWERSAVE_DEFAULT_INACTIVITY_TIME; } @@ -668,7 +668,7 @@ static int32_t wma_set_force_sleep(tp_wma_handle wma, if (wlan_cfg_get_int(mac, WNI_CFG_MAX_PS_POLL, &cfg_data_val) != eSIR_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Failed to get value for WNI_CFG_MAX_PS_POLL"); } if (cfg_data_val) @@ -681,7 +681,7 @@ static int32_t wma_set_force_sleep(tp_wma_handle wma, /* Ps Poll Wake Policy */ if (wlan_cfg_get_int(mac, WNI_CFG_MAX_PS_POLL, &cfg_data_val) != eSIR_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Failed to get value for WNI_CFG_MAX_PS_POLL"); } if (cfg_data_val) { @@ -771,7 +771,7 @@ static int32_t wma_set_force_sleep(tp_wma_handle wma, /* Set Listen Interval */ if (wlan_cfg_get_int(mac, WNI_CFG_LISTEN_INTERVAL, &cfg_data_val) != eSIR_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Failed to get value for WNI_CFG_LISTEN_INTERVAL"); cfg_data_val = POWERSAVE_DEFAULT_LISTEN_INTERVAL; } @@ -802,7 +802,7 @@ int32_t wma_set_qpower_force_sleep(tp_wma_handle wma, uint32_t vdev_id, int32_t ret; uint32_t cfg_data_val = 0; /* get mac to acess CFG data base */ - struct sAniSirGlobal *mac = cds_get_context(CDF_MODULE_ID_PE); + struct sAniSirGlobal *mac = cds_get_context(QDF_MODULE_ID_PE); uint32_t pspoll_count = WMA_DEFAULT_MAX_PSPOLL_BEFORE_WAKE; WMA_LOGE("Set QPower Force(1)/Normal(0) Sleep vdevId %d val %d", @@ -816,7 +816,7 @@ int32_t wma_set_qpower_force_sleep(tp_wma_handle wma, uint32_t vdev_id, /* Get Configured Ps Poll Count */ if (wlan_cfg_get_int(mac, WNI_CFG_MAX_PS_POLL, &cfg_data_val) != eSIR_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Failed to get value for WNI_CFG_MAX_PS_POLL"); } if (cfg_data_val) { @@ -883,7 +883,7 @@ int32_t wma_set_qpower_force_sleep(tp_wma_handle wma, uint32_t vdev_id, /* Set Listen Interval */ if (wlan_cfg_get_int(mac, WNI_CFG_LISTEN_INTERVAL, &cfg_data_val) != eSIR_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Failed to get value for WNI_CFG_LISTEN_INTERVAL"); cfg_data_val = POWERSAVE_DEFAULT_LISTEN_INTERVAL; } @@ -1405,7 +1405,7 @@ int wma_pdev_temperature_evt_handler(void *handle, uint8_t *event, sme_msg.bodyptr = NULL; sme_msg.bodyval = wmi_event->value; - qdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); + qdf_status = cds_mq_post_message(QDF_MODULE_ID_SME, &sme_msg); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGE(FL("Fail to post get temperature ind msg")); } @@ -2183,13 +2183,13 @@ static void wma_set_vdev_resume_dtim(tp_wma_handle wma, uint8_t vdev_id) int32_t ret; uint32_t cfg_data_val = 0; /* get mac to acess CFG data base */ - struct sAniSirGlobal *mac = cds_get_context(CDF_MODULE_ID_PE); + struct sAniSirGlobal *mac = cds_get_context(QDF_MODULE_ID_PE); /* Set Listen Interval */ if ((NULL == mac) || (wlan_cfg_get_int(mac, WNI_CFG_LISTEN_INTERVAL, &cfg_data_val) != eSIR_SUCCESS)) { - CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Failed to get value for listen interval"); cfg_data_val = POWERSAVE_DEFAULT_LISTEN_INTERVAL; } @@ -2263,7 +2263,7 @@ QDF_STATUS wma_set_tx_power_scale(uint8_t vdev_id, int value) { int ret = QDF_STATUS_SUCCESS; tp_wma_handle wma_handle = - (tp_wma_handle)cds_get_context(CDF_MODULE_ID_WMA); + (tp_wma_handle)cds_get_context(QDF_MODULE_ID_WMA); if (NULL == wma_handle) { WMA_LOGE("%s: wma_handle is NULL", __func__); return QDF_STATUS_E_FAILURE; @@ -2293,7 +2293,7 @@ QDF_STATUS wma_set_tx_power_scale_decr_db(uint8_t vdev_id, int value) { int ret = QDF_STATUS_SUCCESS; tp_wma_handle wma_handle = - (tp_wma_handle)cds_get_context(CDF_MODULE_ID_WMA); + (tp_wma_handle)cds_get_context(QDF_MODULE_ID_WMA); if (NULL == wma_handle) { WMA_LOGE("%s: wma_handle is NULL", __func__); return QDF_STATUS_E_FAILURE; diff --git a/core/wma/src/wma_scan_roam.c b/core/wma/src/wma_scan_roam.c index 6dff2ec28f..e4824c3bcd 100644 --- a/core/wma/src/wma_scan_roam.c +++ b/core/wma/src/wma_scan_roam.c @@ -47,7 +47,7 @@ #include "wlan_tgt_def_config.h" #include "cdf_nbuf.h" -#include "cdf_types.h" +#include "qdf_types.h" #include "ol_txrx_api.h" #include "cdf_memory.h" #include "ol_txrx_types.h" @@ -188,7 +188,7 @@ QDF_STATUS wma_get_buf_start_scan_cmd(tp_wma_handle wma_handle, uint8_t SSID_num; int i; int len = sizeof(*cmd); - tpAniSirGlobal pMac = cds_get_context(CDF_MODULE_ID_PE); + tpAniSirGlobal pMac = cds_get_context(QDF_MODULE_ID_PE); if (!pMac) { WMA_LOGP("%s: pMac is NULL!", __func__); @@ -341,7 +341,7 @@ QDF_STATUS wma_get_buf_start_scan_cmd(tp_wma_handle wma_handle, * the dwell time. */ cmd->dwell_time_active = - CDF_MIN(scan_req->maxChannelTime, + QDF_MIN(scan_req->maxChannelTime, (WMA_CTS_DURATION_MS_MAX - WMA_ROAM_SCAN_CHANNEL_SWITCH_TIME)); cmd->dwell_time_passive = @@ -497,7 +497,7 @@ QDF_STATUS wma_get_buf_start_scan_cmd(tp_wma_handle wma_handle, if (wma_is_sap_active(wma_handle)) { SSID_num = cmd->num_ssids * cmd->num_bssid; cmd->repeat_probe_time = probe_time_dwell_time_map[ - CDF_MIN(SSID_num, + QDF_MIN(SSID_num, WMA_DWELL_TIME_PROBE_TIME_MAP_SIZE - 1)].probe_time; } @@ -1717,13 +1717,13 @@ void wma_roam_scan_fill_scan_params(tp_wma_handle wma_handle, * duration. */ scan_params->burst_duration = - CDF_MAX(scan_params->burst_duration, + QDF_MAX(scan_params->burst_duration, scan_params->dwell_time_passive); } scan_params->min_rest_time = roam_req->NeighborScanTimerPeriod; scan_params->max_rest_time = roam_req->NeighborScanTimerPeriod; scan_params->repeat_probe_time = (roam_req->nProbes > 0) ? - CDF_MAX(scan_params->dwell_time_active / roam_req->nProbes, + QDF_MAX(scan_params->dwell_time_active / roam_req->nProbes, 1) : 0; scan_params->probe_spacing_time = 0; scan_params->probe_delay = 0; @@ -1964,7 +1964,7 @@ QDF_STATUS wma_roam_scan_filter(tp_wma_handle wma_handle, roam_params->ssid_allowed_list[i].length); ssid_ptr->ssid_len = roam_params->ssid_allowed_list[i].length; WMA_LOGD("%s: SSID length=%d", __func__, ssid_ptr->ssid_len); - CDF_TRACE_HEX_DUMP(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE_HEX_DUMP(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_DEBUG, (uint8_t *)ssid_ptr->ssid, ssid_ptr->ssid_len); ssid_ptr++; @@ -2118,7 +2118,7 @@ QDF_STATUS wma_process_roam_scan_req(tp_wma_handle wma_handle, QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; wmi_start_scan_cmd_fixed_param scan_params; wmi_ap_profile ap_profile; - tpAniSirGlobal pMac = cds_get_context(CDF_MODULE_ID_PE); + tpAniSirGlobal pMac = cds_get_context(QDF_MODULE_ID_PE); uint32_t mode = 0; struct wma_txrx_node *intr = NULL; @@ -2285,7 +2285,7 @@ QDF_STATUS wma_process_roam_scan_req(tp_wma_handle wma_handle, cds_mq_post_message(CDS_MQ_ID_SME, (cds_msg_t *) &cds_msg)) { cdf_mem_free(scan_offload_rsp); - CDF_TRACE(CDF_MODULE_ID_WMA, + CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_INFO, "%s: Failed to post Scan Offload Rsp to UMAC", __func__); @@ -2589,13 +2589,13 @@ void wma_fill_roam_synch_buffer(tp_wma_handle wma, cdf_mem_copy(roam_synch_ind_ptr->replay_ctr, key->replay_counter, SIR_REPLAY_CTR_LEN); WMA_LOGD("%s: KCK dump", __func__); - CDF_TRACE_HEX_DUMP(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE_HEX_DUMP(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_DEBUG, key->kck, SIR_KCK_KEY_LEN); WMA_LOGD("%s: KEK dump", __func__); - CDF_TRACE_HEX_DUMP(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE_HEX_DUMP(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_DEBUG, key->kek, SIR_KEK_KEY_LEN); WMA_LOGD("%s: Key Replay Counter dump", __func__); - CDF_TRACE_HEX_DUMP(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE_HEX_DUMP(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_DEBUG, key->replay_counter, SIR_REPLAY_CTR_LEN); } } @@ -2778,7 +2778,7 @@ int wma_rssi_breached_event_handler(void *handle, WMI_RSSI_BREACH_EVENTID_param_tlvs *param_buf; wmi_rssi_breach_event_fixed_param *event; struct rssi_breach_event rssi; - tpAniSirGlobal mac = cds_get_context(CDF_MODULE_ID_PE); + tpAniSirGlobal mac = cds_get_context(QDF_MODULE_ID_PE); if (!mac) { WMA_LOGE("%s: Invalid mac context", __func__); @@ -2840,7 +2840,7 @@ QDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle, cdf_mem_set(&macQosInfoSta, sizeof(tSirMacQosInfoStation), 0); /* Roaming is done only for INFRA STA type. * So, ess will be one and ibss will be Zero */ - pMac = cds_get_context(CDF_MODULE_ID_PE); + pMac = cds_get_context(QDF_MODULE_ID_PE); if (!pMac) { WMA_LOGE("%s:NULL pMac ptr. Exiting", __func__); CDF_ASSERT(0); @@ -2848,7 +2848,7 @@ QDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle, } if (wlan_cfg_get_int(pMac, WNI_CFG_PRIVACY_ENABLED, &val) != eSIR_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Failed to get WNI_CFG_PRIVACY_ENABLED"); return QDF_STATUS_E_FAILURE; } @@ -2857,7 +2857,7 @@ QDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle, if (val) selfCaps.privacy = 1; if (wlan_cfg_get_int(pMac, WNI_CFG_SHORT_PREAMBLE, &val) != eSIR_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Failed to get WNI_CFG_SHORT_PREAMBLE"); return QDF_STATUS_E_FAILURE; } @@ -2868,28 +2868,28 @@ QDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle, selfCaps.channelAgility = 0; if (wlan_cfg_get_int(pMac, WNI_CFG_11G_SHORT_SLOT_TIME_ENABLED, &val) != eSIR_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Failed to get WNI_CFG_11G_SHORT_SLOT_TIME_ENABLED"); return QDF_STATUS_E_FAILURE; } if (val) selfCaps.shortSlotTime = 1; if (wlan_cfg_get_int(pMac, WNI_CFG_11H_ENABLED, &val) != eSIR_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Failed to get WNI_CFG_11H_ENABLED"); return QDF_STATUS_E_FAILURE; } if (val) selfCaps.spectrumMgt = 1; if (wlan_cfg_get_int(pMac, WNI_CFG_QOS_ENABLED, &val) != eSIR_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Failed to get WNI_CFG_QOS_ENABLED"); return QDF_STATUS_E_FAILURE; } if (val) selfCaps.qos = 1; if (wlan_cfg_get_int(pMac, WNI_CFG_APSD_ENABLED, &val) != eSIR_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Failed to get WNI_CFG_APSD_ENABLED"); return QDF_STATUS_E_FAILURE; } @@ -2900,7 +2900,7 @@ QDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle, if (wlan_cfg_get_int(pMac, WNI_CFG_BLOCK_ACK_ENABLED, &val) != eSIR_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Failed to get WNI_CFG_BLOCK_ACK_ENABLED"); return QDF_STATUS_E_FAILURE; } @@ -2913,7 +2913,7 @@ QDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle, if (wlan_cfg_get_int(pMac, WNI_CFG_HT_CAP_INFO, &nCfgValue) != eSIR_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Failed to get WNI_CFG_HT_CAP_INFO"); return QDF_STATUS_E_FAILURE; } @@ -2922,7 +2922,7 @@ QDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle, uHTCapabilityInfo.nCfgValue16 & 0xFFFF; if (wlan_cfg_get_int(pMac, WNI_CFG_HT_AMPDU_PARAMS, &nCfgValue) != eSIR_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Failed to get WNI_CFG_HT_AMPDU_PARAMS"); return QDF_STATUS_E_FAILURE; } @@ -2934,13 +2934,13 @@ QDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle, if (wlan_cfg_get_str(pMac, WNI_CFG_SUPPORTED_MCS_SET, (uint8_t *) roam_offload_params->mcsset, &val) != eSIR_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Failed to get WNI_CFG_SUPPORTED_MCS_SET"); return QDF_STATUS_E_FAILURE; } if (wlan_cfg_get_int(pMac, WNI_CFG_EXT_HT_CAP_INFO, &nCfgValue) != eSIR_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Failed to get WNI_CFG_EXT_HT_CAP_INFO"); return QDF_STATUS_E_FAILURE; } @@ -2950,7 +2950,7 @@ QDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle, uHTCapabilityInfo.nCfgValue16 & 0xFFFF; if (wlan_cfg_get_int(pMac, WNI_CFG_TX_BF_CAP, &nCfgValue) != eSIR_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Failed to get WNI_CFG_TX_BF_CAP"); return QDF_STATUS_E_FAILURE; } @@ -2958,7 +2958,7 @@ QDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle, nCfgValue8 = (uint8_t) nCfgValue; roam_offload_params->ht_txbf = nCfgValue8 & 0xFF; if (wlan_cfg_get_int(pMac, WNI_CFG_AS_CAP, &nCfgValue) != eSIR_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Failed to get WNI_CFG_AS_CAP"); return QDF_STATUS_E_FAILURE; } @@ -2969,7 +2969,7 @@ QDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle, /* QOS Info */ if (wlan_cfg_get_int(pMac, WNI_CFG_MAX_SP_LENGTH, &nCfgValue) != eSIR_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Failed to get WNI_CFG_MAX_SP_LENGTH"); return QDF_STATUS_E_FAILURE; } @@ -3167,7 +3167,7 @@ static void wma_roam_ho_fail_handler(tp_wma_handle wma, uint32_t vdev_id) sme_msg.bodyptr = ho_failure_ind; sme_msg.bodyval = 0; - qdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); + qdf_status = cds_mq_post_message(QDF_MODULE_ID_SME, &sme_msg); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGE("Fail to post eWNI_SME_HO_FAIL_IND msg to SME"); cdf_mem_free(ho_failure_ind); @@ -3247,7 +3247,7 @@ void wma_set_channel(tp_wma_handle wma, tpSwitchChannelParams params) status = QDF_STATUS_E_FAILURE; goto send_resp; } - pdev = cds_get_context(CDF_MODULE_ID_TXRX); + pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (NULL == pdev) { WMA_LOGE("%s: Failed to get pdev", __func__); status = QDF_STATUS_E_FAILURE; @@ -3390,10 +3390,10 @@ QDF_STATUS wma_pno_start(tp_wma_handle wma, tpSirPNOScanReq pno) len = sizeof(*cmd) + WMI_TLV_HDR_SIZE + WMI_TLV_HDR_SIZE + WMI_TLV_HDR_SIZE; - len += sizeof(uint32_t) * CDF_MIN(pno->aNetworks[0].ucChannelCount, + len += sizeof(uint32_t) * QDF_MIN(pno->aNetworks[0].ucChannelCount, WMI_NLO_MAX_CHAN); len += sizeof(nlo_configured_parameters) * - CDF_MIN(pno->ucNetworksCount, WMI_NLO_MAX_SSIDS); + QDF_MIN(pno->ucNetworksCount, WMI_NLO_MAX_SSIDS); len += sizeof(nlo_channel_prediction_cfg); buf = wmi_buf_alloc(wma->wmi_handle, len); @@ -3426,7 +3426,7 @@ QDF_STATUS wma_pno_start(tp_wma_handle wma, tpSirPNOScanReq pno) buf_ptr += sizeof(wmi_nlo_config_cmd_fixed_param); - cmd->no_of_ssids = CDF_MIN(pno->ucNetworksCount, WMI_NLO_MAX_SSIDS); + cmd->no_of_ssids = QDF_MIN(pno->ucNetworksCount, WMI_NLO_MAX_SSIDS); WMA_LOGD("SSID count : %d", cmd->no_of_ssids); WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_STRUC, cmd->no_of_ssids * sizeof(nlo_configured_parameters)); @@ -3467,7 +3467,7 @@ QDF_STATUS wma_pno_start(tp_wma_handle wma, tpSirPNOScanReq pno) buf_ptr += cmd->no_of_ssids * sizeof(nlo_configured_parameters); /* Copy channel info */ - cmd->num_of_channels = CDF_MIN(pno->aNetworks[0].ucChannelCount, + cmd->num_of_channels = QDF_MIN(pno->aNetworks[0].ucChannelCount, WMI_NLO_MAX_CHAN); WMA_LOGD("Channel count: %d", cmd->num_of_channels); WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_UINT32, @@ -4179,7 +4179,7 @@ int wma_extscan_start_stop_event_handler(void *handle, wmi_extscan_start_stop_event_fixed_param *event; struct sir_extscan_generic_response *extscan_ind; uint16_t event_type; - tpAniSirGlobal pMac = cds_get_context(CDF_MODULE_ID_PE); + tpAniSirGlobal pMac = cds_get_context(QDF_MODULE_ID_PE); if (!pMac) { WMA_LOGE("%s: Invalid pMac", __func__); return -EINVAL; @@ -4280,7 +4280,7 @@ int wma_extscan_operations_event_handler(void *handle, WMI_EXTSCAN_OPERATION_EVENTID_param_tlvs *param_buf; wmi_extscan_operation_event_fixed_param *oprn_event; tSirExtScanOnScanEventIndParams *oprn_ind; - tpAniSirGlobal pMac = cds_get_context(CDF_MODULE_ID_PE); + tpAniSirGlobal pMac = cds_get_context(QDF_MODULE_ID_PE); if (!pMac) { WMA_LOGE("%s: Invalid pMac", __func__); return -EINVAL; @@ -4355,7 +4355,7 @@ int wma_extscan_table_usage_event_handler(void *handle, WMI_EXTSCAN_TABLE_USAGE_EVENTID_param_tlvs *param_buf; wmi_extscan_table_usage_event_fixed_param *event; tSirExtScanResultsAvailableIndParams *tbl_usg_ind; - tpAniSirGlobal pMac = cds_get_context(CDF_MODULE_ID_PE); + tpAniSirGlobal pMac = cds_get_context(QDF_MODULE_ID_PE); if (!pMac) { WMA_LOGE("%s: Invalid pMac", __func__); return -EINVAL; @@ -4409,7 +4409,7 @@ int wma_extscan_capabilities_event_handler(void *handle, wmi_extscan_wlan_change_monitor_capabilities *src_change; struct ext_scan_capabilities_response *dest_capab; - tpAniSirGlobal pMac = cds_get_context(CDF_MODULE_ID_PE); + tpAniSirGlobal pMac = cds_get_context(QDF_MODULE_ID_PE); if (!pMac) { WMA_LOGE("%s: Invalid pMac", __func__); return -EINVAL; @@ -4515,7 +4515,7 @@ int wma_extscan_hotlist_match_event_handler(void *handle, tSirWifiScanResult *dest_ap; wmi_extscan_wlan_descriptor *src_hotlist; int numap, j, ap_found = 0; - tpAniSirGlobal pMac = cds_get_context(CDF_MODULE_ID_PE); + tpAniSirGlobal pMac = cds_get_context(QDF_MODULE_ID_PE); if (!pMac) { WMA_LOGE("%s: Invalid pMac", __func__); @@ -4782,7 +4782,7 @@ int wma_extscan_cached_results_event_handler(void *handle, wmi_extscan_rssi_info *src_rssi; int numap, i, moredata, scan_ids_cnt, buf_len; - tpAniSirGlobal pMac = cds_get_context(CDF_MODULE_ID_PE); + tpAniSirGlobal pMac = cds_get_context(QDF_MODULE_ID_PE); if (!pMac) { WMA_LOGE("%s: Invalid pMac", __func__); return -EINVAL; @@ -4891,7 +4891,7 @@ int wma_extscan_change_results_event_handler(void *handle, int count = 0; int moredata; int rssi_num = 0; - tpAniSirGlobal pMac = cds_get_context(CDF_MODULE_ID_PE); + tpAniSirGlobal pMac = cds_get_context(QDF_MODULE_ID_PE); if (!pMac) { WMA_LOGE("%s: Invalid pMac", __func__); return -EINVAL; @@ -4979,7 +4979,7 @@ int wma_passpoint_match_event_handler(void *handle, struct wifi_passpoint_match *dest_match; tSirWifiScanResult *dest_ap; uint8_t *buf_ptr; - tpAniSirGlobal mac = cds_get_context(CDF_MODULE_ID_PE); + tpAniSirGlobal mac = cds_get_context(QDF_MODULE_ID_PE); if (!mac) { WMA_LOGE("%s: Invalid mac", __func__); @@ -5058,7 +5058,7 @@ wma_extscan_hotlist_ssid_match_event_handler(void *handle, wmi_extscan_wlan_descriptor *src_hotlist; int numap, j; bool ssid_found = false; - tpAniSirGlobal mac = cds_get_context(CDF_MODULE_ID_PE); + tpAniSirGlobal mac = cds_get_context(QDF_MODULE_ID_PE); if (!mac) { WMA_LOGE("%s: Invalid mac", __func__); @@ -5542,7 +5542,7 @@ QDF_STATUS wma_get_buf_extscan_hotlist_cmd(tp_wma_handle wma_handle, * requests if the buffer reaches the maximum request size */ while (index < numap) { - min_entries = CDF_MIN(num_entries, numap); + min_entries = QDF_MIN(num_entries, numap); len += min_entries * sizeof(wmi_extscan_hotlist_entry); buf = wmi_buf_alloc(wma_handle->wmi_handle, len); if (!buf) { @@ -6154,7 +6154,7 @@ QDF_STATUS wma_set_epno_network_list(tp_wma_handle wma, * nlo_configured_parameters(nlo_list) */ len = sizeof(*cmd) + WMI_TLV_HDR_SIZE; len += sizeof(nlo_configured_parameters) * - CDF_MIN(req->num_networks, WMI_NLO_MAX_SSIDS); + QDF_MIN(req->num_networks, WMI_NLO_MAX_SSIDS); len += WMI_TLV_HDR_SIZE; /* TLV for channel_list */ len += WMI_TLV_HDR_SIZE; /* TLV for channel prediction cfg*/ @@ -6176,7 +6176,7 @@ QDF_STATUS wma_set_epno_network_list(tp_wma_handle wma, buf_ptr += sizeof(wmi_nlo_config_cmd_fixed_param); - cmd->no_of_ssids = CDF_MIN(req->num_networks, WMI_NLO_MAX_SSIDS); + cmd->no_of_ssids = QDF_MIN(req->num_networks, WMI_NLO_MAX_SSIDS); WMA_LOGD("SSID count: %d", cmd->no_of_ssids); WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_STRUC, cmd->no_of_ssids * sizeof(nlo_configured_parameters)); @@ -6671,13 +6671,13 @@ void wma_roam_better_ap_handler(tp_wma_handle wma, uint32_t vdev_id) cds_msg.type = eWNI_SME_CANDIDATE_FOUND_IND; cds_msg.bodyptr = candidate_ind; - CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_INFO, FL("posting candidate ind to SME")); if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDS_MQ_ID_SME, (cds_msg_t *) &cds_msg)) { cdf_mem_free(candidate_ind); - CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, FL("Failed to post candidate ind to SME")); } } @@ -6812,7 +6812,7 @@ QDF_STATUS wma_set_rssi_monitoring(tp_wma_handle wma, QDF_STATUS wma_get_scan_id(uint32_t *scan_id) { - tp_wma_handle wma = cds_get_context(CDF_MODULE_ID_WMA); + tp_wma_handle wma = cds_get_context(QDF_MODULE_ID_WMA); if (!scan_id) { WMA_LOGE("Scan_id is NULL"); @@ -6863,9 +6863,9 @@ QDF_STATUS wma_set_gateway_params(tp_wma_handle wma, cmd->vdev_id = req->session_id; cdf_mem_copy(&cmd->inet_gw_ip_v4_addr, req->ipv4_addr, - CDF_IPV4_ADDR_SIZE); + QDF_IPV4_ADDR_SIZE); cdf_mem_copy(&cmd->inet_gw_ip_v6_addr, req->ipv6_addr, - CDF_IPV6_ADDR_SIZE); + QDF_IPV6_ADDR_SIZE); WMI_CHAR_ARRAY_TO_MAC_ADDR(req->gw_mac_addr.bytes, &cmd->inet_gw_mac_addr); cmd->max_retries = req->max_retries; diff --git a/core/wma/src/wma_utils.c b/core/wma/src/wma_utils.c index 3d72314f12..cac3d6d546 100644 --- a/core/wma/src/wma_utils.c +++ b/core/wma/src/wma_utils.c @@ -46,7 +46,7 @@ #include "wlan_tgt_def_config.h" #include "cdf_nbuf.h" -#include "cdf_types.h" +#include "qdf_types.h" #include "ol_txrx_api.h" #include "cdf_memory.h" #include "ol_txrx_types.h" @@ -413,9 +413,9 @@ int wma_profile_data_report_event_handler(void *handle, uint8_t *event_buf, buf_ptr = buf_ptr + sizeof(wmi_wlan_profile_ctx_t) + WMI_TLV_HDR_SIZE; profile_data = (wmi_wlan_profile_t *) buf_ptr; entries = profile_ctx->bin_count; - CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Profile data stats\n"); - CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "TOT: %d\n" "tx_msdu_cnt: %d\n" "tx_mpdu_cnt: %d\n" @@ -434,7 +434,7 @@ int wma_profile_data_report_event_handler(void *handle, uint8_t *event_buf, for (i = 0; i < entries; i++) { if (i == WMI_WLAN_PROFILE_MAX_BIN_CNT) break; - CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Profile ID: %d\n" "Profile Count: %d\n" "Profile TOT: %d\n" @@ -483,7 +483,7 @@ static int wma_unified_link_peer_stats_event_handler(void *handle, size_t peer_info_size, peer_stats_size, rate_stats_size; size_t link_stats_results_size; - tpAniSirGlobal pMac = cds_get_context(CDF_MODULE_ID_PE); + tpAniSirGlobal pMac = cds_get_context(QDF_MODULE_ID_PE); if (!pMac) { WMA_LOGD("%s: NULL pMac ptr. Exiting", __func__); @@ -634,7 +634,7 @@ static int wma_unified_link_radio_stats_event_handler(void *handle, size_t radio_stats_size, chan_stats_size; size_t link_stats_results_size; - tpAniSirGlobal pMac = cds_get_context(CDF_MODULE_ID_PE); + tpAniSirGlobal pMac = cds_get_context(QDF_MODULE_ID_PE); if (!pMac) { WMA_LOGD("%s: NULL pMac ptr. Exiting", __func__); @@ -985,7 +985,7 @@ int wma_unified_link_iface_stats_event_handler(void *handle, size_t link_stats_size, ac_stats_size, iface_info_size; size_t link_stats_results_size; - tpAniSirGlobal pMac = cds_get_context(CDF_MODULE_ID_PE); + tpAniSirGlobal pMac = cds_get_context(QDF_MODULE_ID_PE); if (!pMac) { WMA_LOGD("%s: NULL pMac ptr. Exiting", __func__); @@ -1268,7 +1268,7 @@ static void wma_update_vdev_stats(tp_wma_handle wma, sme_msg.bodyptr = p_snr_req; sme_msg.bodyval = 0; - qdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); + qdf_status = cds_mq_post_message(QDF_MODULE_ID_SME, &sme_msg); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGE("%s: Fail to post snr ind msg", __func__); cdf_mem_free(p_snr_req); @@ -1386,7 +1386,7 @@ void wma_post_link_status(tAniGetLinkStatus *pGetLinkStatus, sme_msg.bodyptr = pGetLinkStatus; sme_msg.bodyval = 0; - qdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); + qdf_status = cds_mq_post_message(QDF_MODULE_ID_SME, &sme_msg); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGE("%s: Fail to post link status ind msg", __func__); cdf_mem_free(pGetLinkStatus); @@ -1537,7 +1537,7 @@ QDF_STATUS wma_send_link_speed(uint32_t link_speed) sme_msg.bodyptr = ls_ind; sme_msg.bodyval = 0; - qdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); + qdf_status = cds_mq_post_message(QDF_MODULE_ID_SME, &sme_msg); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGE("%s: Fail to post linkspeed ind msg", __func__); @@ -1585,7 +1585,7 @@ int wma_link_speed_event_handler(void *handle, uint8_t *cmd_param_info, QDF_STATUS wma_wni_cfg_dnld(tp_wma_handle wma_handle) { QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; - void *mac = cds_get_context(CDF_MODULE_ID_PE); + void *mac = cds_get_context(QDF_MODULE_ID_PE); WMA_LOGD("%s: Enter", __func__); @@ -1941,7 +1941,7 @@ int32_t wma_set_txrx_fw_stats_level(tp_wma_handle wma_handle, break; default: - cdf_print("%s %d Invalid value %d\n", + qdf_print("%s %d Invalid value %d\n", __func__, __LINE__, value); return 0; } @@ -2147,7 +2147,7 @@ void *wma_get_beacon_buffer_by_vdev_id(uint8_t vdev_id, uint32_t *buffer_size) uint8_t *buf; uint32_t buf_size; - wma = cds_get_context(CDF_MODULE_ID_WMA); + wma = cds_get_context(QDF_MODULE_ID_WMA); if (!wma) { WMA_LOGE("%s: Invalid WMA handle", __func__); return NULL; @@ -2201,7 +2201,7 @@ uint8_t *wma_get_vdev_address_by_vdev_id(uint8_t vdev_id) { tp_wma_handle wma; - wma = cds_get_context(CDF_MODULE_ID_WMA); + wma = cds_get_context(QDF_MODULE_ID_WMA); if (!wma) { WMA_LOGE("%s: Invalid WMA handle", __func__); return NULL; @@ -2225,7 +2225,7 @@ struct wma_txrx_node *wma_get_interface_by_vdev_id(uint8_t vdev_id) { tp_wma_handle wma; - wma = cds_get_context(CDF_MODULE_ID_WMA); + wma = cds_get_context(QDF_MODULE_ID_WMA); if (!wma) { WMA_LOGE("%s: Invalid WMA handle", __func__); return NULL; @@ -2550,7 +2550,7 @@ wma_process_ftm_command(tp_wma_handle wma_handle, if (!msg_buffer) return QDF_STATUS_E_INVAL; - if (cds_get_conparam() != CDF_GLOBAL_FTM_MODE) { + if (cds_get_conparam() != QDF_GLOBAL_FTM_MODE) { WMA_LOGE("FTM command issued in non-FTM mode"); cdf_mem_free(msg_buffer->data); cdf_mem_free(msg_buffer); @@ -2585,7 +2585,7 @@ QDF_STATUS wma_get_wcnss_software_version(void *p_cds_gctx, uint32_t versionBufferSize) { tp_wma_handle wma_handle; - wma_handle = cds_get_context(CDF_MODULE_ID_WMA); + wma_handle = cds_get_context(QDF_MODULE_ID_WMA); if (NULL == wma_handle) { WMA_LOGE("%s: Failed to get wma", __func__); @@ -2748,7 +2748,7 @@ int8_t wma_get_hw_mode_idx_from_dbs_hw_list(enum hw_mode_ss_config mac0_ss, uint32_t mac0_tx_ss, mac0_rx_ss; uint32_t mac1_tx_ss, mac1_rx_ss; - wma = cds_get_context(CDF_MODULE_ID_WMA); + wma = cds_get_context(QDF_MODULE_ID_WMA); if (!wma) { WMA_LOGE("%s: Invalid WMA handle", __func__); return -EINVAL; @@ -2786,7 +2786,7 @@ QDF_STATUS wma_get_hw_mode_from_idx(uint32_t idx, tp_wma_handle wma; uint32_t param; - wma = cds_get_context(CDF_MODULE_ID_WMA); + wma = cds_get_context(QDF_MODULE_ID_WMA); if (!wma) { WMA_LOGE("%s: Invalid WMA handle", __func__); return QDF_STATUS_E_FAILURE; @@ -2827,7 +2827,7 @@ int8_t wma_get_num_dbs_hw_modes(void) { tp_wma_handle wma; - wma = cds_get_context(CDF_MODULE_ID_WMA); + wma = cds_get_context(QDF_MODULE_ID_WMA); if (!wma) { WMA_LOGE("%s: Invalid WMA handle", __func__); return -EINVAL; @@ -2847,7 +2847,7 @@ bool wma_is_hw_dbs_capable(void) tp_wma_handle wma; uint32_t param, i, found = 0; - wma = cds_get_context(CDF_MODULE_ID_WMA); + wma = cds_get_context(QDF_MODULE_ID_WMA); if (!wma) { WMA_LOGE("%s: Invalid WMA handle", __func__); return false; @@ -2898,7 +2898,7 @@ bool wma_is_hw_agile_dfs_capable(void) tp_wma_handle wma; uint32_t param, i, found = 0; - wma = cds_get_context(CDF_MODULE_ID_WMA); + wma = cds_get_context(QDF_MODULE_ID_WMA); if (!wma) { WMA_LOGE("%s: Invalid WMA handle", __func__); return false; @@ -2950,7 +2950,7 @@ int8_t wma_get_mac_id_of_vdev(uint32_t vdev_id) { tp_wma_handle wma; - wma = cds_get_context(CDF_MODULE_ID_WMA); + wma = cds_get_context(QDF_MODULE_ID_WMA); if (!wma) { WMA_LOGE("%s: Invalid WMA handle", __func__); return -EINVAL; @@ -2980,7 +2980,7 @@ QDF_STATUS wma_get_old_and_new_hw_index(uint32_t *old_hw_mode_index, { tp_wma_handle wma; - wma = cds_get_context(CDF_MODULE_ID_WMA); + wma = cds_get_context(QDF_MODULE_ID_WMA); if (!wma) { WMA_LOGE("%s: Invalid WMA handle", __func__); return QDF_STATUS_E_INVAL; @@ -3008,7 +3008,7 @@ void wma_update_intf_hw_mode_params(uint32_t vdev_id, uint32_t mac_id, tp_wma_handle wma; uint32_t param; - wma = cds_get_context(CDF_MODULE_ID_WMA); + wma = cds_get_context(QDF_MODULE_ID_WMA); if (!wma) { WMA_LOGE("%s: Invalid WMA handle", __func__); return; @@ -3073,7 +3073,7 @@ QDF_STATUS wma_get_dbs_hw_modes(bool *one_by_one_dbs, bool *two_by_two_dbs) } - wma = cds_get_context(CDF_MODULE_ID_WMA); + wma = cds_get_context(QDF_MODULE_ID_WMA); if (!wma) { WMA_LOGE("%s: Invalid WMA handle", __func__); return QDF_STATUS_E_FAILURE; @@ -3192,7 +3192,7 @@ bool wma_is_dbs_enable(void) if (wma_is_dual_mac_disabled_in_ini()) return false; - wma = cds_get_context(CDF_MODULE_ID_WMA); + wma = cds_get_context(QDF_MODULE_ID_WMA); if (!wma) { WMA_LOGE("%s: Invalid WMA handle", __func__); return false; @@ -3222,7 +3222,7 @@ bool wma_is_agile_dfs_enable(void) if (wma_is_dual_mac_disabled_in_ini()) return false; - wma = cds_get_context(CDF_MODULE_ID_WMA); + wma = cds_get_context(QDF_MODULE_ID_WMA); if (!wma) { WMA_LOGE("%s: Invalid WMA handle", __func__); return false; @@ -3265,7 +3265,7 @@ QDF_STATUS wma_get_updated_scan_config(uint32_t *scan_config, { tp_wma_handle wma; - wma = cds_get_context(CDF_MODULE_ID_WMA); + wma = cds_get_context(QDF_MODULE_ID_WMA); if (!wma) { WMA_LOGE("%s: Invalid WMA handle", __func__); return QDF_STATUS_E_FAILURE; @@ -3300,7 +3300,7 @@ QDF_STATUS wma_get_updated_fw_mode_config(uint32_t *fw_mode_config, { tp_wma_handle wma; - wma = cds_get_context(CDF_MODULE_ID_WMA); + wma = cds_get_context(QDF_MODULE_ID_WMA); if (!wma) { WMA_LOGE("%s: Invalid WMA handle", __func__); return QDF_STATUS_E_FAILURE; @@ -3329,7 +3329,7 @@ bool wma_get_dbs_config(void) if (wma_is_dual_mac_disabled_in_ini()) return false; - wma = cds_get_context(CDF_MODULE_ID_WMA); + wma = cds_get_context(QDF_MODULE_ID_WMA); if (!wma) { WMA_LOGE("%s: Invalid WMA handle", __func__); /* We take that it is disabled and proceed */ @@ -3355,7 +3355,7 @@ bool wma_get_agile_dfs_config(void) if (wma_is_dual_mac_disabled_in_ini()) return false; - wma = cds_get_context(CDF_MODULE_ID_WMA); + wma = cds_get_context(QDF_MODULE_ID_WMA); if (!wma) { WMA_LOGE("%s: Invalid WMA handle", __func__); /* We take that it is disabled and proceed */ @@ -3381,7 +3381,7 @@ bool wma_get_dbs_scan_config(void) if (wma_is_dual_mac_disabled_in_ini()) return false; - wma = cds_get_context(CDF_MODULE_ID_WMA); + wma = cds_get_context(QDF_MODULE_ID_WMA); if (!wma) { WMA_LOGE("%s: Invalid WMA handle", __func__); /* We take that it is disabled and proceed */ @@ -3407,7 +3407,7 @@ bool wma_get_dbs_plus_agile_scan_config(void) if (wma_is_dual_mac_disabled_in_ini()) return false; - wma = cds_get_context(CDF_MODULE_ID_WMA); + wma = cds_get_context(QDF_MODULE_ID_WMA); if (!wma) { WMA_LOGE("%s: Invalid WMA handle", __func__); /* We take that it is disabled and proceed */ @@ -3433,7 +3433,7 @@ bool wma_get_single_mac_scan_with_dfs_config(void) if (wma_is_dual_mac_disabled_in_ini()) return false; - wma = cds_get_context(CDF_MODULE_ID_WMA); + wma = cds_get_context(QDF_MODULE_ID_WMA); if (!wma) { WMA_LOGE("%s: Invalid WMA handle", __func__); /* We take that it is disabled and proceed */ @@ -3453,7 +3453,7 @@ bool wma_get_single_mac_scan_with_dfs_config(void) */ bool wma_is_dual_mac_disabled_in_ini(void) { - tpAniSirGlobal mac = cds_get_context(CDF_MODULE_ID_PE); + tpAniSirGlobal mac = cds_get_context(QDF_MODULE_ID_PE); if (!mac) { WMA_LOGE("%s: Invalid mac pointer", __func__); @@ -3481,7 +3481,7 @@ bool wma_get_prev_dbs_config(void) if (wma_is_dual_mac_disabled_in_ini()) return false; - wma = cds_get_context(CDF_MODULE_ID_WMA); + wma = cds_get_context(QDF_MODULE_ID_WMA); if (!wma) { WMA_LOGE("%s: Invalid WMA handle", __func__); /* We take that it is disabled and proceed */ @@ -3507,7 +3507,7 @@ bool wma_get_prev_agile_dfs_config(void) if (wma_is_dual_mac_disabled_in_ini()) return false; - wma = cds_get_context(CDF_MODULE_ID_WMA); + wma = cds_get_context(QDF_MODULE_ID_WMA); if (!wma) { WMA_LOGE("%s: Invalid WMA handle", __func__); /* We take that it is disabled and proceed */ @@ -3533,7 +3533,7 @@ bool wma_get_prev_dbs_scan_config(void) if (wma_is_dual_mac_disabled_in_ini()) return false; - wma = cds_get_context(CDF_MODULE_ID_WMA); + wma = cds_get_context(QDF_MODULE_ID_WMA); if (!wma) { WMA_LOGE("%s: Invalid WMA handle", __func__); /* We take that it is disabled and proceed */ @@ -3559,7 +3559,7 @@ bool wma_get_prev_dbs_plus_agile_scan_config(void) if (wma_is_dual_mac_disabled_in_ini()) return false; - wma = cds_get_context(CDF_MODULE_ID_WMA); + wma = cds_get_context(QDF_MODULE_ID_WMA); if (!wma) { WMA_LOGE("%s: Invalid WMA handle", __func__); /* We take that it is disabled and proceed */ @@ -3586,7 +3586,7 @@ bool wma_get_prev_single_mac_scan_with_dfs_config(void) if (wma_is_dual_mac_disabled_in_ini()) return false; - wma = cds_get_context(CDF_MODULE_ID_WMA); + wma = cds_get_context(QDF_MODULE_ID_WMA); if (!wma) { WMA_LOGE("%s: Invalid WMA handle", __func__); /* We take that it is disabled and proceed */ @@ -3622,7 +3622,7 @@ bool wma_is_scan_simultaneous_capable(void) uint32_t wma_get_vht_ch_width(void) { uint32_t fw_ch_wd = WNI_CFG_VHT_CHANNEL_WIDTH_80MHZ; - tp_wma_handle wm_hdl = cds_get_context(CDF_MODULE_ID_WMA); + tp_wma_handle wm_hdl = cds_get_context(QDF_MODULE_ID_WMA); if (NULL == wm_hdl) return fw_ch_wd; diff --git a/core/wma/src/wma_utils_ut.c b/core/wma/src/wma_utils_ut.c index d36c6ca54c..845a39b364 100644 --- a/core/wma/src/wma_utils_ut.c +++ b/core/wma/src/wma_utils_ut.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2015-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -50,7 +50,7 @@ void wma_set_dbs_capability_ut(uint32_t dbs) tp_wma_handle wma; uint32_t i; - wma = cds_get_context(CDF_MODULE_ID_WMA); + wma = cds_get_context(QDF_MODULE_ID_WMA); if (!wma) { WMA_LOGE("%s: Invalid WMA handle", __func__); return; diff --git a/core/wmi/wmi_tlv_helper.c b/core/wmi/wmi_tlv_helper.c index 0e35755536..f965f44b01 100644 --- a/core/wmi/wmi_tlv_helper.c +++ b/core/wmi/wmi_tlv_helper.c @@ -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. * @@ -49,7 +49,7 @@ #define WMITLV_GET_CMD_EVT_ATTRB_LIST(id) \ WMITLV_SET_ATTRB0(id), \ - WMITLV_TABLE(id,SET_TLV_ATTRIB,NULL,0) + WMITLV_TABLE(id, SET_TLV_ATTRIB, NULL, 0) A_UINT32 cmd_attr_list[] = { WMITLV_ALL_CMD_LIST(WMITLV_GET_CMD_EVT_ATTRB_LIST) @@ -60,7 +60,7 @@ A_UINT32 evt_attr_list[] = { }; #ifdef NO_DYNAMIC_MEM_ALLOC -static wmitlv_cmd_param_info *g_wmi_static_cmd_param_info_buf = NULL; +static wmitlv_cmd_param_info *g_wmi_static_cmd_param_info_buf; A_UINT32 g_wmi_static_max_cmd_param_tlvs = 0; #endif @@ -101,10 +101,10 @@ A_UINT32 wmitlv_get_attributes(A_UINT32 is_cmd_id, A_UINT32 cmd_event_id, if (is_cmd_id) { pAttrArrayList = &cmd_attr_list[0]; - num_entries = CDF_ARRAY_SIZE(cmd_attr_list); + num_entries = QDF_ARRAY_SIZE(cmd_attr_list); } else { pAttrArrayList = &evt_attr_list[0]; - num_entries = CDF_ARRAY_SIZE(evt_attr_list); + num_entries = QDF_ARRAY_SIZE(evt_attr_list); } for (i = 0; i < num_entries; i++) { @@ -175,6 +175,7 @@ wmitlv_check_tlv_params(void *os_handle, void *param_struc_ptr, { wmitlv_attributes_struc attr_struct_ptr; A_UINT32 buf_idx = 0; + A_UINT32 ret = -1; A_UINT32 tlv_index = 0; A_UINT8 *buf_ptr = (unsigned char *)param_struc_ptr; A_UINT32 expected_num_tlvs, expected_tlv_len; @@ -345,8 +346,7 @@ wmitlv_check_tlv_params(void *os_handle, void *param_struc_ptr, || (curr_tlv_tag == WMITLV_TAG_ARRAY_BYTE) || (curr_tlv_tag == - WMITLV_TAG_ARRAY_FIXED_STRUC)) - { + WMITLV_TAG_ARRAY_FIXED_STRUC)) { /* Nothing to verify here */ } else { wmi_tlv_print_error @@ -392,9 +392,9 @@ wmitlv_check_tlv_params(void *os_handle, void *param_struc_ptr, __func__, wmi_cmd_event_id, tlv_index, expected_num_tlvs); } - return (0); + return 0; Error_wmitlv_check_tlv_params: - return (-1); + return ret; } /* @@ -407,9 +407,9 @@ wmitlv_check_event_tlv_params(void *os_handle, void *param_struc_ptr, A_UINT32 param_buf_len, A_UINT32 wmi_cmd_event_id) { A_UINT32 is_cmd_id = 0; - return (wmitlv_check_tlv_params + return wmitlv_check_tlv_params (os_handle, param_struc_ptr, param_buf_len, is_cmd_id, - wmi_cmd_event_id)); + wmi_cmd_event_id); } /* @@ -423,15 +423,15 @@ wmitlv_check_command_tlv_params(void *os_handle, void *param_struc_ptr, A_UINT32 wmi_cmd_event_id) { A_UINT32 is_cmd_id = 1; - return (wmitlv_check_tlv_params + return wmitlv_check_tlv_params (os_handle, param_struc_ptr, param_buf_len, is_cmd_id, - wmi_cmd_event_id)); + wmi_cmd_event_id); } /* * Helper Function to vaidate the TLV's coming for an event/command and also pads data to TLV's if necessary * Return 0 if success. - <0 if failure. + * <0 if failure. */ static int wmitlv_check_and_pad_tlvs(void *os_handle, void *param_struc_ptr, @@ -440,6 +440,7 @@ wmitlv_check_and_pad_tlvs(void *os_handle, void *param_struc_ptr, { wmitlv_attributes_struc attr_struct_ptr; A_UINT32 buf_idx = 0; + A_UINT32 ret = -1; A_UINT32 tlv_index = 0; A_UINT32 num_of_elems = 0; int tlv_size_diff = 0; @@ -861,7 +862,7 @@ wmitlv_check_and_pad_tlvs(void *os_handle, void *param_struc_ptr, buf_idx += curr_tlv_len + num_padding_bytes; } - return (0); + return 0; Error_wmitlv_check_and_pad_tlvs: if (is_cmd_id) { wmitlv_free_allocated_command_tlvs(wmi_cmd_event_id, @@ -871,13 +872,13 @@ Error_wmitlv_check_and_pad_tlvs: wmi_cmd_struct_ptr); } *wmi_cmd_struct_ptr = NULL; - return (-1); + return ret; } /* * Helper Function to validate and pad(if necessary) for incoming WMI Event TLVs * Return 0 if success. - <0 if failure. + * <0 if failure. */ int wmitlv_check_and_pad_event_tlvs(void *os_handle, void *param_struc_ptr, @@ -886,15 +887,15 @@ wmitlv_check_and_pad_event_tlvs(void *os_handle, void *param_struc_ptr, void **wmi_cmd_struct_ptr) { A_UINT32 is_cmd_id = 0; - return (wmitlv_check_and_pad_tlvs + return wmitlv_check_and_pad_tlvs (os_handle, param_struc_ptr, param_buf_len, is_cmd_id, - wmi_cmd_event_id, wmi_cmd_struct_ptr)); + wmi_cmd_event_id, wmi_cmd_struct_ptr); } /* * Helper Function to validate and pad(if necessary) for incoming WMI Command TLVs * Return 0 if success. - <0 if failure. + * <0 if failure. */ int wmitlv_check_and_pad_command_tlvs(void *os_handle, void *param_struc_ptr, @@ -903,9 +904,9 @@ wmitlv_check_and_pad_command_tlvs(void *os_handle, void *param_struc_ptr, void **wmi_cmd_struct_ptr) { A_UINT32 is_cmd_id = 1; - return (wmitlv_check_and_pad_tlvs + return wmitlv_check_and_pad_tlvs (os_handle, param_struc_ptr, param_buf_len, is_cmd_id, - wmi_cmd_event_id, wmi_cmd_struct_ptr)); + wmi_cmd_event_id, wmi_cmd_struct_ptr); } /* @@ -927,10 +928,9 @@ static void wmitlv_free_allocated_tlvs(A_UINT32 is_cmd_id, /* macro to free that previously allocated memory for this TLV. When (op==FREE_TLV_ELEM). */ #define WMITLV_OP_FREE_TLV_ELEM_macro(param_ptr, param_len, wmi_cmd_event_id, elem_tlv_tag, elem_struc_type, elem_name, var_len, arr_size) \ - if ((((WMITLV_TYPEDEF_STRUCT_PARAMS_TLVS(wmi_cmd_event_id) *)ptr)->WMITLV_FIELD_BUF_IS_ALLOCATED(elem_name)) && \ - (((WMITLV_TYPEDEF_STRUCT_PARAMS_TLVS(wmi_cmd_event_id) *)ptr)->elem_name != NULL)) \ - { \ - wmi_tlv_os_mem_free(((WMITLV_TYPEDEF_STRUCT_PARAMS_TLVS(wmi_cmd_event_id) *)ptr)->elem_name); \ + if ((((WMITLV_TYPEDEF_STRUCT_PARAMS_TLVS(wmi_cmd_event_id)*)ptr)->WMITLV_FIELD_BUF_IS_ALLOCATED(elem_name)) && \ + (((WMITLV_TYPEDEF_STRUCT_PARAMS_TLVS(wmi_cmd_event_id)*)ptr)->elem_name != NULL)) { \ + wmi_tlv_os_mem_free(((WMITLV_TYPEDEF_STRUCT_PARAMS_TLVS(wmi_cmd_event_id)*)ptr)->elem_name); \ } #define WMITLV_FREE_TLV_ELEMS(id) \ diff --git a/core/wmi/wmi_tlv_platform.c b/core/wmi/wmi_tlv_platform.c index f3c20be4f0..3351b01510 100644 --- a/core/wmi/wmi_tlv_platform.c +++ b/core/wmi/wmi_tlv_platform.c @@ -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. * @@ -44,7 +44,7 @@ Pronto and its future platforms) specific APIs */ #define dummy_print(fmt, ...) {} #define wmi_tlv_print_verbose dummy_print -#define wmi_tlv_print_error cdf_print +#define wmi_tlv_print_error qdf_print #define wmi_tlv_OS_MEMCPY OS_MEMCPY #define wmi_tlv_OS_MEMZERO OS_MEMZERO #define wmi_tlv_OS_MEMMOVE OS_MEMMOVE diff --git a/core/wmi/wmi_unified.c b/core/wmi/wmi_unified.c index 8bf451ce76..5dd95378ae 100644 --- a/core/wmi/wmi_unified.c +++ b/core/wmi/wmi_unified.c @@ -817,7 +817,7 @@ int wmi_unified_cmd_send(wmi_unified_t wmi_handle, wmi_buf_t buf, int len, if (wmitlv_check_command_tlv_params(NULL, buf_ptr, len, cmd_id) != 0) { - cdf_print + qdf_print ("\nERROR: %s: Invalid WMI Parameter Buffer for Cmd:%d\n", __func__, cmd_id); return -1; @@ -834,7 +834,7 @@ int wmi_unified_cmd_send(wmi_unified_t wmi_handle, wmi_buf_t buf, int len, qdf_atomic_inc(&wmi_handle->pending_cmds); if (qdf_atomic_read(&wmi_handle->pending_cmds) >= WMI_MAX_CMDS) { - scn = cds_get_context(CDF_MODULE_ID_HIF); + scn = cds_get_context(QDF_MODULE_ID_HIF); pr_err("\n%s: hostcredits = %d\n", __func__, wmi_get_host_credits(wmi_handle)); htc_dump_counter_info(wmi_handle->htc_handle); @@ -1266,7 +1266,7 @@ wmi_unified_remove_work(struct wmi_unified *wmi_handle) { wmi_buf_t buf; - CDF_TRACE(CDF_MODULE_ID_WMI, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_WMI, CDF_TRACE_LEVEL_INFO, "Enter: %s", __func__); cds_flush_work(&wmi_handle->rx_event_work); cdf_spin_lock_bh(&wmi_handle->eventq_lock); @@ -1276,7 +1276,7 @@ wmi_unified_remove_work(struct wmi_unified *wmi_handle) buf = cdf_nbuf_queue_remove(&wmi_handle->event_queue); } cdf_spin_unlock_bh(&wmi_handle->eventq_lock); - CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_INFO, "Done: %s", __func__); } diff --git a/uapi/linux/osapi_linux.h b/uapi/linux/osapi_linux.h index 4fa05bbb57..75c69b794e 100644 --- a/uapi/linux/osapi_linux.h +++ b/uapi/linux/osapi_linux.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -72,11 +72,11 @@ #define A_MEMCMP(addr1, addr2, len) memcmp((addr1), (addr2), (len)) #define A_LOGGER(mask, mod, args ...) \ - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, ## args) + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, ## args) #define A_PRINTF(args ...) \ - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, ## args) + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, ## args) #define A_PRINTF_LOG(args ...) \ - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, ## args) + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, ## args) #define A_SNPRINTF(buf, len, args ...) snprintf (buf, len, args) /* @@ -132,13 +132,13 @@ typedef struct timer_list A_TIMER; extern unsigned int panic_on_assert; #define A_ASSERT(expr) \ if (!(expr)) { \ - printk(KERN_ALERT "Debug Assert Caught, File %s, Line: %d, Test:%s \n",__FILE__, __LINE__,# expr); \ + printk(KERN_ALERT "Debug Assert Caught, File %s, Line: %d, Test:%s \n", __FILE__, __LINE__, # expr); \ if (panic_on_assert) panic(# expr); \ } #else #define A_ASSERT(expr) \ if (!(expr)) { \ - printk(KERN_ALERT "Debug Assert Caught, File %s, Line: %d, Test:%s \n",__FILE__, __LINE__,# expr); \ + printk(KERN_ALERT "Debug Assert Caught, File %s, Line: %d, Test:%s \n", __FILE__, __LINE__, # expr); \ } #endif #else @@ -170,13 +170,13 @@ typedef struct sk_buff_head A_NETBUF_QUEUE_T; a_netbuf_push(bufPtr, len) #define A_NETBUF_PUT(bufPtr, len) \ a_netbuf_put(bufPtr, len) -#define A_NETBUF_TRIM(bufPtr,len) \ +#define A_NETBUF_TRIM(bufPtr, len) \ a_netbuf_trim(bufPtr, len) #define A_NETBUF_PULL(bufPtr, len) \ a_netbuf_pull(bufPtr, len) #define A_NETBUF_HEADROOM(bufPtr) \ a_netbuf_headroom(bufPtr) -#define A_NETBUF_SETLEN(bufPtr,len) \ +#define A_NETBUF_SETLEN(bufPtr, len) \ a_netbuf_setlen(bufPtr, len) /* Add data to end of a buffer */ @@ -197,7 +197,7 @@ typedef struct sk_buff_head A_NETBUF_QUEUE_T; /* View data as "size" contiguous bytes of type "t" */ #define A_NETBUF_VIEW_DATA(bufPtr, t, size) \ - (t )( ((struct skbuf *)(bufPtr))->data) + (t)(((struct skbuf *)(bufPtr))->data) /* return the beginning of the headroom for the buffer */ #define A_NETBUF_HEAD(bufPtr) \