qcacld-3.0: Rename pMac in lim_timer_utils.c

Per the Linux coding style "mixed-case names are frowned upon" and
"so-called Hungarian notation [...] is brain damaged." One identifier
used extensively throughout the driver that violates both of these
tenants is "pMac." In order to be compliant with the Linux coding
style there is a campaign to rename all instances of this identifier.

For this change rename all instances of "pMac" to "mac" in:
lim_timer_utils.c

Change-Id: Ic36992dbbe9a672fc493b2b45bac163810d5e1e3
CRs-Fixed: 2355455
This commit is contained in:
Jeff Johnson 2018-11-22 15:37:32 -08:00 • committed by nshrivas
commit 1e5de5a9ce

View file

@ -57,11 +57,11 @@
convert ACTIVE DFS channel to DFS channels */
#define ACTIVE_TO_PASSIVE_CONVERISON_TIMEOUT 1000
static bool lim_create_non_ap_timers(tpAniSirGlobal pMac)
static bool lim_create_non_ap_timers(tpAniSirGlobal mac)
{
uint32_t cfgValue;
/* Create Channel Switch Timer */
if (tx_timer_create(pMac, &pMac->lim.limTimers.gLimChannelSwitchTimer,
if (tx_timer_create(mac, &mac->lim.limTimers.gLimChannelSwitchTimer,
"CHANNEL SWITCH TIMER",
lim_channel_switch_timer_handler, 0,
LIM_CHANNEL_SWITCH_TIMER_TICKS,
@ -71,9 +71,9 @@ static bool lim_create_non_ap_timers(tpAniSirGlobal pMac)
}
cfgValue = SYS_MS_TO_TICKS(
pMac->mlme_cfg->timeouts.join_failure_timeout);
mac->mlme_cfg->timeouts.join_failure_timeout);
/* Create Join failure timer and activate it later */
if (tx_timer_create(pMac, &pMac->lim.limTimers.gLimJoinFailureTimer,
if (tx_timer_create(mac, &mac->lim.limTimers.gLimJoinFailureTimer,
"JOIN FAILURE TIMEOUT",
lim_timer_handler, SIR_LIM_JOIN_FAIL_TIMEOUT,
cfgValue, 0,
@ -84,8 +84,8 @@ static bool lim_create_non_ap_timers(tpAniSirGlobal pMac)
return false;
}
/* Send unicast probe req frame every 200 ms */
if (tx_timer_create(pMac,
&pMac->lim.limTimers.gLimPeriodicJoinProbeReqTimer,
if (tx_timer_create(mac,
&mac->lim.limTimers.gLimPeriodicJoinProbeReqTimer,
"Periodic Join Probe Request Timer",
lim_timer_handler,
SIR_LIM_PERIODIC_JOIN_PROBE_REQ_TIMEOUT,
@ -96,8 +96,8 @@ static bool lim_create_non_ap_timers(tpAniSirGlobal pMac)
}
/* Send Auth frame every 60 ms */
if ((tx_timer_create(pMac,
&pMac->lim.limTimers.g_lim_periodic_auth_retry_timer,
if ((tx_timer_create(mac,
&mac->lim.limTimers.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,
@ -107,9 +107,9 @@ static bool lim_create_non_ap_timers(tpAniSirGlobal pMac)
}
cfgValue = SYS_MS_TO_TICKS(
pMac->mlme_cfg->timeouts.assoc_failure_timeout);
mac->mlme_cfg->timeouts.assoc_failure_timeout);
/* Create Association failure timer and activate it later */
if (tx_timer_create(pMac, &pMac->lim.limTimers.gLimAssocFailureTimer,
if (tx_timer_create(mac, &mac->lim.limTimers.gLimAssocFailureTimer,
"ASSOC FAILURE TIMEOUT",
lim_assoc_failure_timer_handler, LIM_ASSOC,
cfgValue, 0, TX_NO_ACTIVATE) != TX_SUCCESS) {
@ -117,10 +117,10 @@ static bool lim_create_non_ap_timers(tpAniSirGlobal pMac)
return false;
}
cfgValue = SYS_MS_TO_TICKS(pMac->mlme_cfg->timeouts.addts_rsp_timeout);
cfgValue = SYS_MS_TO_TICKS(mac->mlme_cfg->timeouts.addts_rsp_timeout);
/* Create Addts response timer and activate it later */
if (tx_timer_create(pMac, &pMac->lim.limTimers.gLimAddtsRspTimer,
if (tx_timer_create(mac, &mac->lim.limTimers.gLimAddtsRspTimer,
"ADDTS RSP TIMEOUT",
lim_addts_response_timer_handler,
SIR_LIM_ADDTS_RSP_TIMEOUT,
@ -130,9 +130,9 @@ static bool lim_create_non_ap_timers(tpAniSirGlobal pMac)
}
cfgValue = SYS_MS_TO_TICKS(
pMac->mlme_cfg->timeouts.auth_failure_timeout);
mac->mlme_cfg->timeouts.auth_failure_timeout);
/* Create Auth failure timer and activate it later */
if (tx_timer_create(pMac, &pMac->lim.limTimers.gLimAuthFailureTimer,
if (tx_timer_create(mac, &mac->lim.limTimers.gLimAuthFailureTimer,
"AUTH FAILURE TIMEOUT",
lim_timer_handler,
SIR_LIM_AUTH_FAIL_TIMEOUT,
@ -143,8 +143,8 @@ static bool lim_create_non_ap_timers(tpAniSirGlobal pMac)
/* Change timer to reactivate it in future */
cfgValue = SYS_MS_TO_TICKS(
pMac->mlme_cfg->timeouts.probe_after_hb_fail_timeout);
if (tx_timer_create(pMac, &pMac->lim.limTimers.gLimProbeAfterHBTimer,
mac->mlme_cfg->timeouts.probe_after_hb_fail_timeout);
if (tx_timer_create(mac, &mac->lim.limTimers.gLimProbeAfterHBTimer,
"Probe after Heartbeat TIMEOUT",
lim_timer_handler,
SIR_LIM_PROBE_HB_FAILURE_TIMEOUT,
@ -157,8 +157,8 @@ static bool lim_create_non_ap_timers(tpAniSirGlobal pMac)
* SAE auth timer of 5secs. This is required for duration of entire SAE
* authentication.
*/
if ((tx_timer_create(pMac,
&pMac->lim.limTimers.sae_auth_timer,
if ((tx_timer_create(mac,
&mac->lim.limTimers.sae_auth_timer,
"SAE AUTH Timer",
lim_timer_handler, SIR_LIM_AUTH_SAE_TIMEOUT,
SYS_MS_TO_TICKS(LIM_AUTH_SAE_TIMER_MS), 0,
@ -172,7 +172,7 @@ static bool lim_create_non_ap_timers(tpAniSirGlobal pMac)
/**
* lim_create_timers()
*
* @pMac : Pointer to Global MAC structure
* @mac : Pointer to Global MAC structure
*
* This function is called upon receiving
* 1. SME_START_REQ for STA in ESS role
@ -181,25 +181,25 @@ static bool lim_create_non_ap_timers(tpAniSirGlobal pMac)
* @return : status of operation
*/
uint32_t lim_create_timers(tpAniSirGlobal pMac)
uint32_t lim_create_timers(tpAniSirGlobal mac)
{
uint32_t cfgValue, i = 0;
pe_debug("Creating Timers used by LIM module in Role: %d",
pMac->lim.gLimSystemRole);
mac->lim.gLimSystemRole);
/* Create timers required for host roaming feature */
if (TX_SUCCESS != lim_create_timers_host_roam(pMac))
if (TX_SUCCESS != lim_create_timers_host_roam(mac))
return TX_TIMER_ERROR;
if (pMac->lim.gLimSystemRole != eLIM_AP_ROLE)
if (false == lim_create_non_ap_timers(pMac))
if (mac->lim.gLimSystemRole != eLIM_AP_ROLE)
if (false == lim_create_non_ap_timers(mac))
goto err_timer;
cfgValue = pMac->mlme_cfg->sta.wait_cnf_timeout;
cfgValue = mac->mlme_cfg->sta.wait_cnf_timeout;
cfgValue = SYS_MS_TO_TICKS(cfgValue);
for (i = 0; i < (pMac->lim.maxStation + 1); i++) {
if (tx_timer_create(pMac,
&pMac->lim.limTimers.gpLimCnfWaitTimer[i],
for (i = 0; i < (mac->lim.maxStation + 1); i++) {
if (tx_timer_create(mac,
&mac->lim.limTimers.gpLimCnfWaitTimer[i],
"CNF_MISS_TIMEOUT",
lim_cnf_wait_tmer_handler,
(uint32_t) i, cfgValue,
@ -210,29 +210,29 @@ uint32_t lim_create_timers(tpAniSirGlobal pMac)
}
/* Alloc and init table for the preAuth timer list */
cfgValue = pMac->mlme_cfg->lfr.max_num_pre_auth;
pMac->lim.gLimPreAuthTimerTable.numEntry = cfgValue;
pMac->lim.gLimPreAuthTimerTable.pTable =
cfgValue = mac->mlme_cfg->lfr.max_num_pre_auth;
mac->lim.gLimPreAuthTimerTable.numEntry = cfgValue;
mac->lim.gLimPreAuthTimerTable.pTable =
qdf_mem_malloc(cfgValue * sizeof(tLimPreAuthNode *));
if (!pMac->lim.gLimPreAuthTimerTable.pTable)
if (!mac->lim.gLimPreAuthTimerTable.pTable)
goto err_timer;
for (i = 0; i < cfgValue; i++) {
pMac->lim.gLimPreAuthTimerTable.pTable[i] =
mac->lim.gLimPreAuthTimerTable.pTable[i] =
qdf_mem_malloc(sizeof(tLimPreAuthNode));
if (pMac->lim.gLimPreAuthTimerTable.pTable[i] == NULL) {
pMac->lim.gLimPreAuthTimerTable.numEntry = 0;
if (mac->lim.gLimPreAuthTimerTable.pTable[i] == NULL) {
mac->lim.gLimPreAuthTimerTable.numEntry = 0;
goto err_timer;
}
}
lim_init_pre_auth_timer_table(pMac, &pMac->lim.gLimPreAuthTimerTable);
lim_init_pre_auth_timer_table(mac, &mac->lim.gLimPreAuthTimerTable);
pe_debug("alloc and init table for preAuth timers");
cfgValue = SYS_MS_TO_TICKS(
pMac->mlme_cfg->timeouts.olbc_detect_timeout);
if (tx_timer_create(pMac, &pMac->lim.limTimers.gLimUpdateOlbcCacheTimer,
mac->mlme_cfg->timeouts.olbc_detect_timeout);
if (tx_timer_create(mac, &mac->lim.limTimers.gLimUpdateOlbcCacheTimer,
"OLBC UPDATE CACHE TIMEOUT",
lim_update_olbc_cache_timer_handler,
SIR_LIM_UPDATE_OLBC_CACHEL_TIMEOUT, cfgValue,
@ -243,7 +243,7 @@ uint32_t lim_create_timers(tpAniSirGlobal pMac)
cfgValue = 1000;
cfgValue = SYS_MS_TO_TICKS(cfgValue);
if (tx_timer_create(pMac, &pMac->lim.limTimers.gLimDisassocAckTimer,
if (tx_timer_create(mac, &mac->lim.limTimers.gLimDisassocAckTimer,
"DISASSOC ACK TIMEOUT",
lim_timer_handler, SIR_LIM_DISASSOC_ACK_TIMEOUT,
cfgValue, 0, TX_NO_ACTIVATE) != TX_SUCCESS) {
@ -253,7 +253,7 @@ uint32_t lim_create_timers(tpAniSirGlobal pMac)
cfgValue = 1000;
cfgValue = SYS_MS_TO_TICKS(cfgValue);
if (tx_timer_create(pMac, &pMac->lim.limTimers.gLimDeauthAckTimer,
if (tx_timer_create(mac, &mac->lim.limTimers.gLimDeauthAckTimer,
"DISASSOC ACK TIMEOUT",
lim_timer_handler, SIR_LIM_DEAUTH_ACK_TIMEOUT,
cfgValue, 0, TX_NO_ACTIVATE) != TX_SUCCESS) {
@ -263,8 +263,8 @@ uint32_t lim_create_timers(tpAniSirGlobal pMac)
cfgValue = ACTIVE_TO_PASSIVE_CONVERISON_TIMEOUT;
cfgValue = SYS_MS_TO_TICKS(cfgValue);
if (tx_timer_create(pMac,
&pMac->lim.limTimers.gLimActiveToPassiveChannelTimer,
if (tx_timer_create(mac,
&mac->lim.limTimers.gLimActiveToPassiveChannelTimer,
"ACTIVE TO PASSIVE CHANNEL", lim_timer_handler,
SIR_LIM_CONVERT_ACTIVE_CHANNEL_TO_PASSIVE, cfgValue, 0,
TX_NO_ACTIVATE) != TX_SUCCESS) {
@ -275,29 +275,29 @@ uint32_t lim_create_timers(tpAniSirGlobal pMac)
return TX_SUCCESS;
err_timer:
lim_delete_timers_host_roam(pMac);
tx_timer_delete(&pMac->lim.limTimers.gLimDeauthAckTimer);
tx_timer_delete(&pMac->lim.limTimers.gLimDisassocAckTimer);
tx_timer_delete(&pMac->lim.limTimers.gLimUpdateOlbcCacheTimer);
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);
while (((int32_t)-- i) >= 0) {
tx_timer_delete(&pMac->lim.limTimers.gpLimCnfWaitTimer[i]);
tx_timer_delete(&mac->lim.limTimers.gpLimCnfWaitTimer[i]);
}
tx_timer_delete(&pMac->lim.limTimers.gLimProbeAfterHBTimer);
tx_timer_delete(&pMac->lim.limTimers.gLimAuthFailureTimer);
tx_timer_delete(&pMac->lim.limTimers.gLimAddtsRspTimer);
tx_timer_delete(&pMac->lim.limTimers.gLimAssocFailureTimer);
tx_timer_delete(&pMac->lim.limTimers.gLimJoinFailureTimer);
tx_timer_delete(&pMac->lim.limTimers.gLimPeriodicJoinProbeReqTimer);
tx_timer_delete(&pMac->lim.limTimers.g_lim_periodic_auth_retry_timer);
tx_timer_delete(&pMac->lim.limTimers.gLimChannelSwitchTimer);
tx_timer_delete(&pMac->lim.limTimers.gLimActiveToPassiveChannelTimer);
tx_timer_delete(&pMac->lim.limTimers.sae_auth_timer);
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.gLimActiveToPassiveChannelTimer);
tx_timer_delete(&mac->lim.limTimers.sae_auth_timer);
if (NULL != pMac->lim.gLimPreAuthTimerTable.pTable) {
for (i = 0; i < pMac->lim.gLimPreAuthTimerTable.numEntry; i++)
qdf_mem_free(pMac->lim.gLimPreAuthTimerTable.pTable[i]);
qdf_mem_free(pMac->lim.gLimPreAuthTimerTable.pTable);
pMac->lim.gLimPreAuthTimerTable.pTable = NULL;
if (NULL != mac->lim.gLimPreAuthTimerTable.pTable) {
for (i = 0; i < mac->lim.gLimPreAuthTimerTable.numEntry; i++)
qdf_mem_free(mac->lim.gLimPreAuthTimerTable.pTable[i]);
qdf_mem_free(mac->lim.gLimPreAuthTimerTable.pTable);
mac->lim.gLimPreAuthTimerTable.pTable = NULL;
}
return TX_TIMER_ERROR;
} /****** end lim_create_timers() ******/
@ -332,7 +332,7 @@ void lim_timer_handler(void *pMacGlobal, uint32_t param)
{
QDF_STATUS status;
struct scheduler_msg msg = {0};
tpAniSirGlobal pMac = (tpAniSirGlobal) pMacGlobal;
tpAniSirGlobal mac = (tpAniSirGlobal) pMacGlobal;
/* Prepare and post message to LIM Message Queue */
@ -340,7 +340,7 @@ void lim_timer_handler(void *pMacGlobal, uint32_t param)
msg.bodyptr = NULL;
msg.bodyval = 0;
status = lim_post_msg_high_priority(pMac, &msg);
status = lim_post_msg_high_priority(mac, &msg);
if (status != QDF_STATUS_SUCCESS)
pe_err("posting message: %X to LIM failed, reason: %d",
msg.type, status);
@ -370,7 +370,7 @@ void lim_timer_handler(void *pMacGlobal, uint32_t param)
void lim_addts_response_timer_handler(void *pMacGlobal, uint32_t param)
{
struct scheduler_msg msg = {0};
tpAniSirGlobal pMac = (tpAniSirGlobal) pMacGlobal;
tpAniSirGlobal mac = (tpAniSirGlobal) pMacGlobal;
/* Prepare and post message to LIM Message Queue */
@ -378,7 +378,7 @@ void lim_addts_response_timer_handler(void *pMacGlobal, uint32_t param)
msg.bodyval = param;
msg.bodyptr = NULL;
lim_post_msg_api(pMac, &msg);
lim_post_msg_api(mac, &msg);
} /****** end lim_auth_response_timer_handler() ******/
/**
@ -405,7 +405,7 @@ void lim_addts_response_timer_handler(void *pMacGlobal, uint32_t param)
void lim_auth_response_timer_handler(void *pMacGlobal, uint32_t param)
{
struct scheduler_msg msg = {0};
tpAniSirGlobal pMac = (tpAniSirGlobal) pMacGlobal;
tpAniSirGlobal mac = (tpAniSirGlobal) pMacGlobal;
/* Prepare and post message to LIM Message Queue */
@ -413,7 +413,7 @@ void lim_auth_response_timer_handler(void *pMacGlobal, uint32_t param)
msg.bodyptr = NULL;
msg.bodyval = (uint32_t) param;
lim_post_msg_api(pMac, &msg);
lim_post_msg_api(mac, &msg);
} /****** end lim_auth_response_timer_handler() ******/
/**
@ -486,7 +486,7 @@ void lim_assoc_failure_timer_handler(void *mac_global, uint32_t param)
void lim_update_olbc_cache_timer_handler(void *pMacGlobal, uint32_t param)
{
struct scheduler_msg msg = {0};
tpAniSirGlobal pMac = (tpAniSirGlobal) pMacGlobal;
tpAniSirGlobal mac = (tpAniSirGlobal) pMacGlobal;
/* Prepare and post message to LIM Message Queue */
@ -494,7 +494,7 @@ void lim_update_olbc_cache_timer_handler(void *pMacGlobal, uint32_t param)
msg.bodyval = 0;
msg.bodyptr = NULL;
lim_post_msg_api(pMac, &msg);
lim_post_msg_api(mac, &msg);
} /****** end lim_update_olbc_cache_timer_handler() ******/
/**
@ -512,14 +512,14 @@ void lim_update_olbc_cache_timer_handler(void *pMacGlobal, uint32_t param)
***NOTE:
* NA
*
* @param pMac - Pointer to Global MAC structure
* @param mac - Pointer to Global MAC structure
* @param timerId - enum of timer to be deactivated and changed
* This enum is defined in lim_utils.h file
*
* @return None
*/
void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId)
void lim_deactivate_and_change_timer(tpAniSirGlobal mac, uint32_t timerId)
{
uint32_t val = 0;
tpPESession session_entry;
@ -527,12 +527,12 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId)
switch (timerId) {
case eLIM_REASSOC_FAIL_TIMER:
case eLIM_FT_PREAUTH_RSP_TIMER:
lim_deactivate_and_change_timer_host_roam(pMac, timerId);
lim_deactivate_and_change_timer_host_roam(mac, timerId);
break;
case eLIM_ADDTS_RSP_TIMER:
pMac->lim.gLimAddtsRspTimerCount++;
if (tx_timer_deactivate(&pMac->lim.limTimers.gLimAddtsRspTimer)
mac->lim.gLimAddtsRspTimerCount++;
if (tx_timer_deactivate(&mac->lim.limTimers.gLimAddtsRspTimer)
!= TX_SUCCESS) {
/* Could not deactivate AddtsRsp Timer */
/* Log error */
@ -542,7 +542,7 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId)
case eLIM_JOIN_FAIL_TIMER:
if (tx_timer_deactivate
(&pMac->lim.limTimers.gLimJoinFailureTimer)
(&mac->lim.limTimers.gLimJoinFailureTimer)
!= TX_SUCCESS) {
/**
* Could not deactivate Join Failure
@ -552,9 +552,9 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId)
}
val = SYS_MS_TO_TICKS(
pMac->mlme_cfg->timeouts.join_failure_timeout);
mac->mlme_cfg->timeouts.join_failure_timeout);
if (tx_timer_change(&pMac->lim.limTimers.gLimJoinFailureTimer,
if (tx_timer_change(&mac->lim.limTimers.gLimJoinFailureTimer,
val, 0) != TX_SUCCESS) {
/**
* Could not change Join Failure
@ -567,7 +567,7 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId)
case eLIM_PERIODIC_JOIN_PROBE_REQ_TIMER:
if (tx_timer_deactivate
(&pMac->lim.limTimers.gLimPeriodicJoinProbeReqTimer)
(&mac->lim.limTimers.gLimPeriodicJoinProbeReqTimer)
!= TX_SUCCESS) {
/* Could not deactivate periodic join req Times. */
pe_err("Unable to deactivate periodic join request timer");
@ -575,7 +575,7 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId)
val = SYS_MS_TO_TICKS(LIM_JOIN_PROBE_REQ_TIMER_MS);
if (tx_timer_change
(&pMac->lim.limTimers.gLimPeriodicJoinProbeReqTimer, val,
(&mac->lim.limTimers.gLimPeriodicJoinProbeReqTimer, val,
0) != TX_SUCCESS) {
/* Could not change periodic join req times. */
/* Log error */
@ -586,7 +586,7 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId)
case eLIM_AUTH_FAIL_TIMER:
if (tx_timer_deactivate
(&pMac->lim.limTimers.gLimAuthFailureTimer)
(&mac->lim.limTimers.gLimAuthFailureTimer)
!= TX_SUCCESS) {
/* Could not deactivate Auth failure timer. */
/* Log error */
@ -594,9 +594,9 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId)
}
/* Change timer to reactivate it in future */
val = SYS_MS_TO_TICKS(
pMac->mlme_cfg->timeouts.auth_failure_timeout);
mac->mlme_cfg->timeouts.auth_failure_timeout);
if (tx_timer_change(&pMac->lim.limTimers.gLimAuthFailureTimer,
if (tx_timer_change(&mac->lim.limTimers.gLimAuthFailureTimer,
val, 0) != TX_SUCCESS) {
/* Could not change Authentication failure timer. */
/* Log error */
@ -608,17 +608,17 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId)
case eLIM_AUTH_RETRY_TIMER:
if (tx_timer_deactivate
(&pMac->lim.limTimers.g_lim_periodic_auth_retry_timer)
(&mac->lim.limTimers.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(pMac,
pMac->lim.limTimers.
session_entry = pe_find_session_by_session_id(mac,
mac->lim.limTimers.
g_lim_periodic_auth_retry_timer.sessionId);
if (NULL == session_entry) {
pe_err("session does not exist for given SessionId : %d",
pMac->lim.limTimers.
mac->lim.limTimers.
g_lim_periodic_auth_retry_timer.sessionId);
break;
}
@ -626,7 +626,7 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId)
val = (session_entry->beaconParams.beaconInterval * 3) / 5;
val = SYS_MS_TO_TICKS(val);
if (tx_timer_change
(&pMac->lim.limTimers.g_lim_periodic_auth_retry_timer,
(&mac->lim.limTimers.g_lim_periodic_auth_retry_timer,
val, 0) != TX_SUCCESS) {
/* Could not change Auth Retry timer. */
pe_err("Unable to change Auth Retry timer");
@ -635,7 +635,7 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId)
case eLIM_ASSOC_FAIL_TIMER:
if (tx_timer_deactivate
(&pMac->lim.limTimers.gLimAssocFailureTimer) !=
(&mac->lim.limTimers.gLimAssocFailureTimer) !=
TX_SUCCESS) {
/* Could not deactivate Association failure timer. */
/* Log error */
@ -643,9 +643,9 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId)
}
/* Change timer to reactivate it in future */
val = SYS_MS_TO_TICKS(
pMac->mlme_cfg->timeouts.assoc_failure_timeout);
mac->mlme_cfg->timeouts.assoc_failure_timeout);
if (tx_timer_change(&pMac->lim.limTimers.gLimAssocFailureTimer,
if (tx_timer_change(&mac->lim.limTimers.gLimAssocFailureTimer,
val, 0) != TX_SUCCESS) {
/* Could not change Association failure timer. */
/* Log error */
@ -656,7 +656,7 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId)
case eLIM_PROBE_AFTER_HB_TIMER:
if (tx_timer_deactivate
(&pMac->lim.limTimers.gLimProbeAfterHBTimer) !=
(&mac->lim.limTimers.gLimProbeAfterHBTimer) !=
TX_SUCCESS) {
/* Could not deactivate Heartbeat timer. */
/* Log error */
@ -667,9 +667,9 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId)
/* Change timer to reactivate it in future */
val = SYS_MS_TO_TICKS(
pMac->mlme_cfg->timeouts.probe_after_hb_fail_timeout);
mac->mlme_cfg->timeouts.probe_after_hb_fail_timeout);
if (tx_timer_change(&pMac->lim.limTimers.gLimProbeAfterHBTimer,
if (tx_timer_change(&mac->lim.limTimers.gLimProbeAfterHBTimer,
val, 0) != TX_SUCCESS) {
/* Could not change HeartBeat timer. */
/* Log error */
@ -686,7 +686,7 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId)
case eLIM_CONVERT_ACTIVE_CHANNEL_TO_PASSIVE:
if (tx_timer_deactivate
(&pMac->lim.limTimers.gLimActiveToPassiveChannelTimer) !=
(&mac->lim.limTimers.gLimActiveToPassiveChannelTimer) !=
TX_SUCCESS) {
/**
** Could not deactivate Active to passive channel timer.
@ -698,7 +698,7 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId)
val = ACTIVE_TO_PASSIVE_CONVERISON_TIMEOUT;
val = SYS_MS_TO_TICKS(val);
if (tx_timer_change
(&pMac->lim.limTimers.gLimActiveToPassiveChannelTimer, val,
(&mac->lim.limTimers.gLimActiveToPassiveChannelTimer, val,
0) != TX_SUCCESS) {
/**
* Could not change timer to check scan type for passive channel.
@ -711,7 +711,7 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId)
case eLIM_DISASSOC_ACK_TIMER:
if (tx_timer_deactivate
(&pMac->lim.limTimers.gLimDisassocAckTimer) != TX_SUCCESS) {
(&mac->lim.limTimers.gLimDisassocAckTimer) != TX_SUCCESS) {
/**
** Could not deactivate Join Failure
** timer. Log error.
@ -721,7 +721,7 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId)
}
val = 1000;
val = SYS_MS_TO_TICKS(val);
if (tx_timer_change(&pMac->lim.limTimers.gLimDisassocAckTimer,
if (tx_timer_change(&mac->lim.limTimers.gLimDisassocAckTimer,
val, 0) != TX_SUCCESS) {
/**
* Could not change Join Failure
@ -733,7 +733,7 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId)
break;
case eLIM_DEAUTH_ACK_TIMER:
if (tx_timer_deactivate(&pMac->lim.limTimers.gLimDeauthAckTimer)
if (tx_timer_deactivate(&mac->lim.limTimers.gLimDeauthAckTimer)
!= TX_SUCCESS) {
/**
** Could not deactivate Join Failure
@ -744,7 +744,7 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId)
}
val = 1000;
val = SYS_MS_TO_TICKS(val);
if (tx_timer_change(&pMac->lim.limTimers.gLimDeauthAckTimer,
if (tx_timer_change(&mac->lim.limTimers.gLimDeauthAckTimer,
val, 0) != TX_SUCCESS) {
/**
* Could not change Join Failure
@ -757,14 +757,14 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId)
case eLIM_AUTH_SAE_TIMER:
if (tx_timer_deactivate
(&pMac->lim.limTimers.sae_auth_timer)
(&mac->lim.limTimers.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(&pMac->lim.limTimers.sae_auth_timer,
if (tx_timer_change(&mac->lim.limTimers.sae_auth_timer,
val, 0) != TX_SUCCESS)
pe_err("unable to change SAE auth timer");
@ -790,7 +790,7 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId)
*
* @note staId for eLIM_AUTH_RSP_TIMER is auth Node Index.
*
* @param pMac - Pointer to Global MAC structure
* @param mac - Pointer to Global MAC structure
* @param timerId - enum of timer to be deactivated and changed
* This enum is defined in lim_utils.h file
* @param staId - staId
@ -799,7 +799,7 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId)
*/
void
lim_deactivate_and_change_per_sta_id_timer(tpAniSirGlobal pMac, uint32_t timerId,
lim_deactivate_and_change_per_sta_id_timer(tpAniSirGlobal mac, uint32_t timerId,
uint16_t staId)
{
uint32_t val;
@ -808,16 +808,16 @@ lim_deactivate_and_change_per_sta_id_timer(tpAniSirGlobal pMac, uint32_t timerId
case eLIM_CNF_WAIT_TIMER:
if (tx_timer_deactivate
(&pMac->lim.limTimers.gpLimCnfWaitTimer[staId])
(&mac->lim.limTimers.gpLimCnfWaitTimer[staId])
!= TX_SUCCESS) {
pe_err("unable to deactivate CNF wait timer");
}
/* Change timer to reactivate it in future */
val = pMac->mlme_cfg->sta.wait_cnf_timeout;
val = mac->mlme_cfg->sta.wait_cnf_timeout;
val = SYS_MS_TO_TICKS(val);
if (tx_timer_change
(&pMac->lim.limTimers.gpLimCnfWaitTimer[staId], val,
(&mac->lim.limTimers.gpLimCnfWaitTimer[staId], val,
val) != TX_SUCCESS) {
/* Could not change cnf timer. */
/* Log error */
@ -831,8 +831,8 @@ lim_deactivate_and_change_per_sta_id_timer(tpAniSirGlobal pMac, uint32_t timerId
tLimPreAuthNode *pAuthNode;
pAuthNode =
lim_get_pre_auth_node_from_index(pMac,
&pMac->lim.
lim_get_pre_auth_node_from_index(mac,
&mac->lim.
gLimPreAuthTimerTable,
staId);
@ -850,7 +850,7 @@ lim_deactivate_and_change_per_sta_id_timer(tpAniSirGlobal pMac, uint32_t timerId
}
/* Change timer to reactivate it in future */
val = SYS_MS_TO_TICKS(
pMac->mlme_cfg->timeouts.auth_rsp_timeout);
mac->mlme_cfg->timeouts.auth_rsp_timeout);
if (tx_timer_change(&pAuthNode->timer, val, 0) !=
TX_SUCCESS) {
@ -882,18 +882,18 @@ lim_deactivate_and_change_per_sta_id_timer(tpAniSirGlobal pMac, uint32_t timerId
***NOTE:
* NA
*
* @param pMac - Pointer to Global MAC structure
* @param mac - Pointer to Global MAC structure
* @param StaId - staId
*
* @return None
*/
void lim_activate_cnf_timer(tpAniSirGlobal pMac, uint16_t staId,
void lim_activate_cnf_timer(tpAniSirGlobal mac, uint16_t staId,
tpPESession psessionEntry)
{
pMac->lim.limTimers.gpLimCnfWaitTimer[staId].sessionId =
mac->lim.limTimers.gpLimCnfWaitTimer[staId].sessionId =
psessionEntry->peSessionId;
if (tx_timer_activate(&pMac->lim.limTimers.gpLimCnfWaitTimer[staId])
if (tx_timer_activate(&mac->lim.limTimers.gpLimCnfWaitTimer[staId])
!= TX_SUCCESS) {
pe_err("could not activate cnf wait timer");
}
@ -913,13 +913,13 @@ void lim_activate_cnf_timer(tpAniSirGlobal pMac, uint16_t staId,
***NOTE:
* NA
*
* @param pMac - Pointer to Global MAC structure
* @param mac - Pointer to Global MAC structure
* @param id - id
*
* @return None
*/
void lim_activate_auth_rsp_timer(tpAniSirGlobal pMac, tLimPreAuthNode *pAuthNode)
void lim_activate_auth_rsp_timer(tpAniSirGlobal mac, tLimPreAuthNode *pAuthNode)
{
if (tx_timer_activate(&pAuthNode->timer) != TX_SUCCESS) {
/* / Could not activate auth rsp timer. */
@ -950,13 +950,13 @@ void lim_cnf_wait_tmer_handler(void *pMacGlobal, uint32_t param)
{
struct scheduler_msg msg = {0};
uint32_t statusCode;
tpAniSirGlobal pMac = (tpAniSirGlobal) pMacGlobal;
tpAniSirGlobal mac = (tpAniSirGlobal) pMacGlobal;
msg.type = SIR_LIM_CNF_WAIT_TIMEOUT;
msg.bodyval = (uint32_t) param;
msg.bodyptr = NULL;
statusCode = lim_post_msg_api(pMac, &msg);
statusCode = lim_post_msg_api(mac, &msg);
if (statusCode != QDF_STATUS_SUCCESS)
pe_err("posting to LIM failed, reason: %d", statusCode);
@ -965,7 +965,7 @@ void lim_cnf_wait_tmer_handler(void *pMacGlobal, uint32_t param)
void lim_channel_switch_timer_handler(void *pMacGlobal, uint32_t param)
{
struct scheduler_msg msg = {0};
tpAniSirGlobal pMac = (tpAniSirGlobal) pMacGlobal;
tpAniSirGlobal mac = (tpAniSirGlobal) pMacGlobal;
pe_debug("ChannelSwitch Timer expired. Posting msg to LIM");
@ -973,5 +973,5 @@ void lim_channel_switch_timer_handler(void *pMacGlobal, uint32_t param)
msg.bodyval = (uint32_t) param;
msg.bodyptr = NULL;
lim_post_msg_api(pMac, &msg);
lim_post_msg_api(mac, &msg);
}