diff options
| -rw-r--r-- | core/mac/src/pe/lim/lim_timer_utils.c | 238 |
1 files changed, 84 insertions, 154 deletions
diff --git a/core/mac/src/pe/lim/lim_timer_utils.c b/core/mac/src/pe/lim/lim_timer_utils.c index 61750b8ef2ef..14e71a082d6b 100644 --- a/core/mac/src/pe/lim/lim_timer_utils.c +++ b/core/mac/src/pe/lim/lim_timer_utils.c @@ -68,7 +68,7 @@ static bool lim_create_non_ap_timers(tpAniSirGlobal pMac) lim_channel_switch_timer_handler, 0, LIM_CHANNEL_SWITCH_TIMER_TICKS, 0, TX_NO_ACTIVATE) != TX_SUCCESS) { - lim_log(pMac, LOGE, FL("failed to create Ch Switch timer")); + pe_err("failed to create Ch Switch timer"); return false; } /* Create Quiet Timer @@ -79,7 +79,7 @@ static bool lim_create_non_ap_timers(tpAniSirGlobal pMac) "QUIET TIMER", lim_quiet_timer_handler, SIR_LIM_QUIET_TIMEOUT, LIM_QUIET_TIMER_TICKS, 0, TX_NO_ACTIVATE) != TX_SUCCESS) { - lim_log(pMac, LOGE, FL("failed to create Quiet Begin Timer")); + pe_err("failed to create Quiet Begin Timer"); return false; } /* Create Quiet BSS Timer @@ -91,14 +91,13 @@ static bool lim_create_non_ap_timers(tpAniSirGlobal pMac) "QUIET BSS TIMER", lim_quiet_bss_timer_handler, SIR_LIM_QUIET_BSS_TIMEOUT, LIM_QUIET_BSS_TIMER_TICK, 0, TX_NO_ACTIVATE) != TX_SUCCESS) { - lim_log(pMac, LOGE, FL("failed to create Quiet Bss Timer")); + pe_err("failed to create Quiet Bss Timer"); return false; } if (wlan_cfg_get_int(pMac, WNI_CFG_JOIN_FAILURE_TIMEOUT, &cfgValue) != eSIR_SUCCESS) - lim_log(pMac, LOGE, - FL("could not retrieve JoinFailureTimeout value")); + pe_err("could not retrieve JoinFailureTimeout value"); cfgValue = SYS_MS_TO_TICKS(cfgValue); /* Create Join failure timer and activate it later */ if (tx_timer_create(pMac, &pMac->lim.limTimers.gLimJoinFailureTimer, @@ -108,8 +107,7 @@ static bool lim_create_non_ap_timers(tpAniSirGlobal pMac) TX_NO_ACTIVATE) != TX_SUCCESS) { /* / Could not create Join failure timer. */ /* Log error */ - lim_log(pMac, LOGE, - FL("could not create Join failure timer")); + pe_err("could not create Join failure timer"); return false; } /* Send unicast probe req frame every 200 ms */ @@ -120,8 +118,7 @@ static bool lim_create_non_ap_timers(tpAniSirGlobal pMac) SIR_LIM_PERIODIC_JOIN_PROBE_REQ_TIMEOUT, SYS_MS_TO_TICKS(LIM_JOIN_PROBE_REQ_TIMER_MS), 0, TX_NO_ACTIVATE) != TX_SUCCESS) { - lim_log(pMac, LOGE, - FL("could not create Periodic Join Probe Request tmr")); + pe_err("could not create Periodic Join Probe Request tmr"); return false; } @@ -132,15 +129,13 @@ static bool lim_create_non_ap_timers(tpAniSirGlobal pMac) lim_timer_handler, SIR_LIM_AUTH_RETRY_TIMEOUT, SYS_MS_TO_TICKS(LIM_AUTH_RETRY_TIMER_MS), 0, TX_NO_ACTIVATE)) != TX_SUCCESS) { - lim_log(pMac, LOGE, - FL("could not create Periodic AUTH Timer")); + pe_err("could not create Periodic AUTH Timer"); return false; } if (wlan_cfg_get_int(pMac, WNI_CFG_ASSOCIATION_FAILURE_TIMEOUT, &cfgValue) != eSIR_SUCCESS) - lim_log(pMac, LOGE, - FL("could not retrieve AssocFailureTimeout value")); + pe_err("could not retrieve AssocFailureTimeout value"); cfgValue = SYS_MS_TO_TICKS(cfgValue); /* Create Association failure timer and activate it later */ @@ -148,15 +143,13 @@ static bool lim_create_non_ap_timers(tpAniSirGlobal pMac) "ASSOC FAILURE TIMEOUT", lim_assoc_failure_timer_handler, LIM_ASSOC, cfgValue, 0, TX_NO_ACTIVATE) != TX_SUCCESS) { - lim_log(pMac, LOGE, - FL("could not create Association failure timer")); + pe_err("could not create Association failure timer"); return false; } if (wlan_cfg_get_int(pMac, WNI_CFG_ADDTS_RSP_TIMEOUT, &cfgValue) != eSIR_SUCCESS) - lim_log(pMac, LOGE, - FL("Fail to get WNI_CFG_ADDTS_RSP_TIMEOUT ")); + pe_err("Fail to get WNI_CFG_ADDTS_RSP_TIMEOUT"); cfgValue = SYS_MS_TO_TICKS(cfgValue); @@ -166,15 +159,13 @@ static bool lim_create_non_ap_timers(tpAniSirGlobal pMac) lim_addts_response_timer_handler, SIR_LIM_ADDTS_RSP_TIMEOUT, cfgValue, 0, TX_NO_ACTIVATE) != TX_SUCCESS) { - lim_log(pMac, LOGE, - FL("could not create Addts response timer")); + pe_err("could not create Addts response timer"); return false; } if (wlan_cfg_get_int(pMac, WNI_CFG_AUTHENTICATE_FAILURE_TIMEOUT, &cfgValue) != eSIR_SUCCESS) - lim_log(pMac, LOGE, - FL("could not retrieve AuthFailureTimeout value")); + pe_err("could not retrieve AuthFailureTimeout value"); cfgValue = SYS_MS_TO_TICKS(cfgValue); /* Create Auth failure timer and activate it later */ @@ -183,14 +174,13 @@ static bool lim_create_non_ap_timers(tpAniSirGlobal pMac) lim_timer_handler, SIR_LIM_AUTH_FAIL_TIMEOUT, cfgValue, 0, TX_NO_ACTIVATE) != TX_SUCCESS) { - lim_log(pMac, LOGE, FL("could not create Auth failure timer")); + pe_err("could not create Auth failure timer"); return false; } if (wlan_cfg_get_int(pMac, WNI_CFG_PROBE_AFTER_HB_FAIL_TIMEOUT, &cfgValue) != eSIR_SUCCESS) - lim_log(pMac, LOGE, - FL("could not retrieve PROBE_AFTER_HB_FAIL_TIMEOUT value")); + pe_err("could not retrieve PROBE_AFTER_HB_FAIL_TIMEOUT value"); /* Change timer to reactivate it in future */ cfgValue = SYS_MS_TO_TICKS(cfgValue); @@ -199,7 +189,7 @@ static bool lim_create_non_ap_timers(tpAniSirGlobal pMac) lim_timer_handler, SIR_LIM_PROBE_HB_FAILURE_TIMEOUT, cfgValue, 0, TX_NO_ACTIVATE) != TX_SUCCESS) { - lim_log(pMac, LOGE, FL("unable to create ProbeAfterHBTimer")); + pe_err("unable to create ProbeAfterHBTimer"); return false; } @@ -222,8 +212,7 @@ uint32_t lim_create_timers(tpAniSirGlobal pMac) uint32_t cfgValue, i = 0; uint32_t cfgValue1; - lim_log(pMac, LOGD, - FL("Creating Timers used by LIM module in Role %d"), + pe_debug("Creating Timers used by LIM module in Role: %d", pMac->lim.gLimSystemRole); /* Create timers required for host roaming feature */ if (TX_SUCCESS != lim_create_timers_host_roam(pMac)) @@ -231,8 +220,7 @@ uint32_t lim_create_timers(tpAniSirGlobal pMac) if (wlan_cfg_get_int(pMac, WNI_CFG_ACTIVE_MINIMUM_CHANNEL_TIME, &cfgValue) != eSIR_SUCCESS) { - lim_log(pMac, LOGE, - FL("could not retrieve MinChannelTimeout value")); + pe_err("could not retrieve MinChannelTimeout value"); } cfgValue = SYS_MS_TO_TICKS(cfgValue); /* Periodic probe request timer value is half of the Min channel @@ -247,15 +235,13 @@ uint32_t lim_create_timers(tpAniSirGlobal pMac) "Periodic Probe Request Timer", lim_timer_handler, SIR_LIM_PERIODIC_PROBE_REQ_TIMEOUT, cfgValue1, 0, TX_NO_ACTIVATE) != TX_SUCCESS)) { - lim_log(pMac, LOGE, - FL("could not create periodic probe timer")); + pe_err("could not create periodic probe timer"); goto err_timer; } if (wlan_cfg_get_int(pMac, WNI_CFG_ACTIVE_MAXIMUM_CHANNEL_TIME, &cfgValue) != eSIR_SUCCESS) - lim_log(pMac, LOGE, - FL("could not retrieve MAXChannelTimeout value")); + pe_err("could not retrieve MAXChannelTimeout value"); cfgValue = SYS_MS_TO_TICKS(cfgValue); /* Limiting max numm of probe req for each channel scan */ @@ -268,7 +254,7 @@ uint32_t lim_create_timers(tpAniSirGlobal pMac) /* Create all CNF_WAIT Timers upfront */ if (wlan_cfg_get_int(pMac, WNI_CFG_WT_CNF_TIMEOUT, &cfgValue) != eSIR_SUCCESS) { - lim_log(pMac, LOGE, FL("could not retrieve CNF timeout value")); + pe_err("could not retrieve CNF timeout value"); } cfgValue = SYS_MS_TO_TICKS(cfgValue); @@ -279,7 +265,7 @@ uint32_t lim_create_timers(tpAniSirGlobal pMac) lim_cnf_wait_tmer_handler, (uint32_t) i, cfgValue, 0, TX_NO_ACTIVATE) != TX_SUCCESS) { - lim_log(pMac, LOGE, FL("Cannot create CNF wait timer")); + pe_err("Cannot create CNF wait timer"); goto err_timer; } } @@ -287,13 +273,13 @@ uint32_t lim_create_timers(tpAniSirGlobal pMac) /* Alloc and init table for the preAuth timer list */ if (wlan_cfg_get_int(pMac, WNI_CFG_MAX_NUM_PRE_AUTH, &cfgValue) != eSIR_SUCCESS) - lim_log(pMac, LOGE, FL("could not retrieve mac preauth value")); + pe_err("could not retrieve mac preauth value"); pMac->lim.gLimPreAuthTimerTable.numEntry = cfgValue; pMac->lim.gLimPreAuthTimerTable.pTable = qdf_mem_malloc(cfgValue * sizeof(tLimPreAuthNode *)); if (pMac->lim.gLimPreAuthTimerTable.pTable == NULL) { - lim_log(pMac, LOGE, FL("AllocateMemory failed!")); + pe_err("AllocateMemory failed!"); goto err_timer; } @@ -302,19 +288,17 @@ uint32_t lim_create_timers(tpAniSirGlobal pMac) qdf_mem_malloc(sizeof(tLimPreAuthNode)); if (pMac->lim.gLimPreAuthTimerTable.pTable[i] == NULL) { pMac->lim.gLimPreAuthTimerTable.numEntry = 0; - lim_log(pMac, LOGE, FL("AllocateMemory failed!")); + pe_err("AllocateMemory failed!"); goto err_timer; } } lim_init_pre_auth_timer_table(pMac, &pMac->lim.gLimPreAuthTimerTable); - lim_log(pMac, LOGD, - FL("alloc and init table for preAuth timers")); + pe_debug("alloc and init table for preAuth timers"); if (wlan_cfg_get_int(pMac, WNI_CFG_OLBC_DETECT_TIMEOUT, &cfgValue) != eSIR_SUCCESS) - lim_log(pMac, LOGE, - FL("could not retrieve OLBD detect timeout value")); + pe_err("could not retrieve OLBD detect timeout value"); cfgValue = SYS_MS_TO_TICKS(cfgValue); if (tx_timer_create(pMac, &pMac->lim.limTimers.gLimUpdateOlbcCacheTimer, @@ -322,7 +306,7 @@ uint32_t lim_create_timers(tpAniSirGlobal pMac) lim_update_olbc_cache_timer_handler, SIR_LIM_UPDATE_OLBC_CACHEL_TIMEOUT, cfgValue, cfgValue, TX_NO_ACTIVATE) != TX_SUCCESS) { - lim_log(pMac, LOGE, FL("Cannot create update OLBC cache tmr")); + pe_err("Cannot create update OLBC cache tmr"); goto err_timer; } cfgValue = 1000; @@ -331,7 +315,7 @@ uint32_t lim_create_timers(tpAniSirGlobal pMac) "FT PREAUTH RSP TIMEOUT", lim_timer_handler, SIR_LIM_REMAIN_CHN_TIMEOUT, cfgValue, 0, TX_NO_ACTIVATE) != TX_SUCCESS) { - lim_log(pMac, LOGE, FL("could not create Join failure timer")); + pe_err("could not create Join failure timer"); goto err_timer; } @@ -341,7 +325,7 @@ uint32_t lim_create_timers(tpAniSirGlobal pMac) "DISASSOC ACK TIMEOUT", lim_timer_handler, SIR_LIM_DISASSOC_ACK_TIMEOUT, cfgValue, 0, TX_NO_ACTIVATE) != TX_SUCCESS) { - lim_log(pMac, LOGE, FL("could not DISASSOC ACK TIMEOUT timer")); + pe_err("could not DISASSOC ACK TIMEOUT timer"); goto err_timer; } @@ -351,8 +335,7 @@ uint32_t lim_create_timers(tpAniSirGlobal pMac) "DISASSOC ACK TIMEOUT", lim_timer_handler, SIR_LIM_DEAUTH_ACK_TIMEOUT, cfgValue, 0, TX_NO_ACTIVATE) != TX_SUCCESS) { - lim_log(pMac, LOGE, - FL("could not create DEAUTH ACK TIMEOUT timer")); + pe_err("could not create DEAUTH ACK TIMEOUT timer"); goto err_timer; } @@ -367,8 +350,7 @@ uint32_t lim_create_timers(tpAniSirGlobal pMac) "Single Shot NOA Insert timeout", lim_timer_handler, SIR_LIM_INSERT_SINGLESHOT_NOA_TIMEOUT, cfgValue, 0, TX_NO_ACTIVATE) != TX_SUCCESS) { - lim_log(pMac, LOGE, - FL("Can't create Single Shot NOA Insert Timeout tmr")); + pe_err("Can't create Single Shot NOA Insert Timeout tmr"); goto err_timer; } @@ -379,8 +361,7 @@ uint32_t lim_create_timers(tpAniSirGlobal pMac) "ACTIVE TO PASSIVE CHANNEL", lim_timer_handler, SIR_LIM_CONVERT_ACTIVE_CHANNEL_TO_PASSIVE, cfgValue, 0, TX_NO_ACTIVATE) != TX_SUCCESS) { - lim_log(pMac, LOGW, - FL("could not create timer for passive channel to active channel")); + pe_warn("could not create timer for passive channel to active channel"); goto err_timer; } @@ -459,8 +440,7 @@ void lim_timer_handler(void *pMacGlobal, uint32_t param) statusCode = lim_post_msg_high_priority(pMac, &msg); if (statusCode != eSIR_SUCCESS) - lim_log(pMac, LOGE, - FL("posting message %X to LIM failed, reason=%d"), + pe_err("posting message: %X to LIM failed, reason: %d", msg.type, statusCode); } /****** end lim_timer_handler() ******/ @@ -555,19 +535,17 @@ void lim_assoc_failure_timer_handler(void *mac_global, uint32_t param) session = mac_ctx->lim.pSessionEntry; if (LIM_REASSOC == param && NULL != session && session->limMlmState == eLIM_MLM_WT_FT_REASSOC_RSP_STATE) { - lim_log(mac_ctx, LOGE, FL("Reassoc timeout happened")); + pe_err("Reassoc timeout happened"); if (mac_ctx->lim.reAssocRetryAttempt < LIM_MAX_REASSOC_RETRY_LIMIT) { lim_send_retry_reassoc_req_frame(mac_ctx, session->pLimMlmReassocRetryReq, session); mac_ctx->lim.reAssocRetryAttempt++; - lim_log(mac_ctx, LOGW, - FL("Reassoc request retry is sent %d times"), + pe_warn("Reassoc request retry is sent %d times", mac_ctx->lim.reAssocRetryAttempt); return; } else { - lim_log(mac_ctx, LOGW, - FL("Reassoc request retry MAX(%d) reached"), + pe_warn("Reassoc request retry MAX: %d reached", LIM_MAX_REASSOC_RETRY_LIMIT); if (NULL != session->pLimMlmReassocRetryReq) { qdf_mem_free(session->pLimMlmReassocRetryReq); @@ -656,8 +634,7 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId) != TX_SUCCESS) { /* Could not deactivate AddtsRsp Timer */ /* Log error */ - lim_log(pMac, LOGE, - FL("Unable to deactivate AddtsRsp timer")); + pe_err("Unable to deactivate AddtsRsp timer"); } break; @@ -667,8 +644,7 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId) != TX_SUCCESS) { /* Could not deactivate min channel timer. */ /* Log error */ - lim_log(pMac, LOGE, - FL("Unable to deactivate periodic timer")); + pe_err("Unable to deactivate periodic timer"); } val = @@ -680,14 +656,12 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId) val, 0) != TX_SUCCESS) { /* Could not change min channel timer. */ /* Log error */ - lim_log(pMac, LOGE, - FL("Unable to change periodic timer")); + pe_err("Unable to change periodic timer"); } } else - lim_log(pMac, LOGE, - FL("Do not change gLimPeriodicProbeReqTimer values," - "value = %d minchannel time = %d" - "maxchannel time = %d"), val, + pe_err("Do not change gLimPeriodicProbeReqTimer values," + "value: %d minchannel time: %d" + "maxchannel time: %d", val, pMac->lim.gpLimMlmScanReq->minChannelTime, pMac->lim.gpLimMlmScanReq->maxChannelTime); @@ -701,8 +675,7 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId) * Could not deactivate Join Failure * timer. Log error. */ - lim_log(pMac, LOGE, - FL("Unable to deactivate Join Failure timer")); + pe_err("Unable to deactivate Join Failure timer"); } if (wlan_cfg_get_int(pMac, WNI_CFG_JOIN_FAILURE_TIMEOUT, @@ -711,9 +684,7 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId) * Could not get JoinFailureTimeout value * from CFG. Log error. */ - lim_log(pMac, LOGE, - FL - ("could not retrieve JoinFailureTimeout value")); + pe_err("could not retrieve JoinFailureTimeout value"); } val = SYS_MS_TO_TICKS(val); @@ -723,8 +694,7 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId) * Could not change Join Failure * timer. Log error. */ - lim_log(pMac, LOGE, - FL("Unable to change Join Failure timer")); + pe_err("Unable to change Join Failure timer"); } break; @@ -734,9 +704,7 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId) (&pMac->lim.limTimers.gLimPeriodicJoinProbeReqTimer) != TX_SUCCESS) { /* Could not deactivate periodic join req Times. */ - lim_log(pMac, LOGE, - FL - ("Unable to deactivate periodic join request timer")); + pe_err("Unable to deactivate periodic join request timer"); } val = SYS_MS_TO_TICKS(LIM_JOIN_PROBE_REQ_TIMER_MS); @@ -745,9 +713,7 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId) 0) != TX_SUCCESS) { /* Could not change periodic join req times. */ /* Log error */ - lim_log(pMac, LOGE, - FL - ("Unable to change periodic join request timer")); + pe_err("Unable to change periodic join request timer"); } break; @@ -758,8 +724,7 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId) != TX_SUCCESS) { /* Could not deactivate Auth failure timer. */ /* Log error */ - lim_log(pMac, LOGE, - FL("Unable to deactivate auth failure timer")); + pe_err("Unable to deactivate auth failure timer"); } /* Change timer to reactivate it in future */ if (wlan_cfg_get_int(pMac, WNI_CFG_AUTHENTICATE_FAILURE_TIMEOUT, @@ -768,9 +733,7 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId) * Could not get AuthFailureTimeout value * from CFG. Log error. */ - lim_log(pMac, LOGE, - FL - ("could not retrieve AuthFailureTimeout value")); + pe_err("could not retrieve AuthFailureTimeout value"); } val = SYS_MS_TO_TICKS(val); @@ -778,8 +741,7 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId) val, 0) != TX_SUCCESS) { /* Could not change Authentication failure timer. */ /* Log error */ - lim_log(pMac, LOGE, - FL("unable to change Auth failure timer")); + pe_err("unable to change Auth failure timer"); } break; @@ -790,15 +752,13 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId) (&pMac->lim.limTimers.g_lim_periodic_auth_retry_timer) != TX_SUCCESS) { /* Could not deactivate Auth Retry Timer. */ - lim_log(pMac, LOGE, - FL("Unable to deactivate Auth Retry timer")); + pe_err("Unable to deactivate Auth Retry timer"); } session_entry = pe_find_session_by_session_id(pMac, pMac->lim.limTimers. g_lim_periodic_auth_retry_timer.sessionId); if (NULL == session_entry) { - lim_log(pMac, LOGE, - FL("session does not exist for given SessionId : %d"), + pe_err("session does not exist for given SessionId : %d", pMac->lim.limTimers. g_lim_periodic_auth_retry_timer.sessionId); break; @@ -810,8 +770,7 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId) (&pMac->lim.limTimers.g_lim_periodic_auth_retry_timer, val, 0) != TX_SUCCESS) { /* Could not change Auth Retry timer. */ - lim_log(pMac, LOGE, - FL("Unable to change Auth Retry timer")); + pe_err("Unable to change Auth Retry timer"); } break; @@ -821,9 +780,7 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId) TX_SUCCESS) { /* Could not deactivate Association failure timer. */ /* Log error */ - lim_log(pMac, LOGE, - FL - ("unable to deactivate Association failure timer")); + pe_err("unable to deactivate Association failure timer"); } /* Change timer to reactivate it in future */ if (wlan_cfg_get_int(pMac, WNI_CFG_ASSOCIATION_FAILURE_TIMEOUT, @@ -832,9 +789,7 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId) * Could not get AssocFailureTimeout value * from CFG. Log error. */ - lim_log(pMac, LOGE, - FL - ("could not retrieve AssocFailureTimeout value")); + pe_err("could not retrieve AssocFailureTimeout value"); } val = SYS_MS_TO_TICKS(val); @@ -842,8 +797,7 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId) val, 0) != TX_SUCCESS) { /* Could not change Association failure timer. */ /* Log error */ - lim_log(pMac, LOGE, - FL("unable to change Assoc failure timer")); + pe_err("unable to change Assoc failure timer"); } break; @@ -854,11 +808,9 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId) TX_SUCCESS) { /* Could not deactivate Heartbeat timer. */ /* Log error */ - lim_log(pMac, LOGE, - FL("unable to deactivate probeAfterHBTimer")); + pe_err("unable to deactivate probeAfterHBTimer"); } else { - lim_log(pMac, LOGD, - FL("Deactivated probe after hb timer")); + pe_debug("Deactivated probe after hb timer"); } if (wlan_cfg_get_int(pMac, WNI_CFG_PROBE_AFTER_HB_FAIL_TIMEOUT, @@ -867,9 +819,7 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId) * Could not get PROBE_AFTER_HB_FAILURE * value from CFG. Log error. */ - lim_log(pMac, LOGE, - FL - ("could not retrieve PROBE_AFTER_HB_FAIL_TIMEOUT value")); + pe_err("could not retrieve PROBE_AFTER_HB_FAIL_TIMEOUT value"); } /* Change timer to reactivate it in future */ val = SYS_MS_TO_TICKS(val); @@ -878,11 +828,9 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId) val, 0) != TX_SUCCESS) { /* Could not change HeartBeat timer. */ /* Log error */ - lim_log(pMac, LOGE, - FL("unable to change ProbeAfterHBTimer")); + pe_err("unable to change ProbeAfterHBTimer"); } else { - lim_log(pMac, LOGD, - FL("Probe after HB timer value is changed = %u"), + pe_debug("Probe after HB timer value is changed: %u", val); } @@ -899,8 +847,7 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId) ** Could not deactivate Join Failure ** timer. Log error. **/ - lim_log(pMac, LOGE, - FL("Unable to deactivate Remain on Chn timer")); + pe_err("Unable to deactivate Remain on Chn timer"); return; } val = 1000; @@ -912,7 +859,7 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId) * Could not change Join Failure * timer. Log error. */ - lim_log(pMac, LOGE, FL("Unable to change timer")); + pe_err("Unable to change timer"); return; } break; @@ -925,8 +872,7 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId) ** Could not deactivate Active to passive channel timer. ** Log error. **/ - lim_log(pMac, LOGE, FL("Unable to Deactivate " - "Active to passive channel timer")); + pe_err("Unable to Deactivate Active to passive channel timer"); return; } val = ACTIVE_TO_PASSIVE_CONVERISON_TIMEOUT; @@ -938,7 +884,7 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId) * Could not change timer to check scan type for passive channel. * timer. Log error. */ - lim_log(pMac, LOGE, FL("Unable to change timer")); + pe_err("Unable to change timer"); return; } break; @@ -950,8 +896,7 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId) ** Could not deactivate Join Failure ** timer. Log error. **/ - lim_log(pMac, LOGE, - FL("Unable to deactivate Disassoc ack timer")); + pe_err("Unable to deactivate Disassoc ack timer"); return; } val = 1000; @@ -962,7 +907,7 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId) * Could not change Join Failure * timer. Log error. */ - lim_log(pMac, LOGE, FL("Unable to change timer")); + pe_err("Unable to change timer"); return; } break; @@ -974,8 +919,7 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId) ** Could not deactivate Join Failure ** timer. Log error. **/ - lim_log(pMac, LOGE, - FL("Unable to deactivate Deauth ack timer")); + pe_err("Unable to deactivate Deauth ack timer"); return; } val = 1000; @@ -986,7 +930,7 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId) * Could not change Join Failure * timer. Log error. */ - lim_log(pMac, LOGE, FL("Unable to change timer")); + pe_err("Unable to change timer"); return; } break; @@ -999,9 +943,7 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId) ** Could not deactivate SingleShot NOA Insert ** timer. Log error. **/ - lim_log(pMac, LOGE, - FL - ("Unable to deactivate SingleShot NOA Insert timer")); + pe_err("Unable to deactivate SingleShot NOA Insert timer"); return; } val = LIM_INSERT_SINGLESHOTNOA_TIMEOUT_VALUE; @@ -1013,7 +955,7 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId) * Could not change Single Shot NOA Insert * timer. Log error. */ - lim_log(pMac, LOGE, FL("Unable to change timer")); + pe_err("Unable to change timer"); return; } break; @@ -1058,9 +1000,7 @@ lim_deactivate_and_change_per_sta_id_timer(tpAniSirGlobal pMac, uint32_t timerId if (tx_timer_deactivate (&pMac->lim.limTimers.gpLimCnfWaitTimer[staId]) != TX_SUCCESS) { - lim_log(pMac, LOGE, - FL("unable to deactivate CNF wait timer")); - + pe_err("unable to deactivate CNF wait timer"); } /* Change timer to reactivate it in future */ @@ -1070,8 +1010,7 @@ lim_deactivate_and_change_per_sta_id_timer(tpAniSirGlobal pMac, uint32_t timerId * Could not get cnf timeout value * from CFG. Log error. */ - lim_log(pMac, LOGE, - FL("could not retrieve cnf timeout value")); + pe_err("could not retrieve cnf timeout value"); } val = SYS_MS_TO_TICKS(val); @@ -1080,8 +1019,7 @@ lim_deactivate_and_change_per_sta_id_timer(tpAniSirGlobal pMac, uint32_t timerId val) != TX_SUCCESS) { /* Could not change cnf timer. */ /* Log error */ - lim_log(pMac, LOGE, - FL("unable to change cnf wait timer")); + pe_err("unable to change cnf wait timer"); } break; @@ -1097,8 +1035,7 @@ lim_deactivate_and_change_per_sta_id_timer(tpAniSirGlobal pMac, uint32_t timerId staId); if (pAuthNode == NULL) { - lim_log(pMac, LOGE, - FL("Invalid Pre Auth Index passed :%d"), + pe_err("Invalid Pre Auth Index passed :%d", staId); break; } @@ -1107,9 +1044,7 @@ lim_deactivate_and_change_per_sta_id_timer(tpAniSirGlobal pMac, uint32_t timerId TX_SUCCESS) { /* Could not deactivate auth response timer. */ /* Log error */ - lim_log(pMac, LOGE, - FL - ("unable to deactivate auth response timer")); + pe_err("unable to deactivate auth response timer"); } /* Change timer to reactivate it in future */ @@ -1120,9 +1055,7 @@ lim_deactivate_and_change_per_sta_id_timer(tpAniSirGlobal pMac, uint32_t timerId * Could not get auth rsp timeout value * from CFG. Log error. */ - lim_log(pMac, LOGE, - FL - ("could not retrieve auth response timeout value")); + pe_err("could not retrieve auth response timeout value"); } val = SYS_MS_TO_TICKS(val); @@ -1131,8 +1064,7 @@ lim_deactivate_and_change_per_sta_id_timer(tpAniSirGlobal pMac, uint32_t timerId TX_SUCCESS) { /* Could not change auth rsp timer. */ /* Log error */ - lim_log(pMac, LOGE, - FL("unable to change auth rsp timer")); + pe_err("unable to change auth rsp timer"); } } break; @@ -1171,7 +1103,7 @@ void lim_activate_cnf_timer(tpAniSirGlobal pMac, uint16_t staId, psessionEntry->peSessionId; if (tx_timer_activate(&pMac->lim.limTimers.gpLimCnfWaitTimer[staId]) != TX_SUCCESS) { - lim_log(pMac, LOGE, FL("could not activate cnf wait timer")); + pe_err("could not activate cnf wait timer"); } } @@ -1200,7 +1132,7 @@ void lim_activate_auth_rsp_timer(tpAniSirGlobal pMac, tLimPreAuthNode *pAuthNode if (tx_timer_activate(&pAuthNode->timer) != TX_SUCCESS) { /* / Could not activate auth rsp timer. */ /* Log error */ - lim_log(pMac, LOGE, FL("could not activate auth rsp timer")); + pe_err("could not activate auth rsp timer"); } } @@ -1234,8 +1166,7 @@ void lim_cnf_wait_tmer_handler(void *pMacGlobal, uint32_t param) statusCode = lim_post_msg_api(pMac, &msg); if (statusCode != eSIR_SUCCESS) - lim_log(pMac, LOGE, - FL("posting to LIM failed, reason=%d"), statusCode); + pe_err("posting to LIM failed, reason: %d", statusCode); } @@ -1244,8 +1175,7 @@ void lim_channel_switch_timer_handler(void *pMacGlobal, uint32_t param) tSirMsgQ msg; tpAniSirGlobal pMac = (tpAniSirGlobal) pMacGlobal; - lim_log(pMac, LOGD, - FL("ChannelSwitch Timer expired. Posting msg to LIM ")); + pe_debug("ChannelSwitch Timer expired. Posting msg to LIM"); msg.type = SIR_LIM_CHANNEL_SWITCH_TIMEOUT; msg.bodyval = (uint32_t) param; @@ -1263,7 +1193,7 @@ void lim_quiet_timer_handler(void *pMacGlobal, uint32_t param) msg.bodyval = (uint32_t) param; msg.bodyptr = NULL; - lim_log(pMac, LOGD, FL("Post SIR_LIM_QUIET_TIMEOUT msg. ")); + pe_debug("Post SIR_LIM_QUIET_TIMEOUT msg"); lim_post_msg_api(pMac, &msg); } @@ -1275,7 +1205,7 @@ void lim_quiet_bss_timer_handler(void *pMacGlobal, uint32_t param) msg.type = SIR_LIM_QUIET_BSS_TIMEOUT; msg.bodyval = (uint32_t) param; msg.bodyptr = NULL; - lim_log(pMac, LOGD, FL("Post SIR_LIM_QUIET_BSS_TIMEOUT msg. ")); + pe_debug("Post SIR_LIM_QUIET_BSS_TIMEOUT msg"); lim_post_msg_api(pMac, &msg); } |