wlan: Do active scans after country is set
After the country is set by a user or country IE
hint make sure that all the scans issued by the driver
are marked to do active scanning on all the frequencies
allowed by the regulatory rules of the new country.
Change-Id: I8ebfe3528d550fde87e206ee686b16dc42b747d0
CRs-Fixed: 573383
diff --git a/CORE/SME/src/csr/csrApiScan.c b/CORE/SME/src/csr/csrApiScan.c
index 6507696..9de0846 100644
--- a/CORE/SME/src/csr/csrApiScan.c
+++ b/CORE/SME/src/csr/csrApiScan.c
@@ -3514,12 +3514,6 @@
}
#endif //#ifdef FEATURE_WLAN_DIAG_SUPPORT_CSR
- // switch to passive scans only when 11d is enabled
- if( csrIs11dSupported( pMac ) )
- {
- pMac->scan.curScanType = eSIR_PASSIVE_SCAN;
- }
-
csrPruneChannelListForMode(pMac, &pMac->scan.baseChannels);
csrPruneChannelListForMode(pMac, &pMac->scan.base20MHzChannels);
diff --git a/CORE/SME/src/sme_common/sme_Api.c b/CORE/SME/src/sme_common/sme_Api.c
index 88da650..51abbdf 100644
--- a/CORE/SME/src/sme_common/sme_Api.c
+++ b/CORE/SME/src/sme_common/sme_Api.c
@@ -7063,11 +7063,13 @@
csrResetCountryInformation(pMac, eANI_BOOLEAN_TRUE, eANI_BOOLEAN_TRUE);
if (VOS_TRUE == is11dCountry)
{
- pMac->scan.curScanType = eSIR_ACTIVE_SCAN;
pMac->scan.f11dInfoApplied = eANI_BOOLEAN_TRUE;
pMac->scan.f11dInfoReset = eANI_BOOLEAN_FALSE;
}
+ // Do active scans after the country is set by User hints or Country IE
+ pMac->scan.curScanType = eSIR_ACTIVE_SCAN;
+
smsLog(pMac, LOG1, FL(" returned"));
return eHAL_STATUS_SUCCESS;
}