qcacld-3.0: Add QDF MC timer API's
Replace CDF MC timer API's with QDF MC timer API's
Change-Id: If18069e9cb8dbd24c5cdc8bd8def6932f55c0168
CRs-Fixed: 981188
diff --git a/core/mac/src/pe/include/lim_session.h b/core/mac/src/pe/include/lim_session.h
index ba0332f..c7013e1 100644
--- a/core/mac/src/pe/include/lim_session.h
+++ b/core/mac/src/pe/include/lim_session.h
@@ -453,12 +453,12 @@
#endif
bool isNonRoamReassoc;
#ifdef WLAN_FEATURE_11W
- cdf_mc_timer_t pmfComebackTimer;
+ qdf_mc_timer_t pmfComebackTimer;
tComebackTimerInfo pmfComebackTimerInfo;
#endif /* WLAN_FEATURE_11W */
uint8_t is_key_installed;
/* timer for reseting protection fileds at regular intervals */
- cdf_mc_timer_t protection_fields_reset_timer;
+ qdf_mc_timer_t protection_fields_reset_timer;
void *mac_ctx;
/*
* variable to store state of various protection struct like
diff --git a/core/mac/src/pe/lim/lim_api.c b/core/mac/src/pe/lim/lim_api.c
index f9e8f84..e62c655 100644
--- a/core/mac/src/pe/lim/lim_api.c
+++ b/core/mac/src/pe/lim/lim_api.c
@@ -1180,11 +1180,11 @@
return true;
if (sta_ds->last_assoc_received_time &&
- ((cdf_mc_timer_get_system_ticks() -
+ ((qdf_mc_timer_get_system_ticks() -
sta_ds->last_assoc_received_time) < 1000))
return true;
- sta_ds->last_assoc_received_time = cdf_mc_timer_get_system_ticks();
+ sta_ds->last_assoc_received_time = qdf_mc_timer_get_system_ticks();
return false;
}
#endif
@@ -1237,12 +1237,12 @@
* AP. So process all deauth/diassoc frames with
* a time difference of 1 sec.
*/
- if ((cdf_mc_timer_get_system_ticks() -
+ if ((qdf_mc_timer_get_system_ticks() -
sta_ds->last_unprot_deauth_disassoc) < 1000)
return true;
sta_ds->last_unprot_deauth_disassoc =
- cdf_mc_timer_get_system_ticks();
+ qdf_mc_timer_get_system_ticks();
} else {
/* PMF enabed, Management frames are protected */
if (sta_ds->proct_deauh_disassoc_cnt)
@@ -1962,7 +1962,7 @@
(uint8_t *) mac_hdr->bssId,
sizeof(tSirMacAddr));
bss_desc_ptr->nReceivedTime =
- (uint32_t)cdf_mc_timer_get_system_ticks();
+ (uint32_t)qdf_mc_timer_get_system_ticks();
if (parsed_frm_ptr->mdiePresent) {
bss_desc_ptr->mdiePresent = parsed_frm_ptr->mdiePresent;
cdf_mem_copy((uint8_t *)bss_desc_ptr->mdie,
diff --git a/core/mac/src/pe/lim/lim_assoc_utils.c b/core/mac/src/pe/lim/lim_assoc_utils.c
index 074ba2f..3326796 100644
--- a/core/mac/src/pe/lim/lim_assoc_utils.c
+++ b/core/mac/src/pe/lim/lim_assoc_utils.c
@@ -911,7 +911,7 @@
auth_node->fTimerStarted = 0;
auth_node->mlmState = eLIM_MLM_AUTHENTICATED_STATE;
auth_node->authType = (tAniAuthType) auth_type;
- auth_node->timestamp = cdf_mc_timer_get_system_ticks();
+ auth_node->timestamp = qdf_mc_timer_get_system_ticks();
lim_add_pre_auth_node(mac_ctx, auth_node);
}
}
diff --git a/core/mac/src/pe/lim/lim_p2p.c b/core/mac/src/pe/lim/lim_p2p.c
index 443f932..1c8b8c7 100644
--- a/core/mac/src/pe/lim/lim_p2p.c
+++ b/core/mac/src/pe/lim/lim_p2p.c
@@ -181,7 +181,7 @@
uint32_t lastTime = 0;
uint32_t timeDiff;
uint8_t i;
- currentTime = cdf_mc_timer_get_system_time();
+ currentTime = 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_process_assoc_rsp_frame.c b/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c
index 19b3889..876233f 100644
--- a/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c
+++ b/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c
@@ -893,7 +893,7 @@
" recvd.Starting timer to wait timeout=%d."),
timeout_value);
if (QDF_STATUS_SUCCESS !=
- cdf_mc_timer_start(
+ qdf_mc_timer_start(
&session_entry->pmfComebackTimer,
timeout_value)) {
lim_log(mac_ctx, LOGE,
diff --git a/core/mac/src/pe/lim/lim_process_auth_frame.c b/core/mac/src/pe/lim/lim_process_auth_frame.c
index fadc5ed..803d0e6 100644
--- a/core/mac/src/pe/lim/lim_process_auth_frame.c
+++ b/core/mac/src/pe/lim/lim_process_auth_frame.c
@@ -164,7 +164,7 @@
auth_node->fTimerStarted = 0;
auth_node->seq_num = ((mac_hdr->seqControl.seqNumHi << 4) |
(mac_hdr->seqControl.seqNumLo));
- auth_node->timestamp = cdf_mc_timer_get_system_ticks();
+ auth_node->timestamp = qdf_mc_timer_get_system_ticks();
lim_add_pre_auth_node(mac_ctx, auth_node);
lim_log(mac_ctx, LOG1, FL("Alloc new data: %p id %d peer "),
@@ -253,7 +253,7 @@
auth_node->fTimerStarted = 0;
auth_node->seq_num = ((mac_hdr->seqControl.seqNumHi << 4) |
(mac_hdr->seqControl.seqNumLo));
- auth_node->timestamp = cdf_mc_timer_get_system_ticks();
+ auth_node->timestamp = qdf_mc_timer_get_system_ticks();
lim_add_pre_auth_node(mac_ctx, auth_node);
/*
* Send Authenticaton frame with Success
@@ -641,7 +641,7 @@
auth_node->seq_num =
((mac_hdr->seqControl.seqNumHi << 4) |
(mac_hdr->seqControl.seqNumLo));
- auth_node->timestamp = cdf_mc_timer_get_system_ticks();
+ auth_node->timestamp = qdf_mc_timer_get_system_ticks();
lim_add_pre_auth_node(mac_ctx, auth_node);
lim_restore_from_auth_state(mac_ctx, eSIR_SME_SUCCESS,
rx_auth_frm_body->authStatusCode, pe_session);
@@ -1003,7 +1003,7 @@
auth_node->authType = mac_ctx->lim.gpLimMlmAuthReq->authType;
auth_node->seq_num = ((mac_hdr->seqControl.seqNumHi << 4) |
(mac_hdr->seqControl.seqNumLo));
- auth_node->timestamp = cdf_mc_timer_get_system_ticks();
+ auth_node->timestamp = qdf_mc_timer_get_system_ticks();
lim_add_pre_auth_node(mac_ctx, auth_node);
lim_restore_from_auth_state(mac_ctx, eSIR_SME_SUCCESS,
rx_auth_frm_body->authStatusCode, pe_session);
diff --git a/core/mac/src/pe/lim/lim_process_message_queue.c b/core/mac/src/pe/lim/lim_process_message_queue.c
index 7b16ae7..b3e17ba 100644
--- a/core/mac/src/pe/lim/lim_process_message_queue.c
+++ b/core/mac/src/pe/lim/lim_process_message_queue.c
@@ -360,7 +360,7 @@
result->num_results = num_results;
for (i = 0; i < result->num_results; i++) {
- result->ap[i].ts = cdf_mc_timer_get_system_time();
+ result->ap[i].ts = qdf_mc_timer_get_system_time();
result->ap[i].beaconPeriod = frame->beaconInterval;
result->ap[i].capability =
lim_get_u16((uint8_t *) &frame->capabilityInfo);
@@ -411,7 +411,7 @@
result->requestId = 0;
result->moreData = 0;
- result->ap.ts = cdf_mc_timer_get_system_time();
+ result->ap.ts = qdf_mc_timer_get_system_time();
result->ap.beaconPeriod = frame->beaconInterval;
result->ap.capability =
lim_get_u16((uint8_t *) &frame->capabilityInfo);
diff --git a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c
index 8b11676..8b1e0d2 100644
--- a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c
+++ b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c
@@ -316,7 +316,7 @@
pass_to_active);
}
dfs_ch_list->timeStamp[chan_num] =
- cdf_mc_timer_get_system_time();
+ qdf_mc_timer_get_system_time();
} else {
lim_log(mac_ctx, LOG1, FL("Channel %d is Active"), chan_num);
return;
@@ -2423,8 +2423,8 @@
TX_TIMER *probe_req_timer =
&mac_ctx->lim.limTimers.gLimPeriodicProbeReqTimer;
- if (cdf_mc_timer_get_current_state(&probe_req_timer->cdf_timer)
- != CDF_TIMER_STATE_STOPPED) {
+ if (qdf_mc_timer_get_current_state(&probe_req_timer->cdf_timer)
+ != QDF_TIMER_STATE_STOPPED) {
lim_log(mac_ctx, LOG1, FL("Invalid state of timer"));
return;
}
diff --git a/core/mac/src/pe/lim/lim_process_probe_req_frame.c b/core/mac/src/pe/lim/lim_process_probe_req_frame.c
index b270237..0a75bd4 100644
--- a/core/mac/src/pe/lim/lim_process_probe_req_frame.c
+++ b/core/mac/src/pe/lim/lim_process_probe_req_frame.c
@@ -79,7 +79,7 @@
tSirWPSPBCSession *pbc;
uint32_t cur_time;
- cur_time = (uint32_t) (cdf_mc_timer_get_system_ticks() /
+ cur_time = (uint32_t) (qdf_mc_timer_get_system_ticks() /
QDF_TICKS_PER_SECOND);
qdf_zero_macaddr(&addr);
cdf_mem_set((uint8_t *) uuid_e, SIR_WPS_UUID_LEN, 0);
@@ -204,7 +204,7 @@
uint32_t curTime;
curTime =
- (uint32_t) (cdf_mc_timer_get_system_ticks() /
+ (uint32_t) (qdf_mc_timer_get_system_ticks() /
QDF_TICKS_PER_SECOND);
PELOG4(lim_log
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 623a900..283649f 100644
--- a/core/mac/src/pe/lim/lim_scan_result_utils.c
+++ b/core/mac/src/pe/lim/lim_scan_result_utils.c
@@ -127,7 +127,7 @@
(uint8_t *) pHdr->bssId, sizeof(tSirMacAddr));
/* Copy Timestamp, Beacon Interval and Capability Info */
- pBssDescr->scanSysTimeMsec = cdf_mc_timer_get_system_time();
+ pBssDescr->scanSysTimeMsec = qdf_mc_timer_get_system_time();
pBssDescr->timeStamp[0] = pBPR->timeStamp[0];
pBssDescr->timeStamp[1] = pBPR->timeStamp[1];
@@ -189,7 +189,7 @@
MAC_ADDR_ARRAY(pHdr->bssId), pBssDescr->rssi,
pBssDescr->rssi_raw);
- pBssDescr->nReceivedTime = (uint32_t) cdf_mc_timer_get_system_ticks();
+ pBssDescr->nReceivedTime = (uint32_t) qdf_mc_timer_get_system_ticks();
pBssDescr->tsf_delta = WMA_GET_RX_TSF_DELTA(pRxPacketInfo);
lim_log(pMac, LOG1, FL("BSSID: "MAC_ADDRESS_STR " tsf_delta = %u"),
diff --git a/core/mac/src/pe/lim/lim_security_utils.c b/core/mac/src/pe/lim/lim_security_utils.c
index aa1f8ff..1da7814 100644
--- a/core/mac/src/pe/lim/lim_security_utils.c
+++ b/core/mac/src/pe/lim/lim_security_utils.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013-2015 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -273,9 +273,9 @@
while (temp_node != NULL) {
if (temp_node->mlmState == eLIM_MLM_AUTHENTICATED_STATE &&
temp_node->authType == eSIR_OPEN_SYSTEM &&
- (cdf_mc_timer_get_system_ticks() >
+ (qdf_mc_timer_get_system_ticks() >
(LIM_OPENAUTH_TIMEOUT + temp_node->timestamp) ||
- cdf_mc_timer_get_system_ticks() < temp_node->timestamp)) {
+ qdf_mc_timer_get_system_ticks() < temp_node->timestamp)) {
/* Found node to be deleted */
auth_node_freed = true;
found_node = temp_node;
diff --git a/core/mac/src/pe/lim/lim_session.c b/core/mac/src/pe/lim/lim_session.c
index 8105652..02e5b20 100644
--- a/core/mac/src/pe/lim/lim_session.c
+++ b/core/mac/src/pe/lim/lim_session.c
@@ -213,7 +213,7 @@
}
pe_session_entry->old_protection_state = current_protection_state;
- if (cdf_mc_timer_start(&pe_session_entry->
+ if (qdf_mc_timer_start(&pe_session_entry->
protection_fields_reset_timer,
SCH_PROTECTION_RESET_TIME)
!= QDF_STATUS_SUCCESS) {
@@ -366,12 +366,12 @@
if (eSIR_INFRA_AP_MODE == bssType) {
session_ptr->old_protection_state = 0;
session_ptr->mac_ctx = (void *)pMac;
- status = cdf_mc_timer_init(
+ status = qdf_mc_timer_init(
&session_ptr->protection_fields_reset_timer,
QDF_TIMER_TYPE_SW, pe_reset_protection_callback,
(void *)&pMac->lim.gpSession[i]);
if (status == QDF_STATUS_SUCCESS) {
- status = cdf_mc_timer_start(
+ status = qdf_mc_timer_start(
&session_ptr->protection_fields_reset_timer,
SCH_PROTECTION_RESET_TIME);
}
@@ -382,7 +382,7 @@
session_ptr->pmfComebackTimerInfo.pMac = pMac;
session_ptr->pmfComebackTimerInfo.sessionID = *sessionId;
- status = cdf_mc_timer_init(&session_ptr->pmfComebackTimer,
+ status = qdf_mc_timer_init(&session_ptr->pmfComebackTimer,
QDF_TIMER_TYPE_SW, lim_pmf_comeback_timer_callback,
(void *)&session_ptr->pmfComebackTimerInfo);
if (!QDF_IS_STATUS_SUCCESS(status))
@@ -550,8 +550,8 @@
}
if (LIM_IS_AP_ROLE(session)) {
- cdf_mc_timer_stop(&session->protection_fields_reset_timer);
- cdf_mc_timer_destroy(&session->protection_fields_reset_timer);
+ qdf_mc_timer_stop(&session->protection_fields_reset_timer);
+ qdf_mc_timer_destroy(&session->protection_fields_reset_timer);
}
#if defined (WLAN_FEATURE_VOWIFI_11R)
@@ -676,10 +676,10 @@
session->addIeParams.probeRespBCNDataLen = 0;
}
#ifdef WLAN_FEATURE_11W
- if (CDF_TIMER_STATE_RUNNING ==
- cdf_mc_timer_get_current_state(&session->pmfComebackTimer))
- cdf_mc_timer_stop(&session->pmfComebackTimer);
- cdf_mc_timer_destroy(&session->pmfComebackTimer);
+ if (QDF_TIMER_STATE_RUNNING ==
+ qdf_mc_timer_get_current_state(&session->pmfComebackTimer))
+ qdf_mc_timer_stop(&session->pmfComebackTimer);
+ qdf_mc_timer_destroy(&session->pmfComebackTimer);
#endif
session->valid = false;