wlan: flush scan results obtained from the 11d scans
11d scans are done when the driver is loaded to find
any BSS which is advertizing 11d IEs, 11d scans are
passive and we scan all the channels the device
supports irrespective of the regulatory domain
restrictions. Sometimes as part of 11d scans we
find APs on frequencies which are not supported
by the regulatory domain and if we notify such APs
to the supplicant, user may attempt to connect to
such APs. To avoid this situation we will flush all
the scan results cached by the SME after 11d scan.
Change-Id: Iae78d3bec3ddbce4ab0d23a31df0652b2f5013c7
CRs-Fixed: 604464
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index a83ed4f..e874890 100644
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -7743,6 +7743,33 @@
/**---------------------------------------------------------------------------
+ \brief hdd_11d_scan_done - callback to be executed when 11d scan is
+ completed to flush out the scan results
+
+ 11d scan is done during driver load and is a passive scan on all
+ channels supported by the device, 11d scans may find some APs on
+ frequencies which are forbidden to be used in the regulatory domain
+ the device is operating in. If these APs are notified to the supplicant
+ it may try to connect to these APs, thus flush out all the scan results
+ which are present in SME after 11d scan is done.
+
+ \return - eHalStatus
+
+ --------------------------------------------------------------------------*/
+static eHalStatus hdd_11d_scan_done(tHalHandle halHandle, void *pContext,
+ tANI_U32 scanId, eCsrScanStatus status)
+{
+ ENTER();
+
+ sme_ScanFlushResult(halHandle, 0);
+
+ EXIT();
+
+ return eHAL_STATUS_SUCCESS;
+}
+
+/**---------------------------------------------------------------------------
+
\brief hdd_wlan_startup() - HDD init function
This is the driver startup code executed once a WLAN device has been detected
@@ -8341,6 +8368,8 @@
sme_UpdateChannelConfig(pHddCtx->hHal);
#endif
+ sme_Register11dScanDoneCallback(pHddCtx->hHal, hdd_11d_scan_done);
+
/* Register with platform driver as client for Suspend/Resume */
status = hddRegisterPmOps(pHddCtx);
if ( !VOS_IS_STATUS_SUCCESS( status ) )
diff --git a/CORE/SME/inc/csrInternal.h b/CORE/SME/inc/csrInternal.h
index c2c8cbb..16174bf 100644
--- a/CORE/SME/inc/csrInternal.h
+++ b/CORE/SME/inc/csrInternal.h
@@ -780,6 +780,8 @@
#endif
tCsrChannel occupiedChannels; //This includes all channels on which candidate APs are found
tANI_S8 inScanResultBestAPRssi;
+
+ csrScanCompleteCallback callback11dScanDone;
}tCsrScanStruct;
#ifdef FEATURE_WLAN_TDLS_INTERNAL
diff --git a/CORE/SME/inc/sme_Api.h b/CORE/SME/inc/sme_Api.h
index 529a527..44d94a9 100644
--- a/CORE/SME/inc/sme_Api.h
+++ b/CORE/SME/inc/sme_Api.h
@@ -1171,6 +1171,18 @@
tANI_BOOLEAN (*checkRoutine) (void *checkContext), void *checkContext);
/* ---------------------------------------------------------------------------
+ \fn sme_Register11dScanDoneCallback
+ \brief Register a routine of type csrScanCompleteCallback which is
+ called whenever an 11d scan is done
+ \param hHal - The handle returned by macOpen.
+ \param callback - 11d scan complete routine to be registered
+ \return eHalStatus
+ ---------------------------------------------------------------------------*/
+extern eHalStatus sme_Register11dScanDoneCallback (
+ tHalHandle hHal,
+ csrScanCompleteCallback);
+
+/* ---------------------------------------------------------------------------
\fn sme_DeregisterPowerSaveCheck
\brief Deregister a power save check routine
\param hHal - The handle returned by macOpen.
diff --git a/CORE/SME/src/csr/csrApiScan.c b/CORE/SME/src/csr/csrApiScan.c
index 0ff0c84..4efab15 100644
--- a/CORE/SME/src/csr/csrApiScan.c
+++ b/CORE/SME/src/csr/csrApiScan.c
@@ -885,7 +885,7 @@
pChnInfo->numOfChannels = (tANI_U8)numChn;
p11dScanCmd->command = eSmeCommandScan;
- p11dScanCmd->u.scanCmd.callback = NULL;
+ p11dScanCmd->u.scanCmd.callback = pMac->scan.callback11dScanDone;
p11dScanCmd->u.scanCmd.pContext = NULL;
p11dScanCmd->u.scanCmd.scanID = pMac->scan.nextScanID++;
scanReq.BSSType = eCSR_BSS_TYPE_ANY;
diff --git a/CORE/SME/src/sme_common/sme_Api.c b/CORE/SME/src/sme_common/sme_Api.c
index def98c0..6097663 100644
--- a/CORE/SME/src/sme_common/sme_Api.c
+++ b/CORE/SME/src/sme_common/sme_Api.c
@@ -4071,6 +4071,26 @@
}
/* ---------------------------------------------------------------------------
+ \fn sme_Register11dScanDoneCallback
+ \brief Register a routine of type csrScanCompleteCallback which is
+ called whenever an 11d scan is done
+ \param hHal - The handle returned by macOpen.
+ \param callback - 11d scan complete routine to be registered
+ \return eHalStatus
+ ---------------------------------------------------------------------------*/
+eHalStatus sme_Register11dScanDoneCallback (
+ tHalHandle hHal,
+ csrScanCompleteCallback callback)
+{
+ eHalStatus status = eHAL_STATUS_SUCCESS;
+ tpAniSirGlobal pMac = PMAC_STRUCT( hHal );
+
+ pMac->scan.callback11dScanDone = callback;
+
+ return (status);
+}
+
+/* ---------------------------------------------------------------------------
\fn sme_DeregisterPowerSaveCheck
\brief Deregister a power save check routine
\param hHal - The handle returned by macOpen.