summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManikandan Mohan <manikand@qca.qualcomm.com>2015-08-06 12:46:18 -0700
committerAnjaneedevi Kapparapu <akappa@codeaurora.org>2015-08-11 13:50:43 +0530
commitc1fb0474040abdf7db3b23ccbb03b2af4065fe33 (patch)
treee81627e112fc830f17762911807d54edf8e57b23
parent794e1075915e7e9454577069f344c7ab4f37f46f (diff)
qcacld: Fix SDIO platfrom crash with obss disabled
OBSS feature is not enabled since SDIO platform does not have feature compiled. So fix a crash to include obss auto enabling during start bss in feature compilation flag. Change-Id: I50a9db95ee9239b4db03a96e9153b316aaf17840 CRs-fixed: 887908
-rw-r--r--CORE/HDD/src/wlan_hdd_cfg.c2
-rw-r--r--CORE/HDD/src/wlan_hdd_cfg80211.c7
-rw-r--r--CORE/SME/src/csr/csrApiRoam.c1
3 files changed, 7 insertions, 3 deletions
diff --git a/CORE/HDD/src/wlan_hdd_cfg.c b/CORE/HDD/src/wlan_hdd_cfg.c
index b1b3208897a5..41e924c7c91b 100644
--- a/CORE/HDD/src/wlan_hdd_cfg.c
+++ b/CORE/HDD/src/wlan_hdd_cfg.c
@@ -6387,8 +6387,6 @@ VOS_STATUS hdd_set_sme_config( hdd_context_t *pHddCtx )
smeConfig->csrConfig.isCoalesingInIBSSAllowed =
pHddCtx->cfg_ini->isCoalesingInIBSSAllowed;
- /* SAP OBSS automatically supported based on ch width*/
- smeConfig->csrConfig.obssEnabled = 1;
/* update SSR config */
sme_UpdateEnableSSR((tHalHandle)(pHddCtx->hHal), pHddCtx->cfg_ini->enableSSR);
/* Update the Directed scan offload setting */
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index 708ee1854fab..c3287025d5c4 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -10152,6 +10152,7 @@ static void wlan_hdd_check_11gmode(u8 *pIe, u8* require_ht, u8* require_vht,
return;
}
+#ifdef QCA_HT_2040_COEX
static bool wlan_hdd_get_sap_obss(hdd_adapter_t *pHostapdAdapter)
{
uint8_t ht_cap_ie[DOT11F_IE_HTCAPS_MAX_LEN];
@@ -10171,6 +10172,12 @@ static bool wlan_hdd_get_sap_obss(hdd_adapter_t *pHostapdAdapter)
return false;
}
+#else
+static bool wlan_hdd_get_sap_obss(hdd_adapter_t *pHostapdAdapter)
+{
+ return false;
+}
+#endif
static void wlan_hdd_set_sapHwmode(hdd_adapter_t *pHostapdAdapter)
{
diff --git a/CORE/SME/src/csr/csrApiRoam.c b/CORE/SME/src/csr/csrApiRoam.c
index 995e83905e2c..82f25cf06a43 100644
--- a/CORE/SME/src/csr/csrApiRoam.c
+++ b/CORE/SME/src/csr/csrApiRoam.c
@@ -1161,7 +1161,6 @@ static void initConfigParam(tpAniSirGlobal pMac)
pMac->roam.configParam.nInitialDwellTime = 0;
pMac->roam.configParam.initial_scan_no_dfs_chnl = 0;
- pMac->roam.configParam.obssEnabled = 1;
}
eCsrBand csrGetCurrentBand(tHalHandle hHal)
{