wlan: Purge the scan results by age before posting to upper layer
Currently the age out of scan results is ineffective as the aging
timer is started only once the scan results are obtained from
the FW, which would expire in 1 sec, so it could be possible that
the cached scan entries may still persist and may not be aged out.
To address this issue, purge the scan results by age, before the
scan results are updated to upper layer.
CRs-Fixed: 997430
Change-Id: Ib70b04f4a720123d21ba820dd3c1e86076083dc9
diff --git a/CORE/SME/inc/csrInternal.h b/CORE/SME/inc/csrInternal.h
index 5f0a66c..a7b2cce 100644
--- a/CORE/SME/inc/csrInternal.h
+++ b/CORE/SME/inc/csrInternal.h
@@ -727,7 +727,6 @@
vos_timer_t hTimerStaApConcTimer;
#endif
vos_timer_t hTimerIdleScan;
- vos_timer_t hTimerResultCfgAging;
tPalTimerHandle hTimerBgScan;
//changes on every scan, it is used as a flag for whether 11d info is found on every scan
tANI_U8 channelOf11dInfo;
diff --git a/CORE/SME/src/csr/csrApiScan.c b/CORE/SME/src/csr/csrApiScan.c
index d02a59c..06a34c6 100644
--- a/CORE/SME/src/csr/csrApiScan.c
+++ b/CORE/SME/src/csr/csrApiScan.c
@@ -119,7 +119,7 @@
extern tSirRetStatus wlan_cfgGetStr(tpAniSirGlobal, tANI_U16, tANI_U8*, tANI_U32*);
void csrScanGetResultTimerHandler(void *);
-static void csrScanResultCfgAgingTimerHandler(void *pv);
+static void csrPurgeScanResultByAge(void *pv);
void csrScanIdleScanTimerHandler(void *);
static void csrSetDefaultScanTiming( tpAniSirGlobal pMac, tSirScanType scanType, tCsrScanRequest *pScanRequest);
#ifdef WLAN_AP_STA_CONCURRENCY
@@ -229,13 +229,6 @@
smsLog(pMac, LOGE, FL("cannot allocate memory for idleScan timer"));
break;
}
- status = vos_timer_init(&pMac->scan.hTimerResultCfgAging, VOS_TIMER_TYPE_SW,
- csrScanResultCfgAgingTimerHandler, pMac);
- if (!HAL_STATUS_SUCCESS(status))
- {
- smsLog(pMac, LOGE, FL("cannot allocate memory for CFG ResultAging timer"));
- break;
- }
}while(0);
return (status);
@@ -259,7 +252,6 @@
csrLLClose(&pMac->scan.channelPowerInfoList24);
csrLLClose(&pMac->scan.channelPowerInfoList5G);
csrScanDisable(pMac);
- vos_timer_destroy(&pMac->scan.hTimerResultCfgAging);
vos_timer_destroy(&pMac->scan.hTimerGetResult);
#ifdef WLAN_AP_STA_CONCURRENCY
vos_timer_destroy(&pMac->scan.hTimerStaApConcTimer);
@@ -3256,8 +3248,6 @@
}
pEntry = csrLLPeekHead( &pMac->scan.scanResultList, LL_ACCESS_LOCK );
- if (pEntry && 0 != pMac->scan.scanResultCfgAgingTime)
- csrScanStartResultCfgAgingTimer(pMac);
//we don't need to update CC while connected to an AP which is advertising CC already
if (csrIs11dSupported(pMac))
{
@@ -3330,9 +3320,6 @@
#endif
csrScanAddResult(pMac, pCsrBssDescription, pIes);
pEntry = csrLLPeekHead( &pMac->scan.scanResultList, LL_ACCESS_LOCK );
- if (pEntry && 0 != pMac->scan.scanResultCfgAgingTime)
- csrScanStartResultCfgAgingTimer(pMac);
-
}
return( pCsrBssDescription );
@@ -5259,6 +5246,11 @@
pCommand = GET_BASE_ADDR( pEntry, tSmeCmd, Link );
if ( eSmeCommandScan == pCommand->command )
{
+ pScanChnInfo = (tSmeGetScanChnRsp *)pMsgBuf;
+ /* Purge the scan results based on Aging and Ref count */
+ csrPurgeScanResultByAge(pMac);
+ if (pScanChnInfo)
+ csrScanAgeResults(pMac, pScanChnInfo);
scanStatus = (eSIR_SME_SUCCESS == pScanRsp->statusCode) ? eCSR_SCAN_SUCCESS : eCSR_SCAN_FAILURE;
reason = pCommand->u.scanCmd.reason;
switch(pCommand->u.scanCmd.reason)
@@ -5269,13 +5261,11 @@
case eCsrScanBGScanEnable:
break;
case eCsrScanGetScanChnInfo:
- pScanChnInfo = (tSmeGetScanChnRsp *)pMsgBuf;
/*
* status code not available in tSmeGetScanChnRsp, so
* by default considereing it to be success
*/
scanStatus = eSIR_SME_SUCCESS;
- csrScanAgeResults(pMac, pScanChnInfo);
break;
case eCsrScanForCapsChange:
csrScanProcessScanResults( pMac, pCommand, pScanRsp, &fRemoveCommand );
@@ -6489,11 +6479,6 @@
{
csrScanStopIdleScanTimer(pMac);
csrScanStopGetResultTimer(pMac);
- if(0 != pMac->scan.scanResultCfgAgingTime )
- {
- csrScanStopResultCfgAgingTimer(pMac);
- }
-
}
@@ -6668,22 +6653,6 @@
}
#endif
-eHalStatus csrScanStartResultCfgAgingTimer(tpAniSirGlobal pMac)
-{
- eHalStatus status = eHAL_STATUS_FAILURE;
-
- if(pMac->scan.fScanEnable)
- {
- status = vos_timer_start(&pMac->scan.hTimerResultCfgAging, CSR_SCAN_RESULT_CFG_AGING_INTERVAL/PAL_TIMER_TO_MS_UNIT);
- }
- return (status);
-}
-
-eHalStatus csrScanStopResultCfgAgingTimer(tpAniSirGlobal pMac)
-{
- return (vos_timer_stop(&pMac->scan.hTimerResultCfgAging));
-}
-
//This function returns the maximum time a BSS is allowed in the scan result.
//The time varies base on connection and power saving factors.
//Not connected, No PS
@@ -6747,7 +6716,7 @@
return (nRet);
}
-static void csrScanResultCfgAgingTimerHandler(void *pv)
+static void csrPurgeScanResultByAge(void *pv)
{
tpAniSirGlobal pMac = PMAC_STRUCT( pv );
tListElem *pEntry, *tmpEntry;
@@ -6769,8 +6738,6 @@
pEntry = tmpEntry;
}
csrLLUnlock(&pMac->scan.scanResultList);
- if (pEntry)
- vos_timer_start(&pMac->scan.hTimerResultCfgAging, CSR_SCAN_RESULT_CFG_AGING_INTERVAL/PAL_TIMER_TO_MS_UNIT);
}
eHalStatus csrScanStartIdleScanTimer(tpAniSirGlobal pMac, tANI_U32 interval)
@@ -8606,9 +8573,6 @@
//Add to scan cache
csrScanAddResult(pMac, pScanResult, pIesLocal);
pEntry = csrLLPeekHead( &pMac->scan.scanResultList, LL_ACCESS_LOCK );
- if (pEntry && 0 != pMac->scan.scanResultCfgAgingTime)
- csrScanStartResultCfgAgingTimer(pMac);
-
if( (pScanResult->Result.pvIes == NULL) && pIesLocal )
{
vos_mem_free(pIesLocal);
diff --git a/CORE/SME/src/csr/csrInsideApi.h b/CORE/SME/src/csr/csrInsideApi.h
index 885fc33..07aeefc 100644
--- a/CORE/SME/src/csr/csrInsideApi.h
+++ b/CORE/SME/src/csr/csrInsideApi.h
@@ -85,7 +85,6 @@
#define CSR_MIC_ERROR_TIMEOUT (60 * PAL_TIMER_TO_SEC_UNIT) //60 seconds
#define CSR_TKIP_COUNTER_MEASURE_TIMEOUT (60 * PAL_TIMER_TO_SEC_UNIT) //60 seconds
#define CSR_SCAN_RESULT_AGING_INTERVAL (5 * PAL_TIMER_TO_SEC_UNIT) //5 seconds
-#define CSR_SCAN_RESULT_CFG_AGING_INTERVAL (PAL_TIMER_TO_SEC_UNIT) // 1 second
//the following defines are NOT used by palTimer
#define CSR_SCAN_AGING_TIME_NOT_CONNECT_NO_PS 50 //50 seconds
#define CSR_SCAN_AGING_TIME_NOT_CONNECT_W_PS 300 //300 seconds
@@ -256,8 +255,6 @@
eHalStatus csrScanForCapabilityChange(tpAniSirGlobal pMac, tSirSmeApNewCaps *pNewCaps);
eHalStatus csrScanStartGetResultTimer(tpAniSirGlobal pMac);
eHalStatus csrScanStopGetResultTimer(tpAniSirGlobal pMac);
-eHalStatus csrScanStartResultCfgAgingTimer(tpAniSirGlobal pMac);
-eHalStatus csrScanStopResultCfgAgingTimer(tpAniSirGlobal pMac);
eHalStatus csrScanBGScanEnable(tpAniSirGlobal pMac);
eHalStatus csrScanStartIdleScanTimer(tpAniSirGlobal pMac, tANI_U32 interval);
eHalStatus csrScanStopIdleScanTimer(tpAniSirGlobal pMac);
diff --git a/CORE/SYS/legacy/src/pal/inc/palApi.h b/CORE/SYS/legacy/src/pal/inc/palApi.h
index 71e1278..4007612 100644
--- a/CORE/SYS/legacy/src/pal/inc/palApi.h
+++ b/CORE/SYS/legacy/src/pal/inc/palApi.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2013 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2013, 2016 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -451,7 +451,7 @@
\return tick count.
----------------------------------------------------------------------------------*/
-tANI_U32 palGetTickCount(tHddHandle hHdd);
+tANI_TIMESTAMP palGetTickCount(tHddHandle hHdd);
/** ---------------------------------------------------------------------------
diff --git a/CORE/SYS/legacy/src/pal/src/palApiComm.c b/CORE/SYS/legacy/src/pal/src/palApiComm.c
index 8b0ce71..c6ce6f4 100644
--- a/CORE/SYS/legacy/src/pal/src/palApiComm.c
+++ b/CORE/SYS/legacy/src/pal/src/palApiComm.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2013 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2013, 2016 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -165,7 +165,7 @@
-tANI_U32 palGetTickCount(tHddHandle hHdd)
+tANI_TIMESTAMP palGetTickCount(tHddHandle hHdd)
{
return( vos_timer_get_system_ticks() );
}
diff --git a/riva/inc/halLegacyPalTypes.h b/riva/inc/halLegacyPalTypes.h
index 3dd3f33..75808b6 100644
--- a/riva/inc/halLegacyPalTypes.h
+++ b/riva/inc/halLegacyPalTypes.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2013 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2013, 2016 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -55,6 +55,6 @@
typedef byte tANI_BYTE;
typedef boolean tANI_BOOLEAN;
-typedef uint32 tANI_TIMESTAMP;
+typedef unsigned long tANI_TIMESTAMP;
#endif /*__LEGACYPALTYPES_H__*/