summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKiran Kumar Lokere <klokere@codeaurora.org>2017-03-10 20:16:44 -0800
committerSandeep Puligilla <spuligil@codeaurora.org>2017-03-12 22:59:05 -0700
commit35de732734e99a54bdae579c1770dd8ea4c883a7 (patch)
treead3bf1374e3e34379a556801c063ed568aa376eb
parent5c98ab7a4c810758b8ecee592e81f674ca44cbe2 (diff)
qcacld-3.0: Enable channel bonding only in 11n or 11ac mode
Enable channel bonding only if the dot11 mode is 11n or 11ac Change-Id: Ic0afdb8ed7c36838725fd63730fca0310d5a731f CRs-Fixed: 2018363
-rw-r--r--core/sme/src/csr/csr_api_roam.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c
index 0763237ae2e6..ebbbbd0c5821 100644
--- a/core/sme/src/csr/csr_api_roam.c
+++ b/core/sme/src/csr/csr_api_roam.c
@@ -4145,8 +4145,14 @@ QDF_STATUS csr_roam_prepare_bss_config(tpAniSirGlobal pMac,
pBssConfig->uJoinTimeOut =
CSR_JOIN_FAILURE_TIMEOUT_DEFAULT;
/* validate CB */
- pBssConfig->cbMode = csr_get_cb_mode_from_ies(pMac, pBssDesc->channelId,
- pIes);
+ if ((pBssConfig->uCfgDot11Mode == eCSR_CFG_DOT11_MODE_11N)
+ || (pBssConfig->uCfgDot11Mode == eCSR_CFG_DOT11_MODE_11AC)
+ || (pBssConfig->uCfgDot11Mode == eCSR_CFG_DOT11_MODE_11AC_ONLY)
+ || (pBssConfig->uCfgDot11Mode == eCSR_CFG_DOT11_MODE_11N_ONLY))
+ pBssConfig->cbMode = csr_get_cb_mode_from_ies(pMac,
+ pBssDesc->channelId, pIes);
+ else
+ pBssConfig->cbMode = PHY_SINGLE_CHANNEL_CENTERED;
return QDF_STATUS_SUCCESS;
}