diff options
| author | Hanumantha Reddy Pothula <c_hpothu@qti.qualcomm.com> | 2016-03-31 16:04:19 +0530 |
|---|---|---|
| committer | Anjaneedevi Kapparapu <akappa@codeaurora.org> | 2016-04-13 10:08:33 +0530 |
| commit | 2fca83bc73281aeb04a93d93623b8e9b5a61c02e (patch) | |
| tree | 1f8579b02728e33a81b9b55257149723ed2151cb | |
| parent | e7aea77ef6ec5cbfad1be4158c08918800d74654 (diff) | |
Revert "qcacld-2.0: Channel avoidance is not working inside Screen room"
With Change-Id Ic252f8a84164bf5155a81cca88616c662090159e code changes,
when all channels in the operating band(gAPChannelSelectOperatingBand)
are set to unsafe, driver may not pick operating channel from the same
operating band, instead it picks a valid channel from the other band.
Hence revert the change, so that when all channels are unsafe
in operating band, driver sets a default channel, from the same band,
as operating channel.
Change-Id: Ic27d12bc88fd60e0da1ab70792e810bc4c38d2ae
CRs-Fixed: 996697
| -rw-r--r-- | CORE/SAP/src/sapFsm.c | 31 | ||||
| -rw-r--r-- | CORE/SAP/src/sapInternal.h | 1 |
2 files changed, 3 insertions, 29 deletions
diff --git a/CORE/SAP/src/sapFsm.c b/CORE/SAP/src/sapFsm.c index 44581cd13ef3..edaea4ba5abe 100644 --- a/CORE/SAP/src/sapFsm.c +++ b/CORE/SAP/src/sapFsm.c @@ -2140,10 +2140,6 @@ sapGotoChannelSel tHalHandle hHal; tANI_U8 con_ch; -#if defined(FEATURE_WLAN_CH_AVOID) || defined(SOFTAP_CHANNEL_RANGE) - v_U8_t i; -#endif - hHal = (tHalHandle)vos_get_context( VOS_MODULE_ID_SME, sapContext->pvosGCtx); if (NULL == hHal) { @@ -2324,31 +2320,10 @@ sapGotoChannelSel #ifdef SOFTAP_CHANNEL_RANGE if(sapContext->channelList != NULL) { - for ( i = 0 ; i < sapContext->numofChannel ; i++) - if (NV_CHANNEL_ENABLE == - vos_nv_getChannelEnabledState(sapContext->channelList[i])) - { - sapContext->channel = sapContext->channelList[i]; - } - - vos_mem_free(sapContext->channelList); - sapContext->channelList = NULL; + sapContext->channel = sapContext->channelList[0]; + vos_mem_free(sapContext->channelList); + sapContext->channelList = NULL; } -#ifdef FEATURE_WLAN_CH_AVOID - else - { - for( i = 0; i < NUM_20MHZ_RF_CHANNELS; i++ ) - { - if((NV_CHANNEL_ENABLE == - vos_nv_getChannelEnabledState(safeChannels[i].channelNumber)) - && (VOS_TRUE == safeChannels[i].isSafe)) - { - sapContext->channel = safeChannels[i].channelNumber; - break; - } - } - } -#endif #endif if (VOS_TRUE == sapDoAcsPreStartBss) { diff --git a/CORE/SAP/src/sapInternal.h b/CORE/SAP/src/sapInternal.h index 30d914e859e6..892307856592 100644 --- a/CORE/SAP/src/sapInternal.h +++ b/CORE/SAP/src/sapInternal.h @@ -251,7 +251,6 @@ typedef struct sSapContext { v_U32_t nStaAddIeLength; v_U8_t pStaAddIE[MAX_ASSOC_IND_IE_LEN]; v_U8_t *channelList; - v_U8_t numofChannel; tSapChannelListInfo SapChnlList; uint16_t vht_channel_width; uint16_t ch_width_orig; |