From 681d137dabd7162789a21262589da9dc943a062c Mon Sep 17 00:00:00 2001 From: "Chandrasekaran, Manishekar" Date: Thu, 5 Nov 2015 10:42:48 +0530 Subject: [PATCH] qcacld-3.0: Move cds_get_bin.c to concurrency management files cds_get_bin.h and cds_get_bin.c were derived from qcacld-2.0 vos_get_bin.h and vos_get_bin.c. These files got their names since at one time they housed the wrappers used to retrieve binary files nv.bin, cfg.dat, and firmware. But over time the functionality to actually retrieve binary files (get_bin) has been removed, and almost all that is left is concurrency management functions. So, moving the .[ch] functionality to the right files. CRs-Fixed: 932777 Change-Id: I4a26c304cc6b6224d0839c365e4006fd32270961 --- Kbuild | 1 - core/bmi/src/ol_fw.c | 1 + core/cds/inc/cds_api.h | 1 - core/cds/inc/cds_concurrency.h | 16 +++ core/cds/inc/cds_crypto.h | 1 - core/cds/inc/cds_get_bin.h | 75 ------------ core/cds/src/cds_concurrency.c | 152 ++++++++++++++++++++++++ core/cds/src/cds_get_bin.c | 166 --------------------------- core/hdd/src/wlan_hdd_driver_ops.c | 1 + core/hdd/src/wlan_hdd_power.c | 1 + core/hif/src/ce/ce_bmi.c | 1 - core/hif/src/ce/ce_diag.c | 2 +- core/hif/src/ce/ce_main.c | 2 +- core/hif/src/ce/ce_service.c | 2 +- core/hif/src/hif_main.c | 3 +- core/hif/src/pcie/if_pci.c | 1 + core/htc/htc.c | 2 +- core/htc/htc_recv.c | 3 +- core/htc/htc_send.c | 1 - core/mac/src/pe/lim/lim_api.c | 1 + core/sap/src/sap_module.c | 1 + core/sme/src/csr/csr_neighbor_roam.c | 1 + core/utils/epping/src/epping_main.c | 1 + core/wma/src/wma_main.c | 1 + core/wma/src/wma_mgmt.c | 1 + core/wma/src/wma_utils.c | 1 + 26 files changed, 186 insertions(+), 253 deletions(-) delete mode 100644 core/cds/inc/cds_get_bin.h delete mode 100644 core/cds/src/cds_get_bin.c diff --git a/Kbuild b/Kbuild index 0ad05d87faa4..2f9098131c6b 100644 --- a/Kbuild +++ b/Kbuild @@ -604,7 +604,6 @@ CDS_INC := -I$(WLAN_ROOT)/$(CDS_INC_DIR) \ -I$(WLAN_ROOT)/$(CDS_SRC_DIR) CDS_OBJS := $(CDS_SRC_DIR)/cds_api.o \ - $(CDS_SRC_DIR)/cds_get_bin.o \ $(CDS_SRC_DIR)/cds_reg_service.o \ $(CDS_SRC_DIR)/cds_mq.o \ $(CDS_SRC_DIR)/cds_packet.o \ diff --git a/core/bmi/src/ol_fw.c b/core/bmi/src/ol_fw.c index 94488b922986..1607010d7dad 100644 --- a/core/bmi/src/ol_fw.c +++ b/core/bmi/src/ol_fw.c @@ -42,6 +42,7 @@ #include "i_bmi.h" #include "qwlan_version.h" +#include "cds_concurrency.h" #ifdef FEATURE_SECURE_FIRMWARE static struct hash_fw fw_hash; diff --git a/core/cds/inc/cds_api.h b/core/cds/inc/cds_api.h index 01618a578322..c88068f0e61f 100644 --- a/core/cds/inc/cds_api.h +++ b/core/cds/inc/cds_api.h @@ -38,7 +38,6 @@ #include #include #include -#include #include #include #include diff --git a/core/cds/inc/cds_concurrency.h b/core/cds/inc/cds_concurrency.h index ff9f30b0940e..8d88e7f8b9da 100644 --- a/core/cds/inc/cds_concurrency.h +++ b/core/cds/inc/cds_concurrency.h @@ -770,4 +770,20 @@ bool cds_map_concurrency_mode(hdd_context_t *hdd_ctx, tCDF_CON_MODE *old_mode, enum cds_con_mode *new_mode); CDF_STATUS cds_get_channel_from_scan_result(hdd_adapter_t *adapter, tCsrRoamProfile *roam_profile, uint8_t *channel); + +tCDF_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); +bool cds_is_multiple_active_sta_sessions(void); +bool cds_is_sta_active_connection_exists(void); + +#ifdef WLAN_FEATURE_MBSSID +bool cds_concurrent_beaconing_sessions_running(void); +#else +static inline bool cds_concurrent_beaconing_sessions_running(void) +{ + return true; +} +#endif #endif /* __CDS_CONCURRENCY_H */ diff --git a/core/cds/inc/cds_crypto.h b/core/cds/inc/cds_crypto.h index 7df3b7dd7076..25fbfdfd7bc7 100644 --- a/core/cds/inc/cds_crypto.h +++ b/core/cds/inc/cds_crypto.h @@ -38,7 +38,6 @@ #include #include #include -#include #include #include #include diff --git a/core/cds/inc/cds_get_bin.h b/core/cds/inc/cds_get_bin.h deleted file mode 100644 index a561e955148c..000000000000 --- a/core/cds/inc/cds_get_bin.h +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright (c) 2014 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( __CDS_GETBIN_H ) -#define __CDS_GETBIN_H - -/**========================================================================= - - \file cds_getBin.h - - \brief Connectivity driver services (CDS) binary APIs - - Binary retrieval definitions and APIs. - - These APIs allow components to retrieve binary contents (firmware, - configuration data, etc.) from a storage medium on the platform. - - ========================================================================*/ - -/*-------------------------------------------------------------------------- - Include Files - ------------------------------------------------------------------------*/ -#include -#include - -/*-------------------------------------------------------------------------- - Preprocessor definitions and constants - ------------------------------------------------------------------------*/ - -/*-------------------------------------------------------------------------- - Type declarations - ------------------------------------------------------------------------*/ - -/*------------------------------------------------------------------------- - Function declarations and documenation - ------------------------------------------------------------------------*/ - -/**---------------------------------------------------------------------------- - \brief cds_get_conparam()- function to read the insmod parameters - -----------------------------------------------------------------------------*/ -tCDF_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); -bool cds_is_multiple_active_sta_sessions(void); -bool cds_is_sta_active_connection_exists(void); - -#ifdef WLAN_FEATURE_MBSSID -bool cds_concurrent_beaconing_sessions_running(void); -#endif -#endif /* !defined __CDS_GETBIN_H */ diff --git a/core/cds/src/cds_concurrency.c b/core/cds/src/cds_concurrency.c index 48a99f33706b..21d7dd544a93 100644 --- a/core/cds/src/cds_concurrency.c +++ b/core/cds/src/cds_concurrency.c @@ -7234,3 +7234,155 @@ enum cds_con_mode cds_convert_device_mode_to_hdd_type( } return mode; } + +/** + * cds_get_conparam() - Get the connection mode parameters + * + * Return the connection mode parameter set by insmod or set during statically + * linked driver + * + * Return: tCDF_CON_MODE + */ +tCDF_CON_MODE cds_get_conparam(void) +{ + tCDF_CON_MODE con_mode; + con_mode = hdd_get_conparam(); + return con_mode; +} + +/** + * cds_concurrent_open_sessions_running() - Checks for concurrent open session + * + * Checks if more than one open session is running for all the allowed modes + * in the driver + * + * Return: True if more than one open session exists, False otherwise + */ +bool cds_concurrent_open_sessions_running(void) +{ + uint8_t i = 0; + uint8_t j = 0; + hdd_context_t *pHddCtx; + + pHddCtx = cds_get_context(CDF_MODULE_ID_HDD); + if (NULL != pHddCtx) { + for (i = 0; i < CDF_MAX_NO_OF_MODE; i++) + j += pHddCtx->no_of_open_sessions[i]; + } + + return j > 1; +} + +#ifdef WLAN_FEATURE_MBSSID +/** + * cds_concurrent_beaconing_sessions_running() - Checks for concurrent beaconing + * entities + * + * Checks if multiple beaconing sessions are running i.e., if SAP or GO or IBSS + * are beaconing together + * + * Return: True if multiple entities are beaconing together, False otherwise + */ +bool cds_concurrent_beaconing_sessions_running(void) +{ + uint8_t i = 0; + hdd_context_t *pHddCtx; + + pHddCtx = cds_get_context(CDF_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]; + } + return i > 1; +} +#endif + +/** + * cds_max_concurrent_connections_reached() - Check if max conccurrency is + * reached + * + * Checks for presence of concurrency where more than one connection exists + * + * Return: True if the max concurrency is reached, False otherwise + * + * Example: + * STA + STA (wlan0 and wlan1 are connected) - returns true + * STA + STA (wlan0 connected and wlan1 disconnected) - returns false + * DUT with P2P-GO + P2P-CLIENT connection) - returns true + * + */ +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); + if (NULL != pHddCtx) { + for (i = 0; i < CDF_MAX_NO_OF_MODE; i++) + j += pHddCtx->no_of_active_sessions[i]; + return j > + (pHddCtx->config-> + gMaxConcurrentActiveSessions - 1); + } + + return false; +} + +/** + * cds_clear_concurrent_session_count() - Clear active session count + * + * Clears the active session count for all modes + * + * Return: None + */ +void cds_clear_concurrent_session_count(void) +{ + uint8_t i = 0; + hdd_context_t *pHddCtx; + + pHddCtx = cds_get_context(CDF_MODULE_ID_HDD); + if (NULL != pHddCtx) { + for (i = 0; i < CDF_MAX_NO_OF_MODE; i++) + pHddCtx->no_of_active_sessions[i] = 0; + } +} + +/** + * cds_is_multiple_active_sta_sessions() - Check for multiple STA connections + * + * Checks if multiple active STA connection are in the driver + * + * Return: True if multiple STA sessions are present, False otherwise + * + */ +bool cds_is_multiple_active_sta_sessions(void) +{ + hdd_context_t *pHddCtx; + uint8_t j = 0; + + pHddCtx = cds_get_context(CDF_MODULE_ID_HDD); + if (NULL != pHddCtx) + j = pHddCtx->no_of_active_sessions[CDF_STA_MODE]; + + return j > 1; +} + +/** + * cds_is_sta_active_connection_exists() - Check if a STA connection is active + * + * Checks if there is atleast one active STA connection in the driver + * + * Return: True if an active STA session is present, False otherwise + */ +bool cds_is_sta_active_connection_exists(void) +{ + hdd_context_t *pHddCtx; + uint8_t j = 0; + + pHddCtx = cds_get_context(CDF_MODULE_ID_HDD); + if (NULL != pHddCtx) + j = pHddCtx->no_of_active_sessions[CDF_STA_MODE]; + + return j ? true : false; +} diff --git a/core/cds/src/cds_get_bin.c b/core/cds/src/cds_get_bin.c deleted file mode 100644 index ac87dd5db866..000000000000 --- a/core/cds/src/cds_get_bin.c +++ /dev/null @@ -1,166 +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. - */ - -#include -#include -#include -#include -#include - -tCDF_CON_MODE cds_get_conparam(void) -{ - tCDF_CON_MODE con_mode; - con_mode = hdd_get_conparam(); - return con_mode; -} - -bool cds_concurrent_open_sessions_running(void) -{ - uint8_t i = 0; - uint8_t j = 0; - hdd_context_t *pHddCtx; - - pHddCtx = cds_get_context(CDF_MODULE_ID_HDD); - if (NULL != pHddCtx) { - for (i = 0; i < CDF_MAX_NO_OF_MODE; i++) { - j += pHddCtx->no_of_open_sessions[i]; - } - } - - return j > 1; -} - -#ifdef WLAN_FEATURE_MBSSID -bool cds_concurrent_beaconing_sessions_running(void) -{ - uint8_t i = 0; - hdd_context_t *pHddCtx; - - pHddCtx = cds_get_context(CDF_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]; - } - return i > 1; -} -#endif - -/**--------------------------------------------------------------------------- -* -* \brief cds_max_concurrent_connections_reached() -* -* This function checks for presence of concurrency where more than -* one connection exists and it returns true if the max concurrency is -* reached. -* -* Example: -* STA + STA (wlan0 and wlan1 are connected) - returns true -* STA + STA (wlan0 connected and wlan1 disconnected) - returns false -* DUT with P2P-GO + P2P-CLIENT connection) - returns true -* -* \param - None -* -* \return - true or false -* -* --------------------------------------------------------------------------*/ -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); - if (NULL != pHddCtx) { - for (i = 0; i < CDF_MAX_NO_OF_MODE; i++) - j += pHddCtx->no_of_active_sessions[i]; - return j > - (pHddCtx->config-> - gMaxConcurrentActiveSessions - 1); - } - - return false; -} - -void cds_clear_concurrent_session_count(void) -{ - uint8_t i = 0; - hdd_context_t *pHddCtx; - - pHddCtx = cds_get_context(CDF_MODULE_ID_HDD); - if (NULL != pHddCtx) { - for (i = 0; i < CDF_MAX_NO_OF_MODE; i++) - pHddCtx->no_of_active_sessions[i] = 0; - } -} - -/**--------------------------------------------------------------------------- -* -* \brief cds_is_multiple_active_sta_sessions() -* -* This function checks for presence of multiple active sta connections -* and it returns true if the more than 1 active sta connection exists. -* -* \param - None -* -* \return - true or false -* -* --------------------------------------------------------------------------*/ -bool cds_is_multiple_active_sta_sessions(void) -{ - hdd_context_t *pHddCtx; - uint8_t j = 0; - - pHddCtx = cds_get_context(CDF_MODULE_ID_HDD); - if (NULL != pHddCtx) - j = pHddCtx->no_of_active_sessions[CDF_STA_MODE]; - - return j > 1; -} - -/**--------------------------------------------------------------------------- -* -* \brief cds_is_sta_active_connection_exists() -* -* This function checks for the presence of active sta connection -* and it returns true if exists. -* -* \param - None -* -* \return - true or false -* -* --------------------------------------------------------------------------*/ -bool cds_is_sta_active_connection_exists(void) -{ - hdd_context_t *pHddCtx; - uint8_t j = 0; - - pHddCtx = cds_get_context(CDF_MODULE_ID_HDD); - if (NULL != pHddCtx) - j = pHddCtx->no_of_active_sessions[CDF_STA_MODE]; - - return j ? true : false; -} diff --git a/core/hdd/src/wlan_hdd_driver_ops.c b/core/hdd/src/wlan_hdd_driver_ops.c index ff39296ee733..49432f6ab882 100644 --- a/core/hdd/src/wlan_hdd_driver_ops.c +++ b/core/hdd/src/wlan_hdd_driver_ops.c @@ -46,6 +46,7 @@ #include "wlan_logging_sock_svc.h" #include "wma_api.h" #include "wlan_hdd_napi.h" +#include "cds_concurrency.h" #ifdef MODULE #define WLAN_MODULE_NAME module_name(THIS_MODULE) diff --git a/core/hdd/src/wlan_hdd_power.c b/core/hdd/src/wlan_hdd_power.c index d227d6c28273..5433c368961e 100644 --- a/core/hdd/src/wlan_hdd_power.c +++ b/core/hdd/src/wlan_hdd_power.c @@ -68,6 +68,7 @@ #include #include "hif.h" #include "sme_power_save_api.h" +#include "cds_concurrency.h" /* Preprocessor definitions and constants */ #define HDD_SSR_BRING_UP_TIME 30000 diff --git a/core/hif/src/ce/ce_bmi.c b/core/hif/src/ce/ce_bmi.c index b2d541d2d2f4..edf1d46d059d 100644 --- a/core/hif/src/ce/ce_bmi.c +++ b/core/hif/src/ce/ce_bmi.c @@ -49,7 +49,6 @@ #else #include "cnss_stub.h" #endif -#include #include "epping_main.h" #include "hif_debug.h" diff --git a/core/hif/src/ce/ce_diag.c b/core/hif/src/ce/ce_diag.c index c078f218b01a..f524702503cc 100644 --- a/core/hif/src/ce/ce_diag.c +++ b/core/hif/src/ce/ce_diag.c @@ -47,9 +47,9 @@ #ifdef CONFIG_CNSS #include #endif -#include #include "hif_debug.h" #include "epping_main.h" +#include "cds_concurrency.h" void hif_dump_target_memory(struct ol_softc *scn, void *ramdump_base, uint32_t address, uint32_t size) diff --git a/core/hif/src/ce/ce_main.c b/core/hif/src/ce/ce_main.c index 8cf00f13e9bb..452fcc6b2782 100644 --- a/core/hif/src/ce/ce_main.c +++ b/core/hif/src/ce/ce_main.c @@ -49,7 +49,6 @@ #ifdef CONFIG_CNSS #include #endif -#include #include "epping_main.h" #include "hif_debug.h" #include "ce_internal.h" @@ -62,6 +61,7 @@ #include #endif #include "qwlan_version.h" +#include "cds_concurrency.h" #define CE_POLL_TIMEOUT 10 /* ms */ diff --git a/core/hif/src/ce/ce_service.c b/core/hif/src/ce/ce_service.c index d27ca6b1a848..a898d0b63104 100644 --- a/core/hif/src/ce/ce_service.c +++ b/core/hif/src/ce/ce_service.c @@ -37,10 +37,10 @@ #include "ce_reg.h" #include "cdf_lock.h" #include "regtable.h" -#include #include "epping_main.h" #include "hif_main.h" #include "hif_debug.h" +#include "cds_concurrency.h" #ifdef IPA_OFFLOAD #ifdef QCA_WIFI_3_0 diff --git a/core/hif/src/hif_main.c b/core/hif/src/hif_main.c index bbfde23c236b..7dbc3698fea4 100644 --- a/core/hif/src/hif_main.c +++ b/core/hif/src/hif_main.c @@ -51,7 +51,6 @@ #ifdef CONFIG_CNSS #include #endif -#include #include "epping_main.h" #include "hif_debug.h" #include "mp_dev.h" @@ -65,6 +64,8 @@ #include "pktlog_ac.h" #endif +#include "cds_concurrency.h" + #define AGC_DUMP 1 #define CHANINFO_DUMP 2 #define BB_WATCHDOG_DUMP 3 diff --git a/core/hif/src/pcie/if_pci.c b/core/hif/src/pcie/if_pci.c index 6efb418ee8d9..91cff6a8835f 100644 --- a/core/hif/src/pcie/if_pci.c +++ b/core/hif/src/pcie/if_pci.c @@ -68,6 +68,7 @@ #include "if_pci_internal.h" #include "icnss_stub.h" #include "ce_tasklet.h" +#include "cds_concurrency.h" /* Maximum ms timeout for host to wake up target */ #define PCIE_WAKE_TIMEOUT 1000 diff --git a/core/htc/htc.c b/core/htc/htc.c index bbabee1f2575..607e825e0b31 100644 --- a/core/htc/htc.c +++ b/core/htc/htc.c @@ -31,9 +31,9 @@ #include /* cdf_nbuf_t */ #include /* cdf_print */ #include -#include #include "epping_main.h" #include "hif_io32.h" +#include "cds_concurrency.h" #ifdef DEBUG static ATH_DEBUG_MASK_DESCRIPTION g_htc_debug_description[] = { diff --git a/core/htc/htc_recv.c b/core/htc/htc_recv.c index dd8719e2649e..3418aac136fe 100644 --- a/core/htc/htc_recv.c +++ b/core/htc/htc_recv.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2014 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2015 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -29,7 +29,6 @@ #include "htc_internal.h" #include "cds_api.h" #include /* cdf_nbuf_t */ -#include #include "epping_main.h" #ifdef DEBUG diff --git a/core/htc/htc_send.c b/core/htc/htc_send.c index e011538de1a9..48d55709c1f3 100644 --- a/core/htc/htc_send.c +++ b/core/htc/htc_send.c @@ -29,7 +29,6 @@ #include "htc_internal.h" #include /* cdf_nbuf_t */ #include /* cdf_mem_malloc */ -#include #include "epping_main.h" /* #define USB_HIF_SINGLE_PIPE_DATA_SCHED */ diff --git a/core/mac/src/pe/lim/lim_api.c b/core/mac/src/pe/lim/lim_api.c index 4c0efc8d6080..761bc7e5cf2c 100644 --- a/core/mac/src/pe/lim/lim_api.c +++ b/core/mac/src/pe/lim/lim_api.c @@ -72,6 +72,7 @@ #include "cds_packet.h" #include "cds_utils.h" #include "sys_startup.h" +#include "cds_concurrency.h" static void __lim_init_scan_vars(tpAniSirGlobal pMac) { diff --git a/core/sap/src/sap_module.c b/core/sap/src/sap_module.c index 5b0e28b4e072..8969d4b94116 100644 --- a/core/sap/src/sap_module.c +++ b/core/sap/src/sap_module.c @@ -53,6 +53,7 @@ #include "sme_inside.h" #include "cds_ieee80211_common_i.h" #include "cds_regdomain_common.h" +#include "cds_concurrency.h" /*---------------------------------------------------------------------------- * Preprocessor Definitions and Constants diff --git a/core/sme/src/csr/csr_neighbor_roam.c b/core/sme/src/csr/csr_neighbor_roam.c index 5aef6cf3e0f8..7e36d27a1ae8 100644 --- a/core/sme/src/csr/csr_neighbor_roam.c +++ b/core/sme/src/csr/csr_neighbor_roam.c @@ -47,6 +47,7 @@ #include "sme_api.h" #include "csr_neighbor_roam.h" #include "mac_trace.h" +#include "cds_concurrency.h" #define WLAN_FEATURE_NEIGHBOR_ROAMING_DEBUG 1 #ifdef WLAN_FEATURE_NEIGHBOR_ROAMING_DEBUG diff --git a/core/utils/epping/src/epping_main.c b/core/utils/epping/src/epping_main.c index dd0c463e1793..c222c557d938 100644 --- a/core/utils/epping/src/epping_main.c +++ b/core/utils/epping/src/epping_main.c @@ -53,6 +53,7 @@ #include "hif.h" #include "epping_main.h" #include "epping_internal.h" +#include "cds_concurrency.h" #ifdef TIMER_MANAGER #define TIMER_MANAGER_STR " +TIMER_MANAGER" diff --git a/core/wma/src/wma_main.c b/core/wma/src/wma_main.c index 0676686d68e0..86868bf3885d 100644 --- a/core/wma/src/wma_main.c +++ b/core/wma/src/wma_main.c @@ -76,6 +76,7 @@ #include "wma_internal.h" #include "wma_ocb.h" +#include "cds_concurrency.h" #define WMA_LOG_COMPLETION_TIMER 10000 /* 10 seconds */ #define WMA_SERVICE_READY_EXT_TIMEOUT 2000 /* 2 seconds */ diff --git a/core/wma/src/wma_mgmt.c b/core/wma/src/wma_mgmt.c index 8544fa46e5c6..4ba24036b7a5 100644 --- a/core/wma/src/wma_mgmt.c +++ b/core/wma/src/wma_mgmt.c @@ -68,6 +68,7 @@ #include "ol_fw.h" #include "dfs.h" #include "wma_internal.h" +#include "cds_concurrency.h" /** * wma_send_bcn_buf_ll() - prepare and send beacon buffer to fw for LL diff --git a/core/wma/src/wma_utils.c b/core/wma/src/wma_utils.c index 1411a3511e4e..b2f1fa5b7842 100644 --- a/core/wma/src/wma_utils.c +++ b/core/wma/src/wma_utils.c @@ -68,6 +68,7 @@ #include "dfs.h" #include "wma_internal.h" +#include "cds_concurrency.h" /* MCS Based rate table */ /* HT MCS parameters with Nss = 1 */