wlan: 11d Channel list is empty.
In csrResetCountryInformation, after applying channel list to
csrApplyChannelPowerCountryInfo, 11d channel list is empty.
So in csrApplyCountryInformation use base20MHzChannels
instead of 11d channels.
CRs-Fixed: 575005
Change-Id: I0ac3160f42d5a17478157a9cca431f6c99fe3b52
diff --git a/CORE/SME/src/csr/csrApiScan.c b/CORE/SME/src/csr/csrApiScan.c
index 81a0aab..bfbfa4e 100644
--- a/CORE/SME/src/csr/csrApiScan.c
+++ b/CORE/SME/src/csr/csrApiScan.c
@@ -3784,7 +3784,8 @@
}
pMac->scan.domainIdCurrent = domainId;
#ifndef CONFIG_ENABLE_LINUX_REG
- csrApplyChannelPowerCountryInfo( pMac, &pMac->scan.channels11d, pMac->scan.countryCode11d, eANI_BOOLEAN_TRUE );
+ csrApplyChannelPowerCountryInfo( pMac, &pMac->scan.base20MHzChannels,
+ pMac->scan.countryCodeCurrent, eANI_BOOLEAN_TRUE );
#endif
// switch to active scans using this new channel list
pMac->scan.curScanType = eSIR_ACTIVE_SCAN;
@@ -4244,13 +4245,6 @@
pMac->scan.fCurrent11dInfoMatch = eANI_BOOLEAN_FALSE;
// move the scan results from interim list to the main scan list
csrMoveTempScanResultsToMainList( pMac, reason );
-
- // Now check if we gathered any domain/country specific information
- // If so, we should update channel list and apply Tx power settings
- if( csrIs11dSupported(pMac) )
- {
- csrApplyCountryInformation( pMac, FALSE );
- }
}