wlan: Flush/filter temp scan results along with the main results
Flush the temp scan results along with main scan results in
csrScanFlushResult(). This is required to flush the results
completely , as the results are getting updated from temp list to
the main list only after completion of scan.
Filter the temp scan results based on valid channels list along
with the main scan results in csrScanFilterResults().
CRs-Fixed: 592516
Change-Id: Id0c66b9edbd513800418490d296749466a250ef1
diff --git a/CORE/SME/inc/csrInternal.h b/CORE/SME/inc/csrInternal.h
index f6e18de..449b307 100644
--- a/CORE/SME/inc/csrInternal.h
+++ b/CORE/SME/inc/csrInternal.h
@@ -1140,7 +1140,7 @@
void csrScanResumeIMPS( tpAniSirGlobal pMac );
eHalStatus csrInitGetChannels(tpAniSirGlobal pMac);
-eHalStatus csrScanFilter11dResult(tpAniSirGlobal pMac);
+eHalStatus csrScanFilterResults(tpAniSirGlobal pMac);
eHalStatus csrSetModifyProfileFields(tpAniSirGlobal pMac, tANI_U32 sessionId,
tCsrRoamModifyProfileFields *pModifyProfileFields);
diff --git a/CORE/SME/inc/sme_Api.h b/CORE/SME/inc/sme_Api.h
index e3c671b..5ae45d5 100644
--- a/CORE/SME/inc/sme_Api.h
+++ b/CORE/SME/inc/sme_Api.h
@@ -460,6 +460,17 @@
\return eHalStatus
---------------------------------------------------------------------------*/
eHalStatus sme_ScanFlushResult(tHalHandle hHal, tANI_U8 sessionId);
+
+/*
+ * ---------------------------------------------------------------------------
+ * \fn sme_FilterScanResults
+ * \brief a wrapper function to request CSR to filter the scan results based
+ * on valid chennel list.
+ * \return eHalStatus
+ *---------------------------------------------------------------------------
+ */
+eHalStatus sme_FilterScanResults(tHalHandle hHal, tANI_U8 sessionId);
+
eHalStatus sme_ScanFlushP2PResult(tHalHandle hHal, tANI_U8 sessionId);
/* ---------------------------------------------------------------------------
diff --git a/CORE/SME/src/csr/csrApiScan.c b/CORE/SME/src/csr/csrApiScan.c
index fab42bf..810fb63 100644
--- a/CORE/SME/src/csr/csrApiScan.c
+++ b/CORE/SME/src/csr/csrApiScan.c
@@ -2464,12 +2464,15 @@
eHalStatus csrScanFlushResult(tpAniSirGlobal pMac)
{
tANI_U8 isFlushDenied = csrScanFlushDenied(pMac);
+ eHalStatus status = eHAL_STATUS_SUCCESS;
if (isFlushDenied) {
smsLog(pMac, LOGW, "%s: scan flush denied in roam state %d",
__func__, isFlushDenied);
return eHAL_STATUS_FAILURE;
}
- return ( csrLLScanPurgeResult(pMac, &pMac->scan.scanResultList) );
+ csrLLScanPurgeResult( pMac, &pMac->scan.tempScanResults );
+ csrLLScanPurgeResult( pMac, &pMac->scan.scanResultList );
+ return( status );
}
eHalStatus csrScanFlushSelectiveResult(tpAniSirGlobal pMac, v_BOOL_t flushP2P)
@@ -2506,7 +2509,7 @@
* csrCheck11dChannel
*
*FUNCTION:
- * This function is called from csrScanFilter11dResult function and
+ * This function is called from csrScanFilterResults function and
* compare channel number with given channel list.
*
*LOGIC:
@@ -2541,7 +2544,7 @@
}
/**
- * csrScanFilter11dResult
+ * csrScanFilterResults
*
*FUNCTION:
* This function is called from csrApplyCountryInformation function and
@@ -2562,7 +2565,7 @@
* @return Status
*/
-eHalStatus csrScanFilter11dResult(tpAniSirGlobal pMac)
+eHalStatus csrScanFilterResults(tpAniSirGlobal pMac)
{
eHalStatus status = eHAL_STATUS_SUCCESS;
tListElem *pEntry,*pTempEntry;
@@ -2580,10 +2583,10 @@
while( pEntry )
{
pBssDesc = GET_BASE_ADDR( pEntry, tCsrScanResult, Link );
- pTempEntry = csrLLNext( &pMac->scan.scanResultList, pEntry,
+ pTempEntry = csrLLNext( &pMac->scan.scanResultList, pEntry,
LL_ACCESS_LOCK );
if(csrCheck11dChannel(pBssDesc->Result.BssDescriptor.channelId,
- pMac->roam.validChannelList, len))
+ pMac->roam.validChannelList, len))
{
/* Remove Scan result which does not have 11d channel */
if( csrLLRemoveEntry( &pMac->scan.scanResultList, pEntry,
@@ -2592,6 +2595,35 @@
csrFreeScanResultEntry( pMac, pBssDesc );
}
}
+ else
+ {
+ smsLog( pMac, LOG1, FL("%d is a Valid channel"),
+ pBssDesc->Result.BssDescriptor.channelId);
+ }
+ pEntry = pTempEntry;
+ }
+
+ pEntry = csrLLPeekHead( &pMac->scan.tempScanResults, LL_ACCESS_LOCK );
+ while( pEntry )
+ {
+ pBssDesc = GET_BASE_ADDR( pEntry, tCsrScanResult, Link );
+ pTempEntry = csrLLNext( &pMac->scan.tempScanResults, pEntry,
+ LL_ACCESS_LOCK );
+ if(csrCheck11dChannel(pBssDesc->Result.BssDescriptor.channelId,
+ pMac->roam.validChannelList, len))
+ {
+ /* Remove Scan result which does not have 11d channel */
+ if( csrLLRemoveEntry( &pMac->scan.tempScanResults, pEntry,
+ LL_ACCESS_LOCK ))
+ {
+ csrFreeScanResultEntry( pMac, pBssDesc );
+ }
+ }
+ else
+ {
+ smsLog( pMac, LOG1, FL("%d is a Valid channel"),
+ pBssDesc->Result.BssDescriptor.channelId);
+ }
pEntry = pTempEntry;
}
return status;
@@ -4262,7 +4294,7 @@
* which does not have channel number belong to 11d
* channel list
*/
- csrScanFilter11dResult(pMac);
+ csrScanFilterResults(pMac);
}
#endif
fRet = eANI_BOOLEAN_TRUE;
diff --git a/CORE/SME/src/csr/csrInsideApi.h b/CORE/SME/src/csr/csrInsideApi.h
index bcc8f9c..c2a828a 100644
--- a/CORE/SME/src/csr/csrInsideApi.h
+++ b/CORE/SME/src/csr/csrInsideApi.h
@@ -484,6 +484,14 @@
\return eHalStatus
-------------------------------------------------------------------------------*/
eHalStatus csrScanFlushResult(tpAniSirGlobal);
+/* ---------------------------------------------------------------------------
+ * \fn csrScanFilterResults
+ * \brief Filter scan results based on valid channel list.
+ * \return eHalStatus
+ *-------------------------------------------------------------------------------
+ */
+eHalStatus csrScanFilterResults(tpAniSirGlobal pMac);
+
eHalStatus csrScanFlushSelectiveResult(tpAniSirGlobal, v_BOOL_t flushP2P);
/* ---------------------------------------------------------------------------
\fn csrScanBGScanGetParam
diff --git a/CORE/SME/src/sme_common/sme_Api.c b/CORE/SME/src/sme_common/sme_Api.c
index 879271a..83f5d68 100644
--- a/CORE/SME/src/sme_common/sme_Api.c
+++ b/CORE/SME/src/sme_common/sme_Api.c
@@ -2580,6 +2580,29 @@
return (status);
}
+/* ---------------------------------------------------------------------------
+ \fn sme_FilterScanResults
+ \brief a wrapper function to request CSR to clear scan results.
+ This is a synchronous call
+ \return eHalStatus
+ ---------------------------------------------------------------------------*/
+eHalStatus sme_FilterScanResults(tHalHandle hHal, tANI_U8 sessionId)
+{
+ eHalStatus status = eHAL_STATUS_SUCCESS;
+ tpAniSirGlobal pMac = PMAC_STRUCT( hHal );
+
+ MTRACE(macTraceNew(pMac, VOS_MODULE_ID_SME,
+ TRACE_CODE_SME_RX_HDD_MSG_SCAN_FLUSH_RESULTS, sessionId,0 ));
+ status = sme_AcquireGlobalLock( &pMac->sme );
+ if ( HAL_STATUS_SUCCESS( status ) )
+ {
+ csrScanFilterResults(pMac);
+ sme_ReleaseGlobalLock( &pMac->sme );
+ }
+
+ return (status);
+}
+
eHalStatus sme_ScanFlushP2PResult(tHalHandle hHal, tANI_U8 sessionId)
{
eHalStatus status = eHAL_STATUS_FAILURE;
@@ -7336,7 +7359,7 @@
* which does not have channel number belong to 11d
* channel list
*/
- csrScanFilter11dResult(pMac);
+ csrScanFilterResults(pMac);
#endif
if( pMsg->changeCCCallback )
@@ -7454,7 +7477,7 @@
* which does not have channel number belong to 11d
* channel list
*/
- csrScanFilter11dResult(pMac);
+ csrScanFilterResults(pMac);
// Do active scans after the country is set by User hints or Country IE
pMac->scan.curScanType = eSIR_ACTIVE_SCAN;
@@ -7518,7 +7541,7 @@
* which does not have channel number belong to 11d
* channel list
*/
- csrScanFilter11dResult(pMac);
+ csrScanFilterResults(pMac);
smsLog(pMac, LOG1, FL(" returned"));
return eHAL_STATUS_SUCCESS;
}