wlan: flush scan results which are not in new Country code.
Right now scan result are getting flashed out on basis of scan
request on that particular channel. It's wise to flush scan
entries on channels which are not part of new channel list
of acquired country
CRs-Fixed: 607644
Change-Id: I825fc49a390ac0395b770dfa879351ca04ddae90
diff --git a/CORE/SME/inc/csrInternal.h b/CORE/SME/inc/csrInternal.h
index 16174bf..80780da 100644
--- a/CORE/SME/inc/csrInternal.h
+++ b/CORE/SME/inc/csrInternal.h
@@ -1139,6 +1139,7 @@
void csrScanResumeIMPS( tpAniSirGlobal pMac );
eHalStatus csrInitGetChannels(tpAniSirGlobal pMac);
+eHalStatus csrScanFilter11dResult(tpAniSirGlobal pMac);
eHalStatus csrSetModifyProfileFields(tpAniSirGlobal pMac, tANI_U32 sessionId,
tCsrRoamModifyProfileFields *pModifyProfileFields);
diff --git a/CORE/SME/src/csr/csrApiScan.c b/CORE/SME/src/csr/csrApiScan.c
index 3459763..c7ea4f7 100644
--- a/CORE/SME/src/csr/csrApiScan.c
+++ b/CORE/SME/src/csr/csrApiScan.c
@@ -4258,6 +4258,11 @@
/* reset info based on new cc, and we are done */
csrResetCountryInformation(pMac, eANI_BOOLEAN_TRUE, eANI_BOOLEAN_TRUE);
+ /* Regulatory Domain Changed, Purge Only scan result
+ * which does not have channel number belong to 11d
+ * channel list
+ */
+ csrScanFilter11dResult(pMac);
}
#endif
fRet = eANI_BOOLEAN_TRUE;
diff --git a/CORE/SME/src/sme_common/sme_Api.c b/CORE/SME/src/sme_common/sme_Api.c
index caff98f..b67667d 100644
--- a/CORE/SME/src/sme_common/sme_Api.c
+++ b/CORE/SME/src/sme_common/sme_Api.c
@@ -7289,6 +7289,12 @@
/* reset info based on new cc, and we are done */
csrResetCountryInformation(pMac, eANI_BOOLEAN_TRUE, eANI_BOOLEAN_TRUE);
+ /* Country code Changed, Purge Only scan result
+ * which does not have channel number belong to 11d
+ * channel list
+ */
+ csrScanFilter11dResult(pMac);
+
#endif
if( pMsg->changeCCCallback )
{
@@ -7401,7 +7407,11 @@
pMac->scan.f11dInfoApplied = eANI_BOOLEAN_TRUE;
pMac->scan.f11dInfoReset = eANI_BOOLEAN_FALSE;
}
-
+ /* Country code Changed, Purge Only scan result
+ * which does not have channel number belong to 11d
+ * channel list
+ */
+ csrScanFilter11dResult(pMac);
// Do active scans after the country is set by User hints or Country IE
pMac->scan.curScanType = eSIR_ACTIVE_SCAN;
@@ -7461,6 +7471,11 @@
csrInitChannelList(pMac);
}
}
+ /* Country code Changed, Purge Only scan result
+ * which does not have channel number belong to 11d
+ * channel list
+ */
+ csrScanFilter11dResult(pMac);
smsLog(pMac, LOG1, FL(" returned"));
return eHAL_STATUS_SUCCESS;
}