From 9f23038aaadd7b4ffa6579e5848cc59cedbea347 Mon Sep 17 00:00:00 2001 From: Pragaspathi Thilagaraj Date: Mon, 24 Jun 2019 11:54:05 +0530 Subject: [PATCH] qcacld-3.0: Rename limTimers Linux coding style doesn't allow camel case notations. So rename limTimers to be in compliance. Change-Id: I83807e8e5318cfad300365780f8cf9dc29037312 CRs-Fixed: 2482564 --- core/mac/inc/ani_global.h | 2 +- core/mac/src/pe/lim/lim_api.c | 12 +- core/mac/src/pe/lim/lim_assoc_utils.c | 8 +- core/mac/src/pe/lim/lim_ft_preauth.c | 12 +- .../mac/src/pe/lim/lim_process_action_frame.c | 8 +- .../src/pe/lim/lim_process_message_queue.c | 2 +- .../src/pe/lim/lim_process_mlm_host_roam.c | 6 +- .../src/pe/lim/lim_process_mlm_req_messages.c | 54 ++++----- .../src/pe/lim/lim_process_mlm_rsp_messages.c | 10 +- .../src/pe/lim/lim_process_sme_req_messages.c | 10 +- core/mac/src/pe/lim/lim_roam_timer_utils.c | 20 ++-- core/mac/src/pe/lim/lim_security_utils.c | 4 +- .../src/pe/lim/lim_send_frames_host_roam.c | 4 +- .../src/pe/lim/lim_send_management_frames.c | 12 +- core/mac/src/pe/lim/lim_session.c | 2 +- core/mac/src/pe/lim/lim_timer_utils.c | 107 +++++++++--------- core/mac/src/pe/lim/lim_utils.c | 18 +-- 17 files changed, 147 insertions(+), 144 deletions(-) diff --git a/core/mac/inc/ani_global.h b/core/mac/inc/ani_global.h index dce72c7628eb..df7ad8acda0e 100644 --- a/core/mac/inc/ani_global.h +++ b/core/mac/inc/ani_global.h @@ -306,7 +306,7 @@ typedef struct { typedef struct sAniSirLim { /* //////////////////////////////////// TIMER RELATED START /////////////////////////////////////////// */ - tLimTimers limTimers; + tLimTimers lim_timers; /* / Flag to track if LIM timers are created or not */ uint32_t gLimTimersCreated; diff --git a/core/mac/src/pe/lim/lim_api.c b/core/mac/src/pe/lim/lim_api.c index 9360872d78ad..e3be264c1a44 100644 --- a/core/mac/src/pe/lim/lim_api.c +++ b/core/mac/src/pe/lim/lim_api.c @@ -760,9 +760,9 @@ QDF_STATUS pe_open(struct mac_context *mac, struct cds_config_info *cds_cfg) return QDF_STATUS_E_NOMEM; } - mac->lim.limTimers.gpLimCnfWaitTimer = + mac->lim.lim_timers.gpLimCnfWaitTimer = qdf_mem_malloc(sizeof(TX_TIMER) * (mac->lim.maxStation + 1)); - if (!mac->lim.limTimers.gpLimCnfWaitTimer) { + if (!mac->lim.lim_timers.gpLimCnfWaitTimer) { status = QDF_STATUS_E_NOMEM; goto pe_open_timer_fail; } @@ -805,8 +805,8 @@ pe_open_lock_fail: qdf_mem_free(mac->lim.gpSession); mac->lim.gpSession = NULL; pe_open_psession_fail: - qdf_mem_free(mac->lim.limTimers.gpLimCnfWaitTimer); - mac->lim.limTimers.gpLimCnfWaitTimer = NULL; + qdf_mem_free(mac->lim.lim_timers.gpLimCnfWaitTimer); + mac->lim.lim_timers.gpLimCnfWaitTimer = NULL; pe_open_timer_fail: pe_free_dph_node_array_buffer(); @@ -840,8 +840,8 @@ QDF_STATUS pe_close(struct mac_context *mac) if (mac->lim.gpSession[i].valid == true) pe_delete_session(mac, &mac->lim.gpSession[i]); } - qdf_mem_free(mac->lim.limTimers.gpLimCnfWaitTimer); - mac->lim.limTimers.gpLimCnfWaitTimer = NULL; + qdf_mem_free(mac->lim.lim_timers.gpLimCnfWaitTimer); + mac->lim.lim_timers.gpLimCnfWaitTimer = NULL; qdf_mem_free(mac->lim.gpSession); mac->lim.gpSession = NULL; diff --git a/core/mac/src/pe/lim/lim_assoc_utils.c b/core/mac/src/pe/lim/lim_assoc_utils.c index ae415a251c60..00e6f3290d6c 100644 --- a/core/mac/src/pe/lim/lim_assoc_utils.c +++ b/core/mac/src/pe/lim/lim_assoc_utils.c @@ -602,7 +602,7 @@ lim_cleanup_rx_path(struct mac_context *mac, tpDphHashNode sta, MTRACE(mac_trace (mac, TRACE_CODE_TIMER_DEACTIVATE, pe_session->peSessionId, eLIM_ADDTS_RSP_TIMER)); - tx_timer_deactivate(&mac->lim.limTimers.gLimAddtsRspTimer); + tx_timer_deactivate(&mac->lim.lim_timers.gLimAddtsRspTimer); pe_debug("Reset gLimAddtsSent flag and send addts timeout to SME"); lim_process_sme_addts_rsp_timeout(mac, mac->lim.gLimAddtsRspTimerCount); @@ -2917,7 +2917,7 @@ void lim_handle_cnf_wait_timeout(struct mac_context *mac, uint16_t staId) struct pe_session *pe_session = NULL; pe_session = pe_find_session_by_session_id(mac, - mac->lim.limTimers.gpLimCnfWaitTimer[staId].sessionId); + mac->lim.lim_timers.gpLimCnfWaitTimer[staId].sessionId); if (!pe_session) { pe_err("Session Does not exist for given sessionID"); return; @@ -3326,9 +3326,9 @@ lim_del_bss(struct mac_context *mac, tpDphHashNode sta, uint16_t bss_idx, eLIM_MLM_WT_DEL_BSS_RSP_STATE)); if ((pe_session->peSessionId == - mac->lim.limTimers.gLimJoinFailureTimer.sessionId) + mac->lim.lim_timers.gLimJoinFailureTimer.sessionId) && (true == - tx_timer_running(&mac->lim.limTimers.gLimJoinFailureTimer))) { + tx_timer_running(&mac->lim.lim_timers.gLimJoinFailureTimer))) { lim_deactivate_and_change_timer(mac, eLIM_JOIN_FAIL_TIMER); } diff --git a/core/mac/src/pe/lim/lim_ft_preauth.c b/core/mac/src/pe/lim/lim_ft_preauth.c index 365ff72c1416..c140ba5992d8 100644 --- a/core/mac/src/pe/lim/lim_ft_preauth.c +++ b/core/mac/src/pe/lim/lim_ft_preauth.c @@ -273,14 +273,14 @@ void lim_perform_ft_pre_auth(struct mac_context *mac, QDF_STATUS status, authFrame.authTransactionSeqNumber = SIR_MAC_AUTH_FRAME_1; authFrame.authStatusCode = 0; - mac->lim.limTimers.g_lim_periodic_auth_retry_timer.sessionId = + mac->lim.lim_timers.g_lim_periodic_auth_retry_timer.sessionId = pe_session->peSessionId; /* Start timer here to come back to operating channel */ - mac->lim.limTimers.gLimFTPreAuthRspTimer.sessionId = + mac->lim.lim_timers.gLimFTPreAuthRspTimer.sessionId = pe_session->peSessionId; if (TX_SUCCESS != - tx_timer_activate(&mac->lim.limTimers.gLimFTPreAuthRspTimer)) { + tx_timer_activate(&mac->lim.lim_timers.gLimFTPreAuthRspTimer)) { pe_err("FT Auth Rsp Timer Start Failed"); goto preauth_fail; } @@ -519,7 +519,7 @@ void lim_process_ft_preauth_rsp_timeout(struct mac_context *mac_ctx) */ pe_err("FT Pre-Auth Time Out!!!!"); session = pe_find_session_by_session_id(mac_ctx, - mac_ctx->lim.limTimers.gLimFTPreAuthRspTimer.sessionId); + mac_ctx->lim.lim_timers.gLimFTPreAuthRspTimer.sessionId); if (!session) { pe_err("Session Does not exist for given sessionID"); return; @@ -537,7 +537,7 @@ void lim_process_ft_preauth_rsp_timeout(struct mac_context *mac_ctx) if (!session->ftPEContext.pFTPreAuthReq) { /* Auth Rsp might already be posted to SME and ftcleanup done */ pe_err("pFTPreAuthReq is NULL sessionId: %d", - mac_ctx->lim.limTimers.gLimFTPreAuthRspTimer.sessionId); + mac_ctx->lim.lim_timers.gLimFTPreAuthRspTimer.sessionId); return; } @@ -756,7 +756,7 @@ void lim_preauth_scan_event_handler(struct mac_context *mac_ctx, if (!session_entry) { pe_err("vdev_id :%d PeSessionId:%d does not exist", vdev_id, - mac_ctx->lim.limTimers.gLimFTPreAuthRspTimer.sessionId); + mac_ctx->lim.lim_timers.gLimFTPreAuthRspTimer.sessionId); return; } diff --git a/core/mac/src/pe/lim/lim_process_action_frame.c b/core/mac/src/pe/lim/lim_process_action_frame.c index eae0af8bd617..756444bcbce4 100644 --- a/core/mac/src/pe/lim/lim_process_action_frame.c +++ b/core/mac/src/pe/lim/lim_process_action_frame.c @@ -82,7 +82,7 @@ void lim_stop_tx_and_switch_channel(struct mac_context *mac, uint8_t sessionId) pe_debug("Channel switch Mode: %d", pe_session->gLimChannelSwitch.switchMode); - mac->lim.limTimers.gLimChannelSwitchTimer.sessionId = sessionId; + mac->lim.lim_timers.gLimChannelSwitchTimer.sessionId = sessionId; status = policy_mgr_check_and_set_hw_mode_for_channel_switch(mac->psoc, pe_session->smeSessionId, pe_session->gLimChannelSwitch.primaryChannel, @@ -119,7 +119,7 @@ void lim_stop_tx_and_switch_channel(struct mac_context *mac, uint8_t sessionId) (mac, TRACE_CODE_TIMER_ACTIVATE, sessionId, eLIM_CHANNEL_SWITCH_TIMER)); - if (tx_timer_activate(&mac->lim.limTimers.gLimChannelSwitchTimer) != + if (tx_timer_activate(&mac->lim.lim_timers.gLimChannelSwitchTimer) != TX_SUCCESS) { pe_err("tx_timer_activate failed"); } @@ -156,13 +156,13 @@ QDF_STATUS lim_start_channel_switch(struct mac_context *mac, MTRACE(mac_trace (mac, TRACE_CODE_TIMER_DEACTIVATE, pe_session->peSessionId, eLIM_CHANNEL_SWITCH_TIMER)); - if (tx_timer_deactivate(&mac->lim.limTimers.gLimChannelSwitchTimer) != + if (tx_timer_deactivate(&mac->lim.lim_timers.gLimChannelSwitchTimer) != QDF_STATUS_SUCCESS) { pe_err("tx_timer_deactivate failed!"); return QDF_STATUS_E_FAILURE; } - if (tx_timer_change(&mac->lim.limTimers.gLimChannelSwitchTimer, + if (tx_timer_change(&mac->lim.lim_timers.gLimChannelSwitchTimer, pe_session->gLimChannelSwitch.switchTimeoutValue, 0) != TX_SUCCESS) { pe_err("tx_timer_change failed"); 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 9c7e0d2579a6..9131d89b5289 100644 --- a/core/mac/src/pe/lim/lim_process_message_queue.c +++ b/core/mac/src/pe/lim/lim_process_message_queue.c @@ -86,7 +86,7 @@ static void lim_process_sae_msg_sta(struct mac_context *mac, /* SAE authentication is completed. * Restore from auth state */ - if (tx_timer_running(&mac->lim.limTimers.sae_auth_timer)) + if (tx_timer_running(&mac->lim.lim_timers.sae_auth_timer)) lim_deactivate_and_change_timer(mac, eLIM_AUTH_SAE_TIMER); /* success */ diff --git a/core/mac/src/pe/lim/lim_process_mlm_host_roam.c b/core/mac/src/pe/lim/lim_process_mlm_host_roam.c index aa7adb68b55a..9c17c1fb3a6b 100644 --- a/core/mac/src/pe/lim/lim_process_mlm_host_roam.c +++ b/core/mac/src/pe/lim/lim_process_mlm_host_roam.c @@ -123,7 +123,7 @@ void lim_process_mlm_reassoc_req(struct mac_context *mac_ctx, goto end; } /* assign the sessionId to the timer object */ - mac_ctx->lim.limTimers.gLimReassocFailureTimer.sessionId = + mac_ctx->lim.lim_timers.gLimReassocFailureTimer.sessionId = reassoc_req->sessionId; session->limPrevMlmState = session->limMlmState; session->limMlmState = eLIM_MLM_WT_REASSOC_RSP_STATE; @@ -407,14 +407,14 @@ void lim_process_sta_mlm_add_bss_rsp_ft(struct mac_context *mac, #ifdef WLAN_FEATURE_ROAM_OFFLOAD if (pe_session->bRoamSynchInProgress != true) { #endif - mac->lim.limTimers.gLimReassocFailureTimer.sessionId = + mac->lim.lim_timers.gLimReassocFailureTimer.sessionId = pe_session->peSessionId; /* / Start reassociation failure timer */ MTRACE(mac_trace (mac, TRACE_CODE_TIMER_ACTIVATE, pe_session->peSessionId, eLIM_REASSOC_FAIL_TIMER)); if (tx_timer_activate - (&mac->lim.limTimers.gLimReassocFailureTimer) + (&mac->lim.lim_timers.gLimReassocFailureTimer) != TX_SUCCESS) { /* / Could not start reassoc failure timer. */ /* Log error */ 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 515c3aa1af20..2de55627d850 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 @@ -66,7 +66,7 @@ static void lim_process_sae_auth_timeout(struct mac_context *mac_ctx) struct pe_session *session; session = pe_find_session_by_session_id(mac_ctx, - mac_ctx->lim.limTimers.sae_auth_timer.sessionId); + mac_ctx->lim.lim_timers.sae_auth_timer.sessionId); if (!session) { pe_err("Session does not exist for given session id"); return; @@ -389,7 +389,7 @@ lim_process_mlm_post_join_suspend_link(struct mac_context *mac_ctx, lim_deactivate_and_change_timer(mac_ctx, eLIM_JOIN_FAIL_TIMER); /* assign appropriate sessionId to the timer object */ - mac_ctx->lim.limTimers.gLimJoinFailureTimer.sessionId = + mac_ctx->lim.lim_timers.gLimJoinFailureTimer.sessionId = session->peSessionId; status = wma_add_bss_peer_sta(session->self_mac_addr, session->bssId, @@ -634,13 +634,13 @@ static QDF_STATUS lim_process_mlm_auth_req_sae(struct mac_context *mac_ctx, MTRACE(mac_trace(mac_ctx, TRACE_CODE_MLM_STATE, session->peSessionId, session->limMlmState)); - mac_ctx->lim.limTimers.sae_auth_timer.sessionId = + mac_ctx->lim.lim_timers.sae_auth_timer.sessionId = session->peSessionId; /* Activate SAE auth timer */ MTRACE(mac_trace(mac_ctx, TRACE_CODE_TIMER_ACTIVATE, session->peSessionId, eLIM_AUTH_SAE_TIMER)); - if (tx_timer_activate(&mac_ctx->lim.limTimers.sae_auth_timer) + if (tx_timer_activate(&mac_ctx->lim.lim_timers.sae_auth_timer) != TX_SUCCESS) { pe_err("could not start Auth SAE timer"); } @@ -786,17 +786,17 @@ static void lim_process_mlm_auth_req(struct mac_context *mac_ctx, uint32_t *msg) LIM_NO_WEP_IN_FC, session); /* assign appropriate session_id to the timer object */ - mac_ctx->lim.limTimers.gLimAuthFailureTimer.sessionId = session_id; + mac_ctx->lim.lim_timers.gLimAuthFailureTimer.sessionId = session_id; /* assign appropriate sessionId to the timer object */ - mac_ctx->lim.limTimers.g_lim_periodic_auth_retry_timer.sessionId = + mac_ctx->lim.lim_timers.g_lim_periodic_auth_retry_timer.sessionId = session_id; lim_deactivate_and_change_timer(mac_ctx, eLIM_AUTH_RETRY_TIMER); /* Activate Auth failure timer */ MTRACE(mac_trace(mac_ctx, TRACE_CODE_TIMER_ACTIVATE, session->peSessionId, eLIM_AUTH_FAIL_TIMER)); lim_deactivate_and_change_timer(mac_ctx, eLIM_AUTH_FAIL_TIMER); - if (tx_timer_activate(&mac_ctx->lim.limTimers.gLimAuthFailureTimer) + if (tx_timer_activate(&mac_ctx->lim.lim_timers.gLimAuthFailureTimer) != TX_SUCCESS) { pe_err("could not start Auth failure timer"); /* Cleanup as if auth timer expired */ @@ -806,7 +806,7 @@ static void lim_process_mlm_auth_req(struct mac_context *mac_ctx, uint32_t *msg) session->peSessionId, eLIM_AUTH_RETRY_TIMER)); /* Activate Auth Retry timer */ if (tx_timer_activate - (&mac_ctx->lim.limTimers.g_lim_periodic_auth_retry_timer) + (&mac_ctx->lim.lim_timers.g_lim_periodic_auth_retry_timer) != TX_SUCCESS) pe_err("could not activate Auth Retry timer"); } @@ -886,7 +886,7 @@ static void lim_process_mlm_assoc_req(struct mac_context *mac_ctx, uint32_t *msg } /* map the session entry pointer to the AssocFailureTimer */ - mac_ctx->lim.limTimers.gLimAssocFailureTimer.sessionId = + mac_ctx->lim.lim_timers.gLimAssocFailureTimer.sessionId = mlm_assoc_req->sessionId; session_entry->limPrevMlmState = session_entry->limMlmState; session_entry->limMlmState = eLIM_MLM_WT_ASSOC_RSP_STATE; @@ -902,7 +902,7 @@ static void lim_process_mlm_assoc_req(struct mac_context *mac_ctx, uint32_t *msg /* Start association failure timer */ MTRACE(mac_trace(mac_ctx, TRACE_CODE_TIMER_ACTIVATE, session_entry->peSessionId, eLIM_ASSOC_FAIL_TIMER)); - if (tx_timer_activate(&mac_ctx->lim.limTimers.gLimAssocFailureTimer) + if (tx_timer_activate(&mac_ctx->lim.lim_timers.gLimAssocFailureTimer) != TX_SUCCESS) { pe_warn("SessionId:%d couldn't start Assoc failure timer", session_entry->peSessionId); @@ -1183,7 +1183,7 @@ void lim_clean_up_disassoc_deauth_req(struct mac_context *mac_ctx, lim_process_disassoc_ack_timeout(mac_ctx); } else { if (tx_timer_running( - &mac_ctx->lim.limTimers.gLimDisassocAckTimer)) { + &mac_ctx->lim.lim_timers.gLimDisassocAckTimer)) { lim_deactivate_and_change_timer(mac_ctx, eLIM_DISASSOC_ACK_TIMER); } @@ -1202,7 +1202,7 @@ void lim_clean_up_disassoc_deauth_req(struct mac_context *mac_ctx, lim_process_deauth_ack_timeout(mac_ctx); } else { if (tx_timer_running( - &mac_ctx->lim.limTimers.gLimDeauthAckTimer)) { + &mac_ctx->lim.lim_timers.gLimDeauthAckTimer)) { lim_deactivate_and_change_timer(mac_ctx, eLIM_DEAUTH_ACK_TIMER); } @@ -1766,7 +1766,7 @@ void lim_process_join_failure_timeout(struct mac_context *mac_ctx) struct pe_session *session; session = pe_find_session_by_session_id(mac_ctx, - mac_ctx->lim.limTimers.gLimJoinFailureTimer.sessionId); + mac_ctx->lim.lim_timers.gLimJoinFailureTimer.sessionId); if (!session) { pe_err("Session Does not exist for given sessionID"); return; @@ -1831,16 +1831,16 @@ static void lim_process_periodic_join_probe_req_timer(struct mac_context *mac_ct tSirMacSSid ssid; session = pe_find_session_by_session_id(mac_ctx, - mac_ctx->lim.limTimers.gLimPeriodicJoinProbeReqTimer.sessionId); + mac_ctx->lim.lim_timers.gLimPeriodicJoinProbeReqTimer.sessionId); if (!session) { pe_err("session does not exist for given SessionId: %d", - mac_ctx->lim.limTimers.gLimPeriodicJoinProbeReqTimer. + mac_ctx->lim.lim_timers.gLimPeriodicJoinProbeReqTimer. sessionId); return; } if ((true == - tx_timer_running(&mac_ctx->lim.limTimers.gLimJoinFailureTimer)) + tx_timer_running(&mac_ctx->lim.lim_timers.gLimJoinFailureTimer)) && (session->limMlmState == eLIM_MLM_WT_JOIN_BEACON_STATE)) { qdf_mem_copy(ssid.ssId, session->ssId.ssId, session->ssId.length); @@ -1856,7 +1856,7 @@ static void lim_process_periodic_join_probe_req_timer(struct mac_context *mac_ct eLIM_PERIODIC_JOIN_PROBE_REQ_TIMER); /* Activate Join Periodic Probe Req timer */ if (tx_timer_activate( - &mac_ctx->lim.limTimers.gLimPeriodicJoinProbeReqTimer) != + &mac_ctx->lim.lim_timers.gLimPeriodicJoinProbeReqTimer) != TX_SUCCESS) { pe_warn("could not activate Periodic Join req failure timer"); return; @@ -1877,17 +1877,19 @@ static void lim_process_auth_retry_timer(struct mac_context *mac_ctx) session_entry = pe_find_session_by_session_id(mac_ctx, - mac_ctx->lim.limTimers.g_lim_periodic_auth_retry_timer.sessionId); + mac_ctx->lim.lim_timers.g_lim_periodic_auth_retry_timer.sessionId); if (!session_entry) { pe_err("session does not exist for given SessionId: %d", - mac_ctx->lim.limTimers. + mac_ctx->lim.lim_timers. g_lim_periodic_auth_retry_timer.sessionId); return; } - if (tx_timer_running(&mac_ctx->lim.limTimers.gLimAuthFailureTimer) && - (session_entry->limMlmState == eLIM_MLM_WT_AUTH_FRAME2_STATE) && - (LIM_AUTH_ACK_RCD_SUCCESS != mac_ctx->auth_ack_status)) { + if (tx_timer_running(&mac_ctx->lim.lim_timers.gLimAuthFailureTimer) && + (session_entry->limMlmState == + eLIM_MLM_WT_AUTH_FRAME2_STATE) && + (LIM_AUTH_ACK_RCD_SUCCESS != + mac_ctx->auth_ack_status)) { tSirMacAuthFrameBody auth_frame; /* @@ -1914,7 +1916,7 @@ static void lim_process_auth_retry_timer(struct mac_context *mac_ctx) /* Activate Auth Retry timer */ if (tx_timer_activate - (&mac_ctx->lim.limTimers.g_lim_periodic_auth_retry_timer) + (&mac_ctx->lim.lim_timers.g_lim_periodic_auth_retry_timer) != TX_SUCCESS) { pe_err("could not activate Auth Retry failure timer"); return; @@ -1933,7 +1935,7 @@ void lim_process_auth_failure_timeout(struct mac_context *mac_ctx) #endif session = pe_find_session_by_session_id(mac_ctx, - mac_ctx->lim.limTimers.gLimAuthFailureTimer.sessionId); + mac_ctx->lim.lim_timers.gLimAuthFailureTimer.sessionId); if (!session) { pe_err("Session Does not exist for given sessionID"); return; @@ -2063,10 +2065,10 @@ void lim_process_assoc_failure_timeout(struct mac_context *mac_ctx, if (msg_type == LIM_ASSOC) session_id = - mac_ctx->lim.limTimers.gLimAssocFailureTimer.sessionId; + mac_ctx->lim.lim_timers.gLimAssocFailureTimer.sessionId; else session_id = - mac_ctx->lim.limTimers.gLimReassocFailureTimer.sessionId; + mac_ctx->lim.lim_timers.gLimReassocFailureTimer.sessionId; session = pe_find_session_by_session_id(mac_ctx, session_id); if (!session) { diff --git a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c index a13eecde7bbf..e12e7900d005 100644 --- a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c +++ b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c @@ -2011,7 +2011,7 @@ static void lim_process_ap_mlm_add_bss_rsp(struct mac_context *mac, /* Start OLBC timer */ if (tx_timer_activate - (&mac->lim.limTimers.gLimUpdateOlbcCacheTimer) != + (&mac->lim.lim_timers.gLimUpdateOlbcCacheTimer) != TX_SUCCESS) { pe_err("tx_timer_activate failed"); } @@ -2685,7 +2685,7 @@ static void lim_process_switch_channel_re_assoc_req(struct mac_context *mac, MTRACE(mac_trace (mac, TRACE_CODE_TIMER_ACTIVATE, pe_session->peSessionId, eLIM_REASSOC_FAIL_TIMER)); - if (tx_timer_activate(&mac->lim.limTimers.gLimReassocFailureTimer) + if (tx_timer_activate(&mac->lim.lim_timers.gLimReassocFailureTimer) != TX_SUCCESS) { pe_err("could not start Reassociation failure timer"); /* Return Reassoc confirm with */ @@ -2818,7 +2818,7 @@ static void lim_process_switch_channel_join_req( eLIM_PERIODIC_JOIN_PROBE_REQ_TIMER); /* assign appropriate sessionId to the timer object */ - mac_ctx->lim.limTimers.gLimPeriodicJoinProbeReqTimer.sessionId = + mac_ctx->lim.lim_timers.gLimPeriodicJoinProbeReqTimer.sessionId = session_entry->peSessionId; pe_debug("Sessionid: %d Send Probe req on channel freq %d ssid:%.*s " "BSSID: " QDF_MAC_ADDR_STR, session_entry->peSessionId, @@ -2833,7 +2833,7 @@ static void lim_process_switch_channel_join_req( */ MTRACE(mac_trace(mac_ctx, TRACE_CODE_TIMER_ACTIVATE, session_entry->peSessionId, eLIM_JOIN_FAIL_TIMER)); - if (tx_timer_activate(&mac_ctx->lim.limTimers.gLimJoinFailureTimer) != + if (tx_timer_activate(&mac_ctx->lim.lim_timers.gLimJoinFailureTimer) != TX_SUCCESS) { pe_err("couldn't activate Join failure timer"); session_entry->limMlmState = session_entry->limPrevMlmState; @@ -2856,7 +2856,7 @@ static void lim_process_switch_channel_join_req( if (session_entry->opmode == QDF_P2P_CLIENT_MODE) { /* Activate Join Periodic Probe Req timer */ if (tx_timer_activate - (&mac_ctx->lim.limTimers.gLimPeriodicJoinProbeReqTimer) + (&mac_ctx->lim.lim_timers.gLimPeriodicJoinProbeReqTimer) != TX_SUCCESS) { pe_err("Periodic JoinReq timer activate failed"); goto error; diff --git a/core/mac/src/pe/lim/lim_process_sme_req_messages.c b/core/mac/src/pe/lim/lim_process_sme_req_messages.c index e64e186cf356..0f4533a732f0 100644 --- a/core/mac/src/pe/lim/lim_process_sme_req_messages.c +++ b/core/mac/src/pe/lim/lim_process_sme_req_messages.c @@ -3287,13 +3287,13 @@ __lim_process_sme_addts_req(struct mac_context *mac, uint32_t *msg_buf) timeout = mac->mlme_cfg->timeouts.addts_rsp_timeout; timeout = SYS_MS_TO_TICKS(timeout); - if (tx_timer_change(&mac->lim.limTimers.gLimAddtsRspTimer, timeout, 0) + if (tx_timer_change(&mac->lim.lim_timers.gLimAddtsRspTimer, timeout, 0) != TX_SUCCESS) { pe_err("AddtsRsp timer change failed!"); goto send_failure_addts_rsp; } mac->lim.gLimAddtsRspTimerCount++; - if (tx_timer_change_context(&mac->lim.limTimers.gLimAddtsRspTimer, + if (tx_timer_change_context(&mac->lim.lim_timers.gLimAddtsRspTimer, mac->lim.gLimAddtsRspTimerCount) != TX_SUCCESS) { pe_err("AddtsRsp timer change failed!"); @@ -3304,8 +3304,8 @@ __lim_process_sme_addts_req(struct mac_context *mac, uint32_t *msg_buf) eLIM_ADDTS_RSP_TIMER)); /* add the sessionId to the timer object */ - mac->lim.limTimers.gLimAddtsRspTimer.sessionId = sessionId; - if (tx_timer_activate(&mac->lim.limTimers.gLimAddtsRspTimer) != + mac->lim.lim_timers.gLimAddtsRspTimer.sessionId = sessionId; + if (tx_timer_activate(&mac->lim.lim_timers.gLimAddtsRspTimer) != TX_SUCCESS) { pe_err("AddtsRsp timer activation failed!"); goto send_failure_addts_rsp; @@ -3428,7 +3428,7 @@ void lim_process_sme_addts_rsp_timeout(struct mac_context *mac, uint32_t param) struct pe_session *pe_session; pe_session = pe_find_session_by_session_id(mac, - mac->lim.limTimers.gLimAddtsRspTimer. + mac->lim.lim_timers.gLimAddtsRspTimer. sessionId); if (!pe_session) { pe_err("Session Does not exist for given sessionID"); diff --git a/core/mac/src/pe/lim/lim_roam_timer_utils.c b/core/mac/src/pe/lim/lim_roam_timer_utils.c index ba27e85b49ac..4f0d67471fbd 100644 --- a/core/mac/src/pe/lim/lim_roam_timer_utils.c +++ b/core/mac/src/pe/lim/lim_roam_timer_utils.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2018 The Linux Foundation. All rights reserved. + * Copyright (c) 2016-2019 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -43,7 +43,7 @@ uint32_t lim_create_timers_host_roam(struct mac_context *mac_ctx) mac_ctx->mlme_cfg->timeouts.reassoc_failure_timeout); /* Create Association failure timer and activate it later */ if (tx_timer_create(mac_ctx, - &mac_ctx->lim.limTimers.gLimReassocFailureTimer, + &mac_ctx->lim.lim_timers.gLimReassocFailureTimer, "REASSOC FAILURE TIMEOUT", lim_assoc_failure_timer_handler, LIM_REASSOC, cfg_value, 0, TX_NO_ACTIVATE) != TX_SUCCESS) { pe_err("failed to create Reassoc timer"); @@ -52,7 +52,7 @@ uint32_t lim_create_timers_host_roam(struct mac_context *mac_ctx) cfg_value = 1000; cfg_value = SYS_MS_TO_TICKS(cfg_value); if (tx_timer_create(mac_ctx, - &mac_ctx->lim.limTimers.gLimFTPreAuthRspTimer, + &mac_ctx->lim.lim_timers.gLimFTPreAuthRspTimer, "FT PREAUTH RSP TIMEOUT", lim_timer_handler, SIR_LIM_FT_PREAUTH_RSP_TIMEOUT, cfg_value, 0, TX_NO_ACTIVATE) != TX_SUCCESS) { @@ -62,13 +62,13 @@ uint32_t lim_create_timers_host_roam(struct mac_context *mac_ctx) return TX_SUCCESS; err_roam_timer: - tx_timer_delete(&mac_ctx->lim.limTimers.gLimReassocFailureTimer); + tx_timer_delete(&mac_ctx->lim.lim_timers.gLimReassocFailureTimer); return TX_TIMER_ERROR; } void lim_delete_timers_host_roam(struct mac_context *mac_ctx) { - tLimTimers *lim_timer = &mac_ctx->lim.limTimers; + tLimTimers *lim_timer = &mac_ctx->lim.lim_timers; /* Delete Reassociation failure timer. */ tx_timer_delete(&lim_timer->gLimReassocFailureTimer); @@ -78,7 +78,7 @@ void lim_delete_timers_host_roam(struct mac_context *mac_ctx) void lim_deactivate_timers_host_roam(struct mac_context *mac_ctx) { - tLimTimers *lim_timer = &mac_ctx->lim.limTimers; + tLimTimers *lim_timer = &mac_ctx->lim.lim_timers; /* Deactivate Reassociation failure timer. */ tx_timer_deactivate(&lim_timer->gLimReassocFailureTimer); @@ -104,21 +104,21 @@ void lim_deactivate_and_change_timer_host_roam(struct mac_context *mac_ctx, switch (timer_id) { case eLIM_REASSOC_FAIL_TIMER: if (tx_timer_deactivate - (&mac_ctx->lim.limTimers.gLimReassocFailureTimer) != + (&mac_ctx->lim.lim_timers.gLimReassocFailureTimer) != TX_SUCCESS) pe_warn("unable to deactivate Reassoc fail timer"); val = SYS_MS_TO_TICKS( mac_ctx->mlme_cfg->timeouts.reassoc_failure_timeout); if (tx_timer_change - (&mac_ctx->lim.limTimers.gLimReassocFailureTimer, val, + (&mac_ctx->lim.lim_timers.gLimReassocFailureTimer, val, 0) != TX_SUCCESS) pe_warn("unable to change Reassoc fail timer"); break; case eLIM_FT_PREAUTH_RSP_TIMER: if (tx_timer_deactivate - (&mac_ctx->lim.limTimers.gLimFTPreAuthRspTimer) != + (&mac_ctx->lim.lim_timers.gLimFTPreAuthRspTimer) != TX_SUCCESS) { pe_err("Unable to deactivate Preauth Fail timer"); return; @@ -126,7 +126,7 @@ void lim_deactivate_and_change_timer_host_roam(struct mac_context *mac_ctx, val = 1000; val = SYS_MS_TO_TICKS(val); if (tx_timer_change( - &mac_ctx->lim.limTimers.gLimFTPreAuthRspTimer, + &mac_ctx->lim.lim_timers.gLimFTPreAuthRspTimer, val, 0) != TX_SUCCESS) { pe_err("Unable to change Join Failure timer"); return; diff --git a/core/mac/src/pe/lim/lim_security_utils.c b/core/mac/src/pe/lim/lim_security_utils.c index f0d1a1003e99..4efb0891a1c6 100644 --- a/core/mac/src/pe/lim/lim_security_utils.c +++ b/core/mac/src/pe/lim/lim_security_utils.c @@ -462,12 +462,12 @@ lim_restore_from_auth_state(struct mac_context *mac, tSirResultCodes resultCode, /* Auth retry and AUth failure timers are not started for SAE */ /* 'Change' timer for future activations */ - if (tx_timer_running(&mac->lim.limTimers. + if (tx_timer_running(&mac->lim.lim_timers. g_lim_periodic_auth_retry_timer)) lim_deactivate_and_change_timer(mac, eLIM_AUTH_RETRY_TIMER); /* 'Change' timer for future activations */ - if (tx_timer_running(&mac->lim.limTimers.gLimAuthFailureTimer)) + if (tx_timer_running(&mac->lim.lim_timers.gLimAuthFailureTimer)) lim_deactivate_and_change_timer(mac, eLIM_AUTH_FAIL_TIMER); diff --git a/core/mac/src/pe/lim/lim_send_frames_host_roam.c b/core/mac/src/pe/lim/lim_send_frames_host_roam.c index b7bfc7c00b6a..0c1607d98269 100644 --- a/core/mac/src/pe/lim/lim_send_frames_host_roam.c +++ b/core/mac/src/pe/lim/lim_send_frames_host_roam.c @@ -489,12 +489,12 @@ void lim_send_retry_reassoc_req_frame(struct mac_context *mac, } /* Prepare and send Reassociation request frame */ /* start reassoc timer. */ - mac->lim.limTimers.gLimReassocFailureTimer.sessionId = + mac->lim.lim_timers.gLimReassocFailureTimer.sessionId = pe_session->peSessionId; /* Start reassociation failure timer */ MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TIMER_ACTIVATE, pe_session->peSessionId, eLIM_REASSOC_FAIL_TIMER)); - if (tx_timer_activate(&mac->lim.limTimers.gLimReassocFailureTimer) + if (tx_timer_activate(&mac->lim.lim_timers.gLimReassocFailureTimer) != TX_SUCCESS) { /* Could not start reassoc failure timer. */ /* Log error */ diff --git a/core/mac/src/pe/lim/lim_send_management_frames.c b/core/mac/src/pe/lim/lim_send_management_frames.c index bd72024eef66..1fa9b92d8b33 100644 --- a/core/mac/src/pe/lim/lim_send_management_frames.c +++ b/core/mac/src/pe/lim/lim_send_management_frames.c @@ -2707,7 +2707,7 @@ QDF_STATUS lim_send_deauth_cnf(struct mac_context *mac_ctx) deauth_req = mac_ctx->lim.limDisassocDeauthCnfReq.pMlmDeauthReq; if (deauth_req) { if (tx_timer_running( - &mac_ctx->lim.limTimers.gLimDeauthAckTimer)) + &mac_ctx->lim.lim_timers.gLimDeauthAckTimer)) lim_deactivate_and_change_timer(mac_ctx, eLIM_DEAUTH_ACK_TIMER); @@ -2813,7 +2813,7 @@ QDF_STATUS lim_send_disassoc_cnf(struct mac_context *mac_ctx) disassoc_req = mac_ctx->lim.limDisassocDeauthCnfReq.pMlmDisassocReq; if (disassoc_req) { if (tx_timer_running( - &mac_ctx->lim.limTimers.gLimDisassocAckTimer)) + &mac_ctx->lim.lim_timers.gLimDisassocAckTimer)) lim_deactivate_and_change_timer(mac_ctx, eLIM_DISASSOC_ACK_TIMER); @@ -3123,12 +3123,12 @@ lim_send_disassoc_mgmt_frame(struct mac_context *mac, val = SYS_MS_TO_TICKS(LIM_DISASSOC_DEAUTH_ACK_TIMEOUT); if (tx_timer_change - (&mac->lim.limTimers.gLimDisassocAckTimer, val, 0) + (&mac->lim.lim_timers.gLimDisassocAckTimer, val, 0) != TX_SUCCESS) { pe_err("Unable to change Disassoc ack Timer val"); return; } else if (TX_SUCCESS != - tx_timer_activate(&mac->lim.limTimers. + tx_timer_activate(&mac->lim.lim_timers. gLimDisassocAckTimer)) { pe_err("Unable to activate Disassoc ack Timer"); lim_deactivate_and_change_timer(mac, @@ -3328,12 +3328,12 @@ lim_send_deauth_mgmt_frame(struct mac_context *mac, val = SYS_MS_TO_TICKS(LIM_DISASSOC_DEAUTH_ACK_TIMEOUT); if (tx_timer_change - (&mac->lim.limTimers.gLimDeauthAckTimer, val, 0) + (&mac->lim.lim_timers.gLimDeauthAckTimer, val, 0) != TX_SUCCESS) { pe_err("Unable to change Deauth ack Timer val"); return; } else if (TX_SUCCESS != - tx_timer_activate(&mac->lim.limTimers. + tx_timer_activate(&mac->lim.lim_timers. gLimDeauthAckTimer)) { pe_err("Unable to activate Deauth ack Timer"); lim_deactivate_and_change_timer(mac, diff --git a/core/mac/src/pe/lim/lim_session.c b/core/mac/src/pe/lim/lim_session.c index cfb405d6ec7e..b297959b2c07 100644 --- a/core/mac/src/pe/lim/lim_session.c +++ b/core/mac/src/pe/lim/lim_session.c @@ -860,7 +860,7 @@ void pe_delete_session(struct mac_context *mac_ctx, struct pe_session *session) } for (n = 0; n < (mac_ctx->lim.maxStation + 1); n++) { - timer_ptr = &mac_ctx->lim.limTimers.gpLimCnfWaitTimer[n]; + timer_ptr = &mac_ctx->lim.lim_timers.gpLimCnfWaitTimer[n]; if (session->peSessionId == timer_ptr->sessionId) if (true == tx_timer_running(timer_ptr)) tx_timer_deactivate(timer_ptr); diff --git a/core/mac/src/pe/lim/lim_timer_utils.c b/core/mac/src/pe/lim/lim_timer_utils.c index c04de412dc03..b4679602a886 100644 --- a/core/mac/src/pe/lim/lim_timer_utils.c +++ b/core/mac/src/pe/lim/lim_timer_utils.c @@ -56,7 +56,7 @@ static bool lim_create_non_ap_timers(struct mac_context *mac) { uint32_t cfgValue; /* Create Channel Switch Timer */ - if (tx_timer_create(mac, &mac->lim.limTimers.gLimChannelSwitchTimer, + if (tx_timer_create(mac, &mac->lim.lim_timers.gLimChannelSwitchTimer, "CHANNEL SWITCH TIMER", lim_channel_switch_timer_handler, 0, LIM_CHANNEL_SWITCH_TIMER_TICKS, @@ -68,7 +68,7 @@ static bool lim_create_non_ap_timers(struct mac_context *mac) cfgValue = SYS_MS_TO_TICKS( mac->mlme_cfg->timeouts.join_failure_timeout); /* Create Join failure timer and activate it later */ - if (tx_timer_create(mac, &mac->lim.limTimers.gLimJoinFailureTimer, + if (tx_timer_create(mac, &mac->lim.lim_timers.gLimJoinFailureTimer, "JOIN FAILURE TIMEOUT", lim_timer_handler, SIR_LIM_JOIN_FAIL_TIMEOUT, cfgValue, 0, @@ -80,7 +80,7 @@ static bool lim_create_non_ap_timers(struct mac_context *mac) } /* Send unicast probe req frame every 200 ms */ if (tx_timer_create(mac, - &mac->lim.limTimers.gLimPeriodicJoinProbeReqTimer, + &mac->lim.lim_timers.gLimPeriodicJoinProbeReqTimer, "Periodic Join Probe Request Timer", lim_timer_handler, SIR_LIM_PERIODIC_JOIN_PROBE_REQ_TIMEOUT, @@ -92,7 +92,7 @@ static bool lim_create_non_ap_timers(struct mac_context *mac) /* Send Auth frame every 60 ms */ if ((tx_timer_create(mac, - &mac->lim.limTimers.g_lim_periodic_auth_retry_timer, + &mac->lim.lim_timers.g_lim_periodic_auth_retry_timer, "Periodic AUTH Timer", lim_timer_handler, SIR_LIM_AUTH_RETRY_TIMEOUT, SYS_MS_TO_TICKS(LIM_AUTH_RETRY_TIMER_MS), 0, @@ -104,7 +104,7 @@ static bool lim_create_non_ap_timers(struct mac_context *mac) cfgValue = SYS_MS_TO_TICKS( mac->mlme_cfg->timeouts.assoc_failure_timeout); /* Create Association failure timer and activate it later */ - if (tx_timer_create(mac, &mac->lim.limTimers.gLimAssocFailureTimer, + if (tx_timer_create(mac, &mac->lim.lim_timers.gLimAssocFailureTimer, "ASSOC FAILURE TIMEOUT", lim_assoc_failure_timer_handler, LIM_ASSOC, cfgValue, 0, TX_NO_ACTIVATE) != TX_SUCCESS) { @@ -115,7 +115,7 @@ static bool lim_create_non_ap_timers(struct mac_context *mac) cfgValue = SYS_MS_TO_TICKS(mac->mlme_cfg->timeouts.addts_rsp_timeout); /* Create Addts response timer and activate it later */ - if (tx_timer_create(mac, &mac->lim.limTimers.gLimAddtsRspTimer, + if (tx_timer_create(mac, &mac->lim.lim_timers.gLimAddtsRspTimer, "ADDTS RSP TIMEOUT", lim_addts_response_timer_handler, SIR_LIM_ADDTS_RSP_TIMEOUT, @@ -127,7 +127,7 @@ static bool lim_create_non_ap_timers(struct mac_context *mac) cfgValue = SYS_MS_TO_TICKS( mac->mlme_cfg->timeouts.auth_failure_timeout); /* Create Auth failure timer and activate it later */ - if (tx_timer_create(mac, &mac->lim.limTimers.gLimAuthFailureTimer, + if (tx_timer_create(mac, &mac->lim.lim_timers.gLimAuthFailureTimer, "AUTH FAILURE TIMEOUT", lim_timer_handler, SIR_LIM_AUTH_FAIL_TIMEOUT, @@ -139,7 +139,7 @@ static bool lim_create_non_ap_timers(struct mac_context *mac) /* Change timer to reactivate it in future */ cfgValue = SYS_MS_TO_TICKS( mac->mlme_cfg->timeouts.probe_after_hb_fail_timeout); - if (tx_timer_create(mac, &mac->lim.limTimers.gLimProbeAfterHBTimer, + if (tx_timer_create(mac, &mac->lim.lim_timers.gLimProbeAfterHBTimer, "Probe after Heartbeat TIMEOUT", lim_timer_handler, SIR_LIM_PROBE_HB_FAILURE_TIMEOUT, @@ -153,7 +153,7 @@ static bool lim_create_non_ap_timers(struct mac_context *mac) * authentication. */ if ((tx_timer_create(mac, - &mac->lim.limTimers.sae_auth_timer, + &mac->lim.lim_timers.sae_auth_timer, "SAE AUTH Timer", lim_timer_handler, SIR_LIM_AUTH_SAE_TIMEOUT, SYS_MS_TO_TICKS(LIM_AUTH_SAE_TIMER_MS), 0, @@ -194,7 +194,7 @@ uint32_t lim_create_timers(struct mac_context *mac) cfgValue = SYS_MS_TO_TICKS(cfgValue); for (i = 0; i < (mac->lim.maxStation + 1); i++) { if (tx_timer_create(mac, - &mac->lim.limTimers.gpLimCnfWaitTimer[i], + &mac->lim.lim_timers.gpLimCnfWaitTimer[i], "CNF_MISS_TIMEOUT", lim_cnf_wait_tmer_handler, (uint32_t) i, cfgValue, @@ -227,7 +227,7 @@ uint32_t lim_create_timers(struct mac_context *mac) cfgValue = SYS_MS_TO_TICKS( mac->mlme_cfg->timeouts.olbc_detect_timeout); - if (tx_timer_create(mac, &mac->lim.limTimers.gLimUpdateOlbcCacheTimer, + if (tx_timer_create(mac, &mac->lim.lim_timers.gLimUpdateOlbcCacheTimer, "OLBC UPDATE CACHE TIMEOUT", lim_update_olbc_cache_timer_handler, SIR_LIM_UPDATE_OLBC_CACHEL_TIMEOUT, cfgValue, @@ -238,7 +238,7 @@ uint32_t lim_create_timers(struct mac_context *mac) cfgValue = 1000; cfgValue = SYS_MS_TO_TICKS(cfgValue); - if (tx_timer_create(mac, &mac->lim.limTimers.gLimDisassocAckTimer, + if (tx_timer_create(mac, &mac->lim.lim_timers.gLimDisassocAckTimer, "DISASSOC ACK TIMEOUT", lim_timer_handler, SIR_LIM_DISASSOC_ACK_TIMEOUT, cfgValue, 0, TX_NO_ACTIVATE) != TX_SUCCESS) { @@ -248,7 +248,7 @@ uint32_t lim_create_timers(struct mac_context *mac) cfgValue = 1000; cfgValue = SYS_MS_TO_TICKS(cfgValue); - if (tx_timer_create(mac, &mac->lim.limTimers.gLimDeauthAckTimer, + if (tx_timer_create(mac, &mac->lim.lim_timers.gLimDeauthAckTimer, "DISASSOC ACK TIMEOUT", lim_timer_handler, SIR_LIM_DEAUTH_ACK_TIMEOUT, cfgValue, 0, TX_NO_ACTIVATE) != TX_SUCCESS) { @@ -260,21 +260,21 @@ uint32_t lim_create_timers(struct mac_context *mac) err_timer: lim_delete_timers_host_roam(mac); - tx_timer_delete(&mac->lim.limTimers.gLimDeauthAckTimer); - tx_timer_delete(&mac->lim.limTimers.gLimDisassocAckTimer); - tx_timer_delete(&mac->lim.limTimers.gLimUpdateOlbcCacheTimer); + tx_timer_delete(&mac->lim.lim_timers.gLimDeauthAckTimer); + tx_timer_delete(&mac->lim.lim_timers.gLimDisassocAckTimer); + tx_timer_delete(&mac->lim.lim_timers.gLimUpdateOlbcCacheTimer); while (((int32_t)-- i) >= 0) { - tx_timer_delete(&mac->lim.limTimers.gpLimCnfWaitTimer[i]); + tx_timer_delete(&mac->lim.lim_timers.gpLimCnfWaitTimer[i]); } - tx_timer_delete(&mac->lim.limTimers.gLimProbeAfterHBTimer); - tx_timer_delete(&mac->lim.limTimers.gLimAuthFailureTimer); - tx_timer_delete(&mac->lim.limTimers.gLimAddtsRspTimer); - tx_timer_delete(&mac->lim.limTimers.gLimAssocFailureTimer); - tx_timer_delete(&mac->lim.limTimers.gLimJoinFailureTimer); - tx_timer_delete(&mac->lim.limTimers.gLimPeriodicJoinProbeReqTimer); - tx_timer_delete(&mac->lim.limTimers.g_lim_periodic_auth_retry_timer); - tx_timer_delete(&mac->lim.limTimers.gLimChannelSwitchTimer); - tx_timer_delete(&mac->lim.limTimers.sae_auth_timer); + tx_timer_delete(&mac->lim.lim_timers.gLimProbeAfterHBTimer); + tx_timer_delete(&mac->lim.lim_timers.gLimAuthFailureTimer); + tx_timer_delete(&mac->lim.lim_timers.gLimAddtsRspTimer); + tx_timer_delete(&mac->lim.lim_timers.gLimAssocFailureTimer); + tx_timer_delete(&mac->lim.lim_timers.gLimJoinFailureTimer); + tx_timer_delete(&mac->lim.lim_timers.gLimPeriodicJoinProbeReqTimer); + tx_timer_delete(&mac->lim.lim_timers.g_lim_periodic_auth_retry_timer); + tx_timer_delete(&mac->lim.lim_timers.gLimChannelSwitchTimer); + tx_timer_delete(&mac->lim.lim_timers.sae_auth_timer); if (mac->lim.gLimPreAuthTimerTable.pTable) { for (i = 0; i < mac->lim.gLimPreAuthTimerTable.numEntry; i++) @@ -515,7 +515,7 @@ void lim_deactivate_and_change_timer(struct mac_context *mac, uint32_t timerId) case eLIM_ADDTS_RSP_TIMER: mac->lim.gLimAddtsRspTimerCount++; - if (tx_timer_deactivate(&mac->lim.limTimers.gLimAddtsRspTimer) + if (tx_timer_deactivate(&mac->lim.lim_timers.gLimAddtsRspTimer) != TX_SUCCESS) { /* Could not deactivate AddtsRsp Timer */ /* Log error */ @@ -525,7 +525,7 @@ void lim_deactivate_and_change_timer(struct mac_context *mac, uint32_t timerId) case eLIM_JOIN_FAIL_TIMER: if (tx_timer_deactivate - (&mac->lim.limTimers.gLimJoinFailureTimer) + (&mac->lim.lim_timers.gLimJoinFailureTimer) != TX_SUCCESS) { /** * Could not deactivate Join Failure @@ -537,7 +537,7 @@ void lim_deactivate_and_change_timer(struct mac_context *mac, uint32_t timerId) val = SYS_MS_TO_TICKS( mac->mlme_cfg->timeouts.join_failure_timeout); - if (tx_timer_change(&mac->lim.limTimers.gLimJoinFailureTimer, + if (tx_timer_change(&mac->lim.lim_timers.gLimJoinFailureTimer, val, 0) != TX_SUCCESS) { /** * Could not change Join Failure @@ -550,7 +550,7 @@ void lim_deactivate_and_change_timer(struct mac_context *mac, uint32_t timerId) case eLIM_PERIODIC_JOIN_PROBE_REQ_TIMER: if (tx_timer_deactivate - (&mac->lim.limTimers.gLimPeriodicJoinProbeReqTimer) + (&mac->lim.lim_timers.gLimPeriodicJoinProbeReqTimer) != TX_SUCCESS) { /* Could not deactivate periodic join req Times. */ pe_err("Unable to deactivate periodic join request timer"); @@ -558,8 +558,8 @@ void lim_deactivate_and_change_timer(struct mac_context *mac, uint32_t timerId) val = SYS_MS_TO_TICKS(LIM_JOIN_PROBE_REQ_TIMER_MS); if (tx_timer_change - (&mac->lim.limTimers.gLimPeriodicJoinProbeReqTimer, val, - 0) != TX_SUCCESS) { + (&mac->lim.lim_timers.gLimPeriodicJoinProbeReqTimer, + val, 0) != TX_SUCCESS) { /* Could not change periodic join req times. */ /* Log error */ pe_err("Unable to change periodic join request timer"); @@ -569,7 +569,7 @@ void lim_deactivate_and_change_timer(struct mac_context *mac, uint32_t timerId) case eLIM_AUTH_FAIL_TIMER: if (tx_timer_deactivate - (&mac->lim.limTimers.gLimAuthFailureTimer) + (&mac->lim.lim_timers.gLimAuthFailureTimer) != TX_SUCCESS) { /* Could not deactivate Auth failure timer. */ /* Log error */ @@ -579,7 +579,7 @@ void lim_deactivate_and_change_timer(struct mac_context *mac, uint32_t timerId) val = SYS_MS_TO_TICKS( mac->mlme_cfg->timeouts.auth_failure_timeout); - if (tx_timer_change(&mac->lim.limTimers.gLimAuthFailureTimer, + if (tx_timer_change(&mac->lim.lim_timers.gLimAuthFailureTimer, val, 0) != TX_SUCCESS) { /* Could not change Authentication failure timer. */ /* Log error */ @@ -591,17 +591,17 @@ void lim_deactivate_and_change_timer(struct mac_context *mac, uint32_t timerId) case eLIM_AUTH_RETRY_TIMER: if (tx_timer_deactivate - (&mac->lim.limTimers.g_lim_periodic_auth_retry_timer) + (&mac->lim.lim_timers.g_lim_periodic_auth_retry_timer) != TX_SUCCESS) { /* Could not deactivate Auth Retry Timer. */ pe_err("Unable to deactivate Auth Retry timer"); } session_entry = pe_find_session_by_session_id(mac, - mac->lim.limTimers. + mac->lim.lim_timers. g_lim_periodic_auth_retry_timer.sessionId); if (!session_entry) { pe_err("session does not exist for given SessionId : %d", - mac->lim.limTimers. + mac->lim.lim_timers. g_lim_periodic_auth_retry_timer.sessionId); break; } @@ -609,7 +609,7 @@ void lim_deactivate_and_change_timer(struct mac_context *mac, uint32_t timerId) val = (session_entry->beaconParams.beaconInterval * 3) / 5; val = SYS_MS_TO_TICKS(val); if (tx_timer_change - (&mac->lim.limTimers.g_lim_periodic_auth_retry_timer, + (&mac->lim.lim_timers.g_lim_periodic_auth_retry_timer, val, 0) != TX_SUCCESS) { /* Could not change Auth Retry timer. */ pe_err("Unable to change Auth Retry timer"); @@ -618,7 +618,7 @@ void lim_deactivate_and_change_timer(struct mac_context *mac, uint32_t timerId) case eLIM_ASSOC_FAIL_TIMER: if (tx_timer_deactivate - (&mac->lim.limTimers.gLimAssocFailureTimer) != + (&mac->lim.lim_timers.gLimAssocFailureTimer) != TX_SUCCESS) { /* Could not deactivate Association failure timer. */ /* Log error */ @@ -628,7 +628,7 @@ void lim_deactivate_and_change_timer(struct mac_context *mac, uint32_t timerId) val = SYS_MS_TO_TICKS( mac->mlme_cfg->timeouts.assoc_failure_timeout); - if (tx_timer_change(&mac->lim.limTimers.gLimAssocFailureTimer, + if (tx_timer_change(&mac->lim.lim_timers.gLimAssocFailureTimer, val, 0) != TX_SUCCESS) { /* Could not change Association failure timer. */ /* Log error */ @@ -639,7 +639,7 @@ void lim_deactivate_and_change_timer(struct mac_context *mac, uint32_t timerId) case eLIM_PROBE_AFTER_HB_TIMER: if (tx_timer_deactivate - (&mac->lim.limTimers.gLimProbeAfterHBTimer) != + (&mac->lim.lim_timers.gLimProbeAfterHBTimer) != TX_SUCCESS) { /* Could not deactivate Heartbeat timer. */ /* Log error */ @@ -652,7 +652,7 @@ void lim_deactivate_and_change_timer(struct mac_context *mac, uint32_t timerId) val = SYS_MS_TO_TICKS( mac->mlme_cfg->timeouts.probe_after_hb_fail_timeout); - if (tx_timer_change(&mac->lim.limTimers.gLimProbeAfterHBTimer, + if (tx_timer_change(&mac->lim.lim_timers.gLimProbeAfterHBTimer, val, 0) != TX_SUCCESS) { /* Could not change HeartBeat timer. */ /* Log error */ @@ -665,8 +665,9 @@ void lim_deactivate_and_change_timer(struct mac_context *mac, uint32_t timerId) break; case eLIM_DISASSOC_ACK_TIMER: - if (tx_timer_deactivate - (&mac->lim.limTimers.gLimDisassocAckTimer) != TX_SUCCESS) { + if (tx_timer_deactivate( + &mac->lim.lim_timers.gLimDisassocAckTimer) != + TX_SUCCESS) { /** ** Could not deactivate Join Failure ** timer. Log error. @@ -676,7 +677,7 @@ void lim_deactivate_and_change_timer(struct mac_context *mac, uint32_t timerId) } val = 1000; val = SYS_MS_TO_TICKS(val); - if (tx_timer_change(&mac->lim.limTimers.gLimDisassocAckTimer, + if (tx_timer_change(&mac->lim.lim_timers.gLimDisassocAckTimer, val, 0) != TX_SUCCESS) { /** * Could not change Join Failure @@ -688,7 +689,7 @@ void lim_deactivate_and_change_timer(struct mac_context *mac, uint32_t timerId) break; case eLIM_DEAUTH_ACK_TIMER: - if (tx_timer_deactivate(&mac->lim.limTimers.gLimDeauthAckTimer) + if (tx_timer_deactivate(&mac->lim.lim_timers.gLimDeauthAckTimer) != TX_SUCCESS) { /** ** Could not deactivate Join Failure @@ -699,7 +700,7 @@ void lim_deactivate_and_change_timer(struct mac_context *mac, uint32_t timerId) } val = 1000; val = SYS_MS_TO_TICKS(val); - if (tx_timer_change(&mac->lim.limTimers.gLimDeauthAckTimer, + if (tx_timer_change(&mac->lim.lim_timers.gLimDeauthAckTimer, val, 0) != TX_SUCCESS) { /** * Could not change Join Failure @@ -712,14 +713,14 @@ void lim_deactivate_and_change_timer(struct mac_context *mac, uint32_t timerId) case eLIM_AUTH_SAE_TIMER: if (tx_timer_deactivate - (&mac->lim.limTimers.sae_auth_timer) + (&mac->lim.lim_timers.sae_auth_timer) != TX_SUCCESS) pe_err("Unable to deactivate SAE auth timer"); /* Change timer to reactivate it in future */ val = SYS_MS_TO_TICKS(LIM_AUTH_SAE_TIMER_MS); - if (tx_timer_change(&mac->lim.limTimers.sae_auth_timer, + if (tx_timer_change(&mac->lim.lim_timers.sae_auth_timer, val, 0) != TX_SUCCESS) pe_err("unable to change SAE auth timer"); @@ -763,7 +764,7 @@ lim_deactivate_and_change_per_sta_id_timer(struct mac_context *mac, uint32_t tim case eLIM_CNF_WAIT_TIMER: if (tx_timer_deactivate - (&mac->lim.limTimers.gpLimCnfWaitTimer[staId]) + (&mac->lim.lim_timers.gpLimCnfWaitTimer[staId]) != TX_SUCCESS) { pe_err("unable to deactivate CNF wait timer"); } @@ -772,7 +773,7 @@ lim_deactivate_and_change_per_sta_id_timer(struct mac_context *mac, uint32_t tim val = SYS_MS_TO_TICKS(val); if (tx_timer_change - (&mac->lim.limTimers.gpLimCnfWaitTimer[staId], val, + (&mac->lim.lim_timers.gpLimCnfWaitTimer[staId], val, val) != TX_SUCCESS) { /* Could not change cnf timer. */ /* Log error */ @@ -846,9 +847,9 @@ lim_deactivate_and_change_per_sta_id_timer(struct mac_context *mac, uint32_t tim void lim_activate_cnf_timer(struct mac_context *mac, uint16_t staId, struct pe_session *pe_session) { - mac->lim.limTimers.gpLimCnfWaitTimer[staId].sessionId = + mac->lim.lim_timers.gpLimCnfWaitTimer[staId].sessionId = pe_session->peSessionId; - if (tx_timer_activate(&mac->lim.limTimers.gpLimCnfWaitTimer[staId]) + if (tx_timer_activate(&mac->lim.lim_timers.gpLimCnfWaitTimer[staId]) != TX_SUCCESS) { pe_err("could not activate cnf wait timer"); } diff --git a/core/mac/src/pe/lim/lim_utils.c b/core/mac/src/pe/lim/lim_utils.c index 4abd84a065bf..8fe3f3241360 100644 --- a/core/mac/src/pe/lim/lim_utils.c +++ b/core/mac/src/pe/lim/lim_utils.c @@ -473,7 +473,7 @@ QDF_STATUS lim_init_mlm(struct mac_context *mac) void lim_deactivate_timers(struct mac_context *mac_ctx) { uint32_t n; - tLimTimers *lim_timer = &mac_ctx->lim.limTimers; + tLimTimers *lim_timer = &mac_ctx->lim.lim_timers; lim_deactivate_timers_host_roam(mac_ctx); @@ -506,7 +506,7 @@ void lim_deactivate_timers(struct mac_context *mac_ctx) /* Deactivate Association failure timer. */ tx_timer_deactivate(&lim_timer->gLimAssocFailureTimer); - if (tx_timer_running(&mac_ctx->lim.limTimers.gLimAuthFailureTimer)) { + if (tx_timer_running(&mac_ctx->lim.lim_timers.gLimAuthFailureTimer)) { pe_err("Auth failure timer running call the timeout API"); /* Cleanup as if auth timer expired */ lim_timer_handler(mac_ctx, SIR_LIM_AUTH_FAIL_TIMEOUT); @@ -561,7 +561,7 @@ void lim_cleanup_mlm(struct mac_context *mac_ctx) tLimTimers *lim_timer = NULL; if (mac_ctx->lim.gLimTimersCreated == 1) { - lim_timer = &mac_ctx->lim.limTimers; + lim_timer = &mac_ctx->lim.lim_timers; lim_deactivate_timers(mac_ctx); @@ -935,7 +935,7 @@ void lim_handle_update_olbc_cache(struct mac_context *mac_ctx) lim_send_beacon_params(mac_ctx, &beaconParams, pe_session); } /* Start OLBC timer */ - if (tx_timer_activate(&mac_ctx->lim.limTimers.gLimUpdateOlbcCacheTimer) + if (tx_timer_activate(&mac_ctx->lim.lim_timers.gLimUpdateOlbcCacheTimer) != TX_SUCCESS) pe_err("tx_timer_activate failed"); } @@ -1872,7 +1872,7 @@ static void __lim_process_channel_switch_timeout(struct pe_session *pe_session) (pe_session->limSmeState != eLIM_SME_WT_DEAUTH_STATE)) { pe_err("Invalid channel! Disconnect"); lim_tear_down_link_with_ap(mac, - mac->lim.limTimers. + mac->lim.lim_timers. gLimChannelSwitchTimer.sessionId, eSIR_MAC_UNSPEC_FAILURE_REASON); return; @@ -1939,7 +1939,7 @@ void lim_process_channel_switch_timeout(struct mac_context *mac_ctx) session_entry = pe_find_session_by_session_id( mac_ctx, - mac_ctx->lim.limTimers.gLimChannelSwitchTimer.sessionId); + mac_ctx->lim.lim_timers.gLimChannelSwitchTimer.sessionId); if (!session_entry) { pe_err("Session does not exist for given sessionID"); return; @@ -2078,7 +2078,7 @@ void lim_cancel_dot11h_channel_switch(struct mac_context *mac, (mac, TRACE_CODE_TIMER_DEACTIVATE, pe_session->peSessionId, eLIM_CHANNEL_SWITCH_TIMER)); - if (tx_timer_deactivate(&mac->lim.limTimers.gLimChannelSwitchTimer) != + if (tx_timer_deactivate(&mac->lim.lim_timers.gLimChannelSwitchTimer) != QDF_STATUS_SUCCESS) { pe_err("tx_timer_deactivate failed!"); } @@ -4650,7 +4650,7 @@ void lim_handle_heart_beat_timeout_for_session(struct mac_context *mac_ctx, (psession_entry->bssType == eSIR_INFRASTRUCTURE_MODE) && (LIM_IS_STA_ROLE(psession_entry)) && (psession_entry->LimHBFailureStatus == true)) { - tLimTimers *lim_timer = &mac_ctx->lim.limTimers; + tLimTimers *lim_timer = &mac_ctx->lim.lim_timers; /* * Activate Probe After HeartBeat Timer incase HB * Failure detected @@ -4801,7 +4801,7 @@ void lim_handle_heart_beat_failure_timeout(struct mac_context *mac_ctx) /* * Deactivate Timer ProbeAfterHB Timer -> As its a oneshot timer, * need not deactivate the timer - * tx_timer_deactivate(&mac->lim.limTimers.gLimProbeAfterHBTimer); + * tx_timer_deactivate(&mac->lim.lim_timers.gLimProbeAfterHBTimer); */ }