wlan: Use system time instead of jiffies for BSS received time
During late suspend jiffies will not be incremented. Because of this
scan results are not age out as the delta of current time and the BSS
received time is not correct.
To address this, use the system time instead of jiffies for the
BSS received time and also make sure to use system time in all
other functions.
CRs-Fixed: 1018460
Change-Id: Ia14b84f1039dc4ffec6ad63550fed21e932f8012
diff --git a/CORE/SME/inc/csrNeighborRoam.h b/CORE/SME/inc/csrNeighborRoam.h
index 6a0d812..5df4eee 100644
--- a/CORE/SME/inc/csrNeighborRoam.h
+++ b/CORE/SME/inc/csrNeighborRoam.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2014, 2016 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -172,7 +172,7 @@
tCsrNeighborRoamChannelInfo roamChannelInfo;
tANI_U8 currentNeighborLookupThreshold;
tANI_BOOLEAN scanRspPending;
- tANI_TIMESTAMP scanRequestTimeStamp;
+ v_TIME_t scanRequestTimeStamp;
tDblLinkList roamableAPList; // List of current FT candidates
tANI_U32 csrSessionId;
tCsrRoamProfile csrNeighborRoamProfile;
diff --git a/CORE/SME/src/csr/csrApiScan.c b/CORE/SME/src/csr/csrApiScan.c
index 4401073..0c85d0f 100644
--- a/CORE/SME/src/csr/csrApiScan.c
+++ b/CORE/SME/src/csr/csrApiScan.c
@@ -3387,8 +3387,8 @@
{
tListElem *pEntry, *tmpEntry;
tCsrScanResult *pResult, *oldest_bss = NULL;
- tANI_TIMESTAMP oldest_entry = 0;
- tANI_TIMESTAMP curTime = (tANI_TIMESTAMP)palGetTickCount(pMac->hHdd);
+ v_TIME_t oldest_entry = 0;
+ v_TIME_t curTime = vos_timer_get_system_time();
csrLLLock(&pMac->scan.scanResultList);
pEntry = csrLLPeekHead( &pMac->scan.scanResultList, LL_ACCESS_NOLOCK );
@@ -5554,7 +5554,8 @@
{
//Reset the counter so that aging out of connected BSS won't hapeen too soon
pResult->AgingCount = (tANI_S32)pMac->roam.configParam.agingCount;
- pResult->Result.BssDescriptor.nReceivedTime = (tANI_TIMESTAMP)palGetTickCount(pMac->hHdd);
+ pResult->Result.BssDescriptor.nReceivedTime =
+ vos_timer_get_system_time();
return (fRet);
}
@@ -6845,8 +6846,9 @@
tpAniSirGlobal pMac = PMAC_STRUCT( pv );
tListElem *pEntry, *tmpEntry;
tCsrScanResult *pResult;
- tANI_TIMESTAMP ageOutTime = pMac->scan.scanResultCfgAgingTime * PAL_TICKS_PER_SECOND;
- tANI_TIMESTAMP curTime = (tANI_TIMESTAMP)palGetTickCount(pMac->hHdd);
+ v_TIME_t ageOutTime =
+ (v_TIME_t)(pMac->scan.scanResultCfgAgingTime * SYSTEM_TIME_SEC_TO_MSEC);
+ v_TIME_t curTime = vos_timer_get_system_time();
csrLLLock(&pMac->scan.scanResultList);
pEntry = csrLLPeekHead( &pMac->scan.scanResultList, LL_ACCESS_NOLOCK );
@@ -8647,7 +8649,7 @@
pBssDescr->timeStamp[1] = pParsedFrame->timeStamp[1];
pBssDescr->capabilityInfo = *((tANI_U16 *)&pParsedFrame->capabilityInfo);
vos_mem_copy((tANI_U8 *) &pBssDescr->bssId, (tANI_U8 *) macHeader->bssId, sizeof(tSirMacAddr));
- pBssDescr->nReceivedTime = (tANI_TIMESTAMP)palGetTickCount(pMac->hHdd);
+ pBssDescr->nReceivedTime = vos_timer_get_system_time();
smsLog( pMac, LOG1, FL("Bssid= "MAC_ADDRESS_STR
" chan= %d, rssi = %d "),
diff --git a/CORE/SME/src/csr/csrInsideApi.h b/CORE/SME/src/csr/csrInsideApi.h
index 8d76845..8ee20e7 100644
--- a/CORE/SME/src/csr/csrInsideApi.h
+++ b/CORE/SME/src/csr/csrInsideApi.h
@@ -70,6 +70,7 @@
#define CSR_MAX_BSS_SUPPORT 512
#define SYSTEM_TIME_MSEC_TO_USEC 1000
+#define SYSTEM_TIME_SEC_TO_MSEC 1000
//This number minus 1 means the number of times a channel is scanned before a BSS is remvoed from
//cache scan result
diff --git a/CORE/SME/src/csr/csrNeighborRoam.c b/CORE/SME/src/csr/csrNeighborRoam.c
index d4da257..a8282ab 100644
--- a/CORE/SME/src/csr/csrNeighborRoam.c
+++ b/CORE/SME/src/csr/csrNeighborRoam.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -3089,7 +3089,7 @@
return;
}
- pNeighborRoamInfo->scanRequestTimeStamp = (tANI_TIMESTAMP)palGetTickCount(pMac->hHdd);
+ pNeighborRoamInfo->scanRequestTimeStamp = vos_timer_get_system_time();
/*
* We are about to start a fresh scan cycle for all valid channles for 5Ghz
* purge non-P2P results from the past for 5Ghz band
@@ -3461,7 +3461,8 @@
}
/* We are gonna scan now. Remember the time stamp to filter out results only after this timestamp */
- pNeighborRoamInfo->scanRequestTimeStamp = (tANI_TIMESTAMP)palGetTickCount(pMac->hHdd);
+ pNeighborRoamInfo->scanRequestTimeStamp =
+ vos_timer_get_system_time();
/* Now ready for neighbor scan based on the channel list created */
/* Start Neighbor scan timer now. Multiplication by PAL_TIMER_TO_MS_UNIT is to convert ms to us which is
@@ -3863,7 +3864,8 @@
pNeighborRoamInfo->lookupDOWNRssi,
pNeighborRoamInfo->cfgParams.neighborReassocThreshold*(-1));
- pNeighborRoamInfo->scanRequestTimeStamp = (tANI_TIMESTAMP)palGetTickCount(pMac->hHdd);
+ pNeighborRoamInfo->scanRequestTimeStamp =
+ vos_timer_get_system_time();
vos_timer_stop(&pNeighborRoamInfo->neighborScanTimer);
@@ -4048,7 +4050,7 @@
}
/* We are gonna scan now. Remember the time stamp to filter out results only after this timestamp */
- pNeighborRoamInfo->scanRequestTimeStamp = (tANI_TIMESTAMP)palGetTickCount(pMac->hHdd);
+ pNeighborRoamInfo->scanRequestTimeStamp = vos_timer_get_system_time();
vos_timer_stop(&pNeighborRoamInfo->neighborScanTimer);
/* Start Neighbor scan timer now. Multiplication by PAL_TIMER_TO_MS_UNIT is to convert ms to us which is
@@ -4913,7 +4915,7 @@
}
#endif
/* Initialize this with the current tick count */
- pNeighborRoamInfo->scanRequestTimeStamp = (tANI_TIMESTAMP)palGetTickCount(pMac->hHdd);
+ pNeighborRoamInfo->scanRequestTimeStamp = vos_timer_get_system_time();
CSR_NEIGHBOR_ROAM_STATE_TRANSITION(eCSR_NEIGHBOR_ROAM_STATE_INIT)
pNeighborRoamInfo->roamChannelInfo.IAPPNeighborListReceived = eANI_BOOLEAN_FALSE;