diff options
| author | Deepthi Gowri <deepthi@codeaurora.org> | 2016-10-17 16:37:52 +0530 |
|---|---|---|
| committer | qcabuildsw <qcabuildsw@localhost> | 2016-10-24 10:58:53 -0700 |
| commit | e2e3dfd9977fed08865a006df5fccb647452a006 (patch) | |
| tree | def1edeb75aef7af2ea4c622cd9fdbf3b7134da9 /core/mac/src | |
| parent | c1b06710ed7a98cfe8b2ecf573c9adcf8093c9f2 (diff) | |
qcacld-3.0: Use system time instead of jiffies for BSS received time
qcacld-2.0 to qcacld-3.0 propagation
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
Diffstat (limited to 'core/mac/src')
| -rw-r--r-- | core/mac/src/pe/lim/lim_api.c | 4 | ||||
| -rw-r--r-- | core/mac/src/pe/lim/lim_p2p.c | 8 | ||||
| -rw-r--r-- | core/mac/src/pe/lim/lim_scan_result_utils.c | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/core/mac/src/pe/lim/lim_api.c b/core/mac/src/pe/lim/lim_api.c index 52615df03b3c..8597146e1eba 100644 --- a/core/mac/src/pe/lim/lim_api.c +++ b/core/mac/src/pe/lim/lim_api.c @@ -1871,8 +1871,8 @@ lim_roam_fill_bss_descr(tpAniSirGlobal pMac, qdf_mem_copy((uint8_t *) &bss_desc_ptr->bssId, (uint8_t *) mac_hdr->bssId, sizeof(tSirMacAddr)); - bss_desc_ptr->nReceivedTime = - (uint32_t)qdf_mc_timer_get_system_ticks(); + bss_desc_ptr->received_time = + (uint64_t)qdf_mc_timer_get_system_time(); if (parsed_frm_ptr->mdiePresent) { bss_desc_ptr->mdiePresent = parsed_frm_ptr->mdiePresent; qdf_mem_copy((uint8_t *)bss_desc_ptr->mdie, diff --git a/core/mac/src/pe/lim/lim_p2p.c b/core/mac/src/pe/lim/lim_p2p.c index 096f78a16581..e6af69c753df 100644 --- a/core/mac/src/pe/lim/lim_p2p.c +++ b/core/mac/src/pe/lim/lim_p2p.c @@ -175,11 +175,11 @@ void lim_process_insert_single_shot_noa_timeout(tpAniSirGlobal pMac) *------------------------------------------------------------------*/ void lim_convert_active_channel_to_passive_channel(tpAniSirGlobal pMac) { - uint32_t currentTime; - uint32_t lastTime = 0; - uint32_t timeDiff; + uint64_t currentTime; + uint64_t lastTime = 0; + uint64_t timeDiff; uint8_t i; - currentTime = qdf_mc_timer_get_system_time(); + currentTime = (uint64_t)qdf_mc_timer_get_system_time(); for (i = 1; i < SIR_MAX_24G_5G_CHANNEL_RANGE; i++) { if ((pMac->lim.dfschannelList.timeStamp[i]) != 0) { lastTime = pMac->lim.dfschannelList.timeStamp[i]; diff --git a/core/mac/src/pe/lim/lim_scan_result_utils.c b/core/mac/src/pe/lim/lim_scan_result_utils.c index 58b43db3e6b6..9bed13a0f534 100644 --- a/core/mac/src/pe/lim/lim_scan_result_utils.c +++ b/core/mac/src/pe/lim/lim_scan_result_utils.c @@ -177,14 +177,14 @@ lim_collect_bss_description(tpAniSirGlobal pMac, MAC_ADDR_ARRAY(pHdr->bssId), pBssDescr->rssi, pBssDescr->rssi_raw); - pBssDescr->nReceivedTime = (uint32_t) qdf_mc_timer_get_system_ticks(); + pBssDescr->received_time = (uint64_t)qdf_mc_timer_get_system_time(); pBssDescr->tsf_delta = WMA_GET_RX_TSF_DELTA(pRxPacketInfo); pBssDescr->seq_ctrl = pHdr->seqControl; lim_log(pMac, LOG1, - FL("BSSID: "MAC_ADDRESS_STR " tsf_delta = %u ReceivedTime = %u ssid = %s"), + FL("BSSID: "MAC_ADDRESS_STR " tsf_delta = %u ReceivedTime = %llu ssid = %s"), MAC_ADDR_ARRAY(pHdr->bssId), pBssDescr->tsf_delta, - pBssDescr->nReceivedTime, + pBssDescr->received_time, ((pBPR->ssidPresent) ? (char *)pBPR->ssId.ssId : "")); lim_log(pMac, LOG1, FL("Seq Ctrl: Frag Num: %d, Seq Num: LO:%02x HI:%02x"), |