diff options
| author | Agrawal Ashish <ashishka@qti.qualcomm.com> | 2016-06-08 15:02:21 +0530 |
|---|---|---|
| committer | Anjaneedevi Kapparapu <akappa@codeaurora.org> | 2016-06-09 14:57:39 +0530 |
| commit | 0d128e4e75b7d5678e34d5cc3aa8b8fbc2e45627 (patch) | |
| tree | 8b6954ce3fe96ebf159f5659d7218347f7889f37 | |
| parent | 7c09477cf949042570b7f68ee97c0db8802a1e41 (diff) | |
qcacld-2.0: Don't enable 2.4 GHz social channels in 5 GHz only mode in MDM
Don't enable 2.4 GHz social channels in 5 GHz only mode.
When 5GHz mode is enabled, only 5GHz channels should be
updated to firmware.
Change-Id: I72100df664e7defe616cd78450c1941a39dc393b
CRs-Fixed: 1025828
| -rw-r--r-- | CORE/SME/src/csr/csrApiRoam.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/CORE/SME/src/csr/csrApiRoam.c b/CORE/SME/src/csr/csrApiRoam.c index c5b1126cad93..055599fcaee0 100644 --- a/CORE/SME/src/csr/csrApiRoam.c +++ b/CORE/SME/src/csr/csrApiRoam.c @@ -466,18 +466,22 @@ eHalStatus csrUpdateChannelList(tpAniSirGlobal pMac) tANI_U8 num_channel = 0; tANI_U32 bufLen; vos_msg_t msg; - tANI_U8 i, j, social_channel[MAX_SOCIAL_CHANNELS] = {1,6,11}; + tANI_U8 i; tANI_U8 channel_state; uint16_t unsafe_chan[NUM_20MHZ_RF_CHANNELS]; uint16_t unsafe_chan_cnt = 0; uint16_t cnt = 0; uint8_t channel; bool is_unsafe_chan; +#ifdef WLAN_ENABLE_SOCIAL_CHANNELS_5G_ONLY + int j, social_channel[MAX_SOCIAL_CHANNELS] = {1,6,11}; +#endif vos_get_wlan_unsafe_channel(unsafe_chan, &unsafe_chan_cnt, sizeof(unsafe_chan)); +#ifdef WLAN_ENABLE_SOCIAL_CHANNELS_5G_ONLY if (CSR_IS_5G_BAND_ONLY(pMac)) { for (i = 0; i < MAX_SOCIAL_CHANNELS; i++) @@ -490,6 +494,7 @@ eHalStatus csrUpdateChannelList(tpAniSirGlobal pMac) numChan++; } } +#endif bufLen = sizeof(tSirUpdateChanList) + (sizeof(tSirUpdateChanParam) * (numChan)); @@ -569,6 +574,7 @@ eHalStatus csrUpdateChannelList(tpAniSirGlobal pMac) } +#ifdef WLAN_ENABLE_SOCIAL_CHANNELS_5G_ONLY if (CSR_IS_5G_BAND_ONLY(pMac)) { for (j = 0; j < MAX_SOCIAL_CHANNELS; j++) @@ -585,6 +591,7 @@ eHalStatus csrUpdateChannelList(tpAniSirGlobal pMac) } } } +#endif if ((pMac->roam.configParam.uCfgDot11Mode == eCSR_CFG_DOT11_MODE_AUTO) || (pMac->roam.configParam.uCfgDot11Mode == |