diff options
| -rw-r--r-- | core/mac/src/pe/lim/lim_utils.c | 632 |
1 files changed, 236 insertions, 396 deletions
diff --git a/core/mac/src/pe/lim/lim_utils.c b/core/mac/src/pe/lim/lim_utils.c index 56e636c94a46..ed85ee48bd7f 100644 --- a/core/mac/src/pe/lim/lim_utils.c +++ b/core/mac/src/pe/lim/lim_utils.c @@ -538,7 +538,7 @@ tSirRetStatus lim_init_mlm(tpAniSirGlobal pMac) /* Create timers used by LIM */ retVal = lim_create_timers(pMac); if (retVal != TX_SUCCESS) { - lim_log(pMac, LOGE, FL("lim_create_timers Failed")); + pe_err("lim_create_timers Failed"); return eSIR_SUCCESS; } @@ -571,8 +571,7 @@ static void lim_deactivate_del_sta(tpAniSirGlobal mac_ctx, uint32_t bss_entry, if (NULL == sta_ds) continue; - QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR, - FL("Deleting pmfSaQueryTimer for staid[%d]"), + pe_err("Deleting pmfSaQueryTimer for staid: %d", sta_ds->staIndex); tx_timer_deactivate(&sta_ds->pmfSaQueryTimer); tx_timer_delete(&sta_ds->pmfSaQueryTimer); @@ -851,8 +850,7 @@ void lim_reset_deferred_msg_q(tpAniSirGlobal pMac) uint8_t lim_write_deferred_msg_q(tpAniSirGlobal mac_ctx, tpSirMsgQ lim_msg) { - lim_log(mac_ctx, LOGD, - FL("Queue a deferred message (size %d, write %d) - type 0x%x "), + pe_debug("Queue a deferred message size: %d write: %d - type: 0x%x", mac_ctx->lim.gLimDeferredMsgQ.size, mac_ctx->lim.gLimDeferredMsgQ.write, lim_msg->type); @@ -860,8 +858,7 @@ uint8_t lim_write_deferred_msg_q(tpAniSirGlobal mac_ctx, tpSirMsgQ lim_msg) /* check if the deferred message queue is full */ if (mac_ctx->lim.gLimDeferredMsgQ.size >= MAX_DEFERRED_QUEUE_LEN) { if (!(mac_ctx->lim.deferredMsgCnt & 0xF)) { - lim_log(mac_ctx, LOGE, - FL("queue->MsgQ full Msg:%d Msgs Failed:%d"), + pe_err("queue->MsgQ full Msg: %d Msgs Failed: %d", lim_msg->type, ++mac_ctx->lim.deferredMsgCnt); cds_flush_logs(WLAN_LOG_TYPE_NON_FATAL, @@ -880,8 +877,7 @@ uint8_t lim_write_deferred_msg_q(tpAniSirGlobal mac_ctx, tpSirMsgQ lim_msg) * happen. */ if (mac_ctx->lim.gLimDeferredMsgQ.size > 0) - lim_log(mac_ctx, LOGD, - FL("%d Deferred Msg (type 0x%x, scan %d, global sme %d, global mlme %d, addts %d)"), + pe_debug("%d Deferred Msg type: 0x%x scan: %d global sme: %d global mlme: %d addts: %d", mac_ctx->lim.gLimDeferredMsgQ.size, lim_msg->type, lim_is_system_in_scan_state(mac_ctx), @@ -910,8 +906,7 @@ uint8_t lim_write_deferred_msg_q(tpAniSirGlobal mac_ctx, tpSirMsgQ lim_msg) * We reach the quota for management frames, * drop this one */ - lim_log(mac_ctx, LOGW, - FL("Too many queue->MsgQ Msg: %d (count=%d)"), + pe_warn("Too many queue->MsgQ Msg: %d count: %d", lim_msg->type, count); /* Return error, caller knows what to do */ return TX_QUEUE_FULL; @@ -991,13 +986,11 @@ tSirMsgQ *lim_read_deferred_msg_q(tpAniSirGlobal pMac) if (pMac->lim.gLimDeferredMsgQ.read >= MAX_DEFERRED_QUEUE_LEN) pMac->lim.gLimDeferredMsgQ.read = 0; - lim_log(pMac, LOGD, - FL("** DeQueue a deferred message (size %d read %d) - type 0x%x **"), + pe_debug("DeQueue a deferred message size: %d read: %d - type: 0x%x", pMac->lim.gLimDeferredMsgQ.size, pMac->lim.gLimDeferredMsgQ.read, msg->type); - lim_log(pMac, LOGD, - FL("DQ msg -- scan %d, global sme %d, global mlme %d, addts %d"), + pe_debug("DQ msg -- scan: %d global sme: %d global mlme: %d addts: %d", lim_is_system_in_scan_state(pMac), pMac->lim.gLimSmeState, pMac->lim.gLimMlmState, pMac->lim.gLimAddtsSent); @@ -1030,7 +1023,7 @@ void lim_handle_update_olbc_cache(tpAniSirGlobal mac_ctx) tpPESession psessionEntry = lim_is_ap_session_active(mac_ctx); if (psessionEntry == NULL) { - lim_log(mac_ctx, LOGE, FL(" Session not found")); + pe_err(" Session not found"); return; } @@ -1044,7 +1037,7 @@ void lim_handle_update_olbc_cache(tpAniSirGlobal mac_ctx) * disable protection. */ if (!enable) { - lim_log(mac_ctx, LOGD, FL("Resetting OLBC cache")); + pe_debug("Resetting OLBC cache"); psessionEntry->gLimOlbcParams.numSta = 0; psessionEntry->gLimOverlap11gParams.numSta = 0; psessionEntry->gLimOverlapHt20Params.numSta = 0; @@ -1059,8 +1052,7 @@ void lim_handle_update_olbc_cache(tpAniSirGlobal mac_ctx) if ((!psessionEntry->gLimOlbcParams.numSta) && (psessionEntry->gLimOlbcParams.protectionEnabled) && (!psessionEntry->gLim11bParams.protectionEnabled)) { - lim_log(mac_ctx, LOGD, - FL("Overlap cache clear and no 11B STA set")); + pe_debug("Overlap cache clear and no 11B STA set"); lim_enable11g_protection(mac_ctx, false, true, &beaconParams, psessionEntry); @@ -1069,8 +1061,7 @@ void lim_handle_update_olbc_cache(tpAniSirGlobal mac_ctx) if ((!psessionEntry->gLimOverlap11gParams.numSta) && (psessionEntry->gLimOverlap11gParams.protectionEnabled) && (!psessionEntry->gLim11gParams.protectionEnabled)) { - lim_log(mac_ctx, LOGD, - FL("Overlap cache clear and no 11G STA set")); + pe_debug("Overlap cache clear and no 11G STA set"); lim_enable_ht_protection_from11g(mac_ctx, false, true, &beaconParams, psessionEntry); @@ -1079,8 +1070,7 @@ void lim_handle_update_olbc_cache(tpAniSirGlobal mac_ctx) if ((!psessionEntry->gLimOverlapHt20Params.numSta) && (psessionEntry->gLimOverlapHt20Params.protectionEnabled) && (!psessionEntry->gLimHt20Params.protectionEnabled)) { - lim_log(mac_ctx, LOGD, - FL("Overlap cache clear and no HT20 STA set")); + pe_debug("Overlap cache clear and no HT20 STA set"); lim_enable11g_protection(mac_ctx, false, true, &beaconParams, psessionEntry); @@ -1097,7 +1087,7 @@ void lim_handle_update_olbc_cache(tpAniSirGlobal mac_ctx) /* Start OLBC timer */ if (tx_timer_activate(&mac_ctx->lim.limTimers.gLimUpdateOlbcCacheTimer) != TX_SUCCESS) - lim_log(mac_ctx, LOGE, FL("tx_timer_activate failed")); + pe_err("tx_timer_activate failed"); } /** @@ -1167,12 +1157,12 @@ lim_update_prot_sta_params(tpAniSirGlobal pMac, { uint32_t i; - lim_log(pMac, LOGD, FL("Associated STA addr is:")); + pe_debug("Associated STA addr is:"); lim_print_mac_addr(pMac, peerMacAddr, LOGD); for (i = 0; i < LIM_PROT_STA_CACHE_SIZE; i++) { if (psessionEntry->protStaCache[i].active) { - lim_log(pMac, LOGD, FL("Addr: ")); + pe_debug("Addr:"); lim_print_mac_addr (pMac, psessionEntry->protStaCache[i].addr, LOGD); @@ -1180,8 +1170,7 @@ lim_update_prot_sta_params(tpAniSirGlobal pMac, if (!qdf_mem_cmp (psessionEntry->protStaCache[i].addr, peerMacAddr, sizeof(tSirMacAddr))) { - lim_log(pMac, LOGD, - FL("matching cache entry at %d already active."), + pe_debug("matching cache entry at: %d already active", i); return; } @@ -1194,7 +1183,7 @@ lim_update_prot_sta_params(tpAniSirGlobal pMac, } if (i >= LIM_PROT_STA_CACHE_SIZE) { - lim_log(pMac, LOGE, FL("No space in ProtStaCache")); + pe_err("No space in ProtStaCache"); return; } @@ -1205,22 +1194,22 @@ lim_update_prot_sta_params(tpAniSirGlobal pMac, psessionEntry->protStaCache[i].active = true; if (eLIM_PROT_STA_CACHE_TYPE_llB == protStaCacheType) { psessionEntry->gLim11bParams.numSta++; - lim_log(pMac, LOGD, FL("11B, ")); + pe_debug("11B,"); } else if (eLIM_PROT_STA_CACHE_TYPE_llG == protStaCacheType) { psessionEntry->gLim11gParams.numSta++; - lim_log(pMac, LOGD, FL("11G, ")); + pe_debug("11G,"); } else if (eLIM_PROT_STA_CACHE_TYPE_HT20 == protStaCacheType) { psessionEntry->gLimHt20Params.numSta++; - lim_log(pMac, LOGD, FL("HT20, ")); + pe_debug("HT20,"); } if (!gfSupported) { psessionEntry->gLimNonGfParams.numSta++; - lim_log(pMac, LOGD, FL("NonGf, ")); + pe_debug("NonGf,"); } if (!lsigTxopSupported) { psessionEntry->gLimLsigTxopParams.numSta++; - lim_log(pMac, LOGD, FL("!lsigTxopSupported")); + pe_debug("!lsigTxopSupported"); } } /* --------------------------------------------------------------------- */ @@ -1252,7 +1241,7 @@ lim_decide_ap_protection(tpAniSirGlobal pMac, tSirMacAddr peerMacAddr, dph_lookup_hash_entry(pMac, peerMacAddr, &tmpAid, &psessionEntry->dph.dphHashTable); if (NULL == pStaDs) { - lim_log(pMac, LOGE, FL("pStaDs is NULL")); + pe_err("pStaDs is NULL"); return; } lim_get_rf_band_new(pMac, &rfBand, psessionEntry); @@ -1280,8 +1269,7 @@ lim_decide_ap_protection(tpAniSirGlobal pMac, tSirMacAddr peerMacAddr, if (pStaDs->erpEnabled == eHAL_CLEAR) { protStaCacheType = eLIM_PROT_STA_CACHE_TYPE_llB; /* enable protection */ - lim_log(pMac, LOGD, - FL("Enabling protection from 11B")); + pe_debug("Enabling protection from 11B"); lim_enable11g_protection(pMac, true, false, pBeaconParams, psessionEntry); @@ -1294,8 +1282,7 @@ lim_decide_ap_protection(tpAniSirGlobal pMac, tSirMacAddr peerMacAddr, (!pStaDs->mlmStaContext.htCapability)) { protStaCacheType = eLIM_PROT_STA_CACHE_TYPE_llB; /* enable protection */ - lim_log(pMac, LOGD, - FL("Enabling protection from 11B")); + pe_debug("Enabling protection from 11B"); lim_enable11g_protection(pMac, true, false, pBeaconParams, psessionEntry); @@ -1365,7 +1352,7 @@ lim_enable_overlap11g_protection(tpAniSirGlobal pMac, if (psessionEntry->gLimOlbcParams.numSta && !psessionEntry->gLimOlbcParams.protectionEnabled) { /* enable protection */ - lim_log(pMac, LOGD, FL("OLBC happens!!!")); + pe_debug("OLBC happens!!!"); lim_enable11g_protection(pMac, true, true, pBeaconParams, psessionEntry); } @@ -1405,8 +1392,7 @@ lim_update_short_preamble(tpAniSirGlobal mac_ctx, tSirMacAddr peer_mac_addr, if (sta_ds->shortPreambleEnabled != eHAL_CLEAR) return; - lim_log(mac_ctx, LOGD, - FL("Short Preamble is not enabled in Assoc Req from ")); + pe_debug("Short Preamble is not enabled in Assoc Req from"); lim_print_mac_addr(mac_ctx, peer_mac_addr, LOGD); @@ -1443,17 +1429,13 @@ lim_update_short_preamble(tpAniSirGlobal mac_ctx, tSirMacAddr peer_mac_addr, tLimNoShortParams *lim_params = &psession_entry->gLimNoShortParams; if (LIM_IS_AP_ROLE(psession_entry)) { - lim_log(mac_ctx, LOGE, - FL("No space in Short cache (#active %d, #sta %d) for sta "), - i, - lim_params->numNonShortPreambleSta); + pe_err("No space in Short cache active: %d sta: %d for sta", + i, lim_params->numNonShortPreambleSta); lim_print_mac_addr(mac_ctx, peer_mac_addr, LOGE); return; } else { - lim_log(mac_ctx, LOGE, - FL("No space in Short cache (#active %d, #sta %d) for sta "), - i, - lim_params->numNonShortPreambleSta); + pe_err("No space in Short cache active: %d sta: %d for sta", + i, lim_params->numNonShortPreambleSta); lim_print_mac_addr(mac_ctx, peer_mac_addr, LOGE); return; } @@ -1476,11 +1458,11 @@ lim_update_short_preamble(tpAniSirGlobal mac_ctx, tSirMacAddr peer_mac_addr, } /* enable long preamble */ - lim_log(mac_ctx, LOGD, FL("Disabling short preamble")); + pe_debug("Disabling short preamble"); if (lim_enable_short_preamble(mac_ctx, false, beaconparams, psession_entry) != eSIR_SUCCESS) - lim_log(mac_ctx, LOGE, FL("Cannot enable long preamble")); + pe_err("Cannot enable long preamble"); } /** @@ -1525,8 +1507,7 @@ lim_update_short_slot_time(tpAniSirGlobal mac_ctx, tSirMacAddr peer_mac_addr, if (sta_ds->shortSlotTimeEnabled != eHAL_CLEAR) return; - lim_log(mac_ctx, LOGD, - FL("Short Slot Time is not enabled in Assoc Req from ")); + pe_debug("Short Slot Time is not enabled in Assoc Req from"); lim_print_mac_addr(mac_ctx, peer_mac_addr, LOGD); for (i = 0; i < LIM_PROT_STA_CACHE_SIZE; i++) { if (LIM_IS_AP_ROLE(session_entry) && @@ -1560,17 +1541,14 @@ lim_update_short_slot_time(tpAniSirGlobal mac_ctx, tSirMacAddr peer_mac_addr, if (i >= LIM_PROT_STA_CACHE_SIZE) { if (LIM_IS_AP_ROLE(session_entry)) { - lim_log(mac_ctx, LOGE, - FL("No space in ShortSlot cache (#active %d, #sta %d) for sta "), + pe_err("No space in ShortSlot cache active: %d sta: %d for sta", i, session_entry->gLimNoShortSlotParams. numNonShortSlotSta); lim_print_mac_addr(mac_ctx, peer_mac_addr, LOGE); return; } else { - lim_log(mac_ctx, LOGE, - FL("No space in ShortSlot cache (#active %d, #sta %d) for sta "), - i, - mac_ctx->lim.gLimNoShortSlotParams. + pe_err("No space in ShortSlot cache active: %d sta: %d for sta", + i, mac_ctx->lim.gLimNoShortSlotParams. numNonShortSlotSta); lim_print_mac_addr(mac_ctx, peer_mac_addr, LOGE); return; @@ -1607,8 +1585,7 @@ lim_update_short_slot_time(tpAniSirGlobal mac_ctx, tSirMacAddr peer_mac_addr, beacon_params->fShortSlotTime = false; beacon_params->paramChangeBitmap |= PARAM_SHORT_SLOT_TIME_CHANGED; - lim_log(mac_ctx, LOGD, - FL("Disable short slot time. Enable long slot time.")); + pe_debug("Disable short slot time. Enable long slot time"); session_entry->shortSlotTimeSupported = false; } else if (!LIM_IS_AP_ROLE(session_entry) && (val && mac_ctx->lim.gLimNoShortSlotParams. @@ -1618,8 +1595,7 @@ lim_update_short_slot_time(tpAniSirGlobal mac_ctx, tSirMacAddr peer_mac_addr, beacon_params->fShortSlotTime = false; beacon_params->paramChangeBitmap |= PARAM_SHORT_SLOT_TIME_CHANGED; - lim_log(mac_ctx, LOGD, - FL("Disable short slot time. Enable long slot time.")); + pe_debug("Disable short slot time. Enable long slot time"); session_entry->shortSlotTimeSupported = false; } } @@ -1983,7 +1959,7 @@ static void lim_trigger_channel_switch_through_roaming(uint32_t sme_sessionid, fastreassoc = qdf_mem_malloc(sizeof(struct wma_roam_invoke_cmd)); if (NULL == fastreassoc) { - hdd_err("qdf_mem_malloc failed for fastreassoc"); + pe_err("qdf_mem_malloc failed for fastreassoc"); return; } fastreassoc->vdev_id = sme_sessionid; @@ -2001,7 +1977,7 @@ static void lim_trigger_channel_switch_through_roaming(uint32_t sme_sessionid, if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) { qdf_mem_free(fastreassoc); - hdd_err("Not able to post ROAM_INVOKE_CMD message to WMA"); + pe_err("Not able to post ROAM_INVOKE_CMD message to WMA"); } } @@ -2013,7 +1989,7 @@ static void lim_csa_ecsa_handler(tpAniSirGlobal mac_ctx, tpPESession session) new_channel = session->gLimChannelSwitch.primaryChannel; switch (session->gLimChannelSwitch.state) { case eLIM_CHANNEL_SWITCH_PRIMARY_ONLY: - lim_log(mac_ctx, LOGD, FL("CHANNEL_SWITCH_PRIMARY_ONLY ")); + pe_debug("CHANNEL_SWITCH_PRIMARY_ONLY"); if (!CDS_IS_SAME_BAND_CHANNELS(old_channel, new_channel)) { lim_trigger_channel_switch_through_roaming( session->smeSessionId, session->bssId, @@ -2026,8 +2002,7 @@ static void lim_csa_ecsa_handler(tpAniSirGlobal mac_ctx, tpPESession session) session->gLimChannelSwitch.state = eLIM_CHANNEL_SWITCH_IDLE; break; case eLIM_CHANNEL_SWITCH_PRIMARY_AND_SECONDARY: - lim_log(mac_ctx, LOGD, - FL("CHANNEL_SWITCH_PRIMARY_AND_SECONDARY")); + pe_debug("CHANNEL_SWITCH_PRIMARY_AND_SECONDARY"); if (!CDS_IS_SAME_BAND_CHANNELS(old_channel, new_channel)) { lim_trigger_channel_switch_through_roaming( session->smeSessionId, session->bssId, @@ -2043,11 +2018,10 @@ static void lim_csa_ecsa_handler(tpAniSirGlobal mac_ctx, tpPESession session) break; case eLIM_CHANNEL_SWITCH_IDLE: default: - lim_log(mac_ctx, LOGE, FL("incorrect state ")); + pe_err("incorrect state "); if (lim_restore_pre_channel_switch_state(mac_ctx, session) != eSIR_SUCCESS) - lim_log(mac_ctx, LOGE, - FL("Can't restore state, reset the system")); + pe_err("Can't restore state, reset the system"); return; } } @@ -2060,15 +2034,14 @@ static void lim_csa_ecsa_handler(tpAniSirGlobal mac_ctx, tpPESession session) new_channel = session->gLimChannelSwitch.primaryChannel; switch (session->gLimChannelSwitch.state) { case eLIM_CHANNEL_SWITCH_PRIMARY_ONLY: - lim_log(mac_ctx, LOGD, FL("CHANNEL_SWITCH_PRIMARY_ONLY ")); + pe_debug("CHANNEL_SWITCH_PRIMARY_ONLY"); lim_switch_primary_channel(mac_ctx, session->gLimChannelSwitch.primaryChannel, session); session->gLimChannelSwitch.state = eLIM_CHANNEL_SWITCH_IDLE; break; case eLIM_CHANNEL_SWITCH_PRIMARY_AND_SECONDARY: - lim_log(mac_ctx, LOGD, - FL("CHANNEL_SWITCH_PRIMARY_AND_SECONDARY")); + pe_debug("CHANNEL_SWITCH_PRIMARY_AND_SECONDARY"); lim_switch_primary_secondary_channel(mac_ctx, session, session->gLimChannelSwitch.primaryChannel, session->gLimChannelSwitch.ch_center_freq_seg0, @@ -2078,11 +2051,10 @@ static void lim_csa_ecsa_handler(tpAniSirGlobal mac_ctx, tpPESession session) break; case eLIM_CHANNEL_SWITCH_IDLE: default: - lim_log(mac_ctx, LOGE, FL("incorrect state ")); + pe_err("incorrect state"); if (lim_restore_pre_channel_switch_state(mac_ctx, session) != eSIR_SUCCESS) - lim_log(mac_ctx, LOGE, - FL("Can't restore state, reset the system")); + pe_err("Can't restore state, reset the system"); return; } } @@ -2109,22 +2081,19 @@ void lim_process_channel_switch_timeout(tpAniSirGlobal pMac) psessionEntry = pe_find_session_by_session_id(pMac, pMac->lim.limTimers.gLimChannelSwitchTimer.sessionId); if (psessionEntry == NULL) { - lim_log(pMac, LOGE, - FL("Session Does not exist for given sessionID")); + pe_err("Session Does not exist for given sessionID"); return; } if (!LIM_IS_STA_ROLE(psessionEntry)) { - lim_log(pMac, LOGW, - "Channel switch can be done only in STA role, Current Role = %d", + pe_warn("Channel switch can be done only in STA role, Current Role: %d", GET_LIM_SYSTEM_ROLE(psessionEntry)); return; } if (psessionEntry->gLimSpecMgmt.dot11hChanSwState != eLIM_11H_CHANSW_RUNNING) { - lim_log(pMac, LOGW, - FL("Channel switch timer should not have been running in state %d"), + pe_warn("Channel switch timer should not have been running in state: %d", psessionEntry->gLimSpecMgmt.dot11hChanSwState); return; } @@ -2144,9 +2113,7 @@ void lim_process_channel_switch_timeout(tpAniSirGlobal pMac) /* We need to restore pre-channelSwitch state on the STA */ if (lim_restore_pre_channel_switch_state(pMac, psessionEntry) != eSIR_SUCCESS) { - lim_log(pMac, LOGE, - FL - ("Could not restore pre-channelSwitch (11h) state, resetting the system")); + pe_err("Could not restore pre-channelSwitch (11h) state, resetting the system"); return; } @@ -2159,7 +2126,7 @@ void lim_process_channel_switch_timeout(tpAniSirGlobal pMac) eLIM_MLM_LINK_ESTABLISHED_STATE) && (psessionEntry->limSmeState != eLIM_SME_WT_DISASSOC_STATE) && (psessionEntry->limSmeState != eLIM_SME_WT_DEAUTH_STATE)) { - lim_log(pMac, LOGE, FL("Invalid channel! Disconnect")); + pe_err("Invalid channel! Disconnect"); lim_tear_down_link_with_ap(pMac, pMac->lim.limTimers. gLimChannelSwitchTimer.sessionId, @@ -2255,10 +2222,9 @@ lim_update_channel_switch(struct sAniSirGlobal *mac_ctx, } } if (eSIR_SUCCESS != lim_start_channel_switch(mac_ctx, psession_entry)) - lim_log(mac_ctx, LOGW, FL("Could not start Channel Switch")); + pe_warn("Could not start Channel Switch"); - lim_log(mac_ctx, LOGW, - FL("session %d primary chl %d, ch_width %d, count %d (%d ticks)"), + pe_debug("session: %d primary chl: %d ch_width: %d count: %d (%d ticks)", psession_entry->peSessionId, psession_entry->gLimChannelSwitch.primaryChannel, psession_entry->gLimChannelSwitch.ch_width, @@ -2291,7 +2257,7 @@ void lim_cancel_dot11h_channel_switch(tpAniSirGlobal pMac, if (!LIM_IS_STA_ROLE(psessionEntry)) return; - lim_log(pMac, LOGD, FL("Received a beacon without channel switch IE")); + pe_debug("Received a beacon without channel switch IE"); MTRACE(mac_trace (pMac, TRACE_CODE_TIMER_DEACTIVATE, @@ -2299,14 +2265,13 @@ void lim_cancel_dot11h_channel_switch(tpAniSirGlobal pMac, if (tx_timer_deactivate(&pMac->lim.limTimers.gLimChannelSwitchTimer) != eSIR_SUCCESS) { - lim_log(pMac, LOGE, FL("tx_timer_deactivate failed!")); + pe_err("tx_timer_deactivate failed!"); } /* We need to restore pre-channelSwitch state on the STA */ if (lim_restore_pre_channel_switch_state(pMac, psessionEntry) != eSIR_SUCCESS) { - lim_log(pMac, LOGE, - FL("LIM: Could not restore pre-channelSwitch (11h) state, resetting the system")); + pe_err("LIM: Could not restore pre-channelSwitch (11h) state, resetting the system"); } } @@ -2332,7 +2297,7 @@ void lim_cancel_dot11h_quiet(tpAniSirGlobal pMac, tpPESession psessionEntry) psessionEntry->peSessionId, eLIM_QUIET_TIMER)); if (tx_timer_deactivate(&pMac->lim.limTimers.gLimQuietTimer) != TX_SUCCESS) { - lim_log(pMac, LOGE, FL("tx_timer_deactivate failed")); + pe_err("tx_timer_deactivate failed"); } } else if (psessionEntry->gLimSpecMgmt.quietState == eLIM_QUIET_RUNNING) { MTRACE(mac_trace @@ -2340,7 +2305,7 @@ void lim_cancel_dot11h_quiet(tpAniSirGlobal pMac, tpPESession psessionEntry) psessionEntry->peSessionId, eLIM_QUIET_BSS_TIMER)); if (tx_timer_deactivate(&pMac->lim.limTimers.gLimQuietBssTimer) != TX_SUCCESS) { - lim_log(pMac, LOGE, FL("tx_timer_deactivate failed")); + pe_err("tx_timer_deactivate failed"); } /** * If the channel switch is already running in silent mode, dont resume the @@ -2395,22 +2360,18 @@ void lim_process_quiet_timeout(tpAniSirGlobal pMac) psessionEntry = pe_find_session_by_session_id(pMac, pMac->lim.limTimers.gLimQuietTimer.sessionId); if (psessionEntry == NULL) { - lim_log(pMac, LOGE, - FL("Session Does not exist for given sessionID")); + pe_err("Session Does not exist for given sessionID"); return; } - lim_log(pMac, LOGD, FL("quietState = %d"), - psessionEntry->gLimSpecMgmt.quietState); + pe_debug("quietState: %d", psessionEntry->gLimSpecMgmt.quietState); switch (psessionEntry->gLimSpecMgmt.quietState) { case eLIM_QUIET_BEGIN: /* Time to Stop data traffic for quietDuration */ /* lim_deactivate_and_change_timer(pMac, eLIM_QUIET_BSS_TIMER); */ if (TX_SUCCESS != tx_timer_deactivate( &pMac->lim.limTimers.gLimQuietBssTimer)) { - lim_log(pMac, LOGE, - FL - ("Unable to de-activate gLimQuietBssTimer! Will attempt to activate anyway...")); + pe_err("Unable to de-activate gLimQuietBssTimer! Will attempt to activate anyway"); } /* gLimQuietDuration appears to be in units of ticks */ /* Use it as is */ @@ -2418,9 +2379,7 @@ void lim_process_quiet_timeout(tpAniSirGlobal pMac) tx_timer_change(&pMac->lim.limTimers.gLimQuietBssTimer, psessionEntry->gLimSpecMgmt.quietDuration, 0)) { - lim_log(pMac, LOGE, - FL - ("Unable to change gLimQuietBssTimer! Will still attempt to activate anyway...")); + pe_err("Unable to change gLimQuietBssTimer! Will still attempt to activate anyway"); } MTRACE(mac_trace (pMac, TRACE_CODE_TIMER_ACTIVATE, @@ -2428,9 +2387,7 @@ void lim_process_quiet_timeout(tpAniSirGlobal pMac) eLIM_QUIET_BSS_TIMER)); if (TX_SUCCESS != tx_timer_activate(&pMac->lim.limTimers.gLimQuietBssTimer)) { - lim_log(pMac, LOGW, - FL - ("Unable to activate gLimQuietBssTimer! The STA will be unable to honor Quiet BSS...")); + pe_warn("Unable to activate gLimQuietBssTimer! The STA will be unable to honor Quiet BSS"); } else { /* Transition to eLIM_QUIET_RUNNING */ psessionEntry->gLimSpecMgmt.quietState = @@ -2440,8 +2397,7 @@ void lim_process_quiet_timeout(tpAniSirGlobal pMac) lim_frame_transmission_control(pMac, eLIM_TX_ALL, eLIM_STOP_TX); - lim_log(pMac, LOGD, - FL("Quiet BSS: STA shutting down for %d ticks"), + pe_debug("Quiet BSS: STA shutting down for %d ticks", psessionEntry->gLimSpecMgmt.quietDuration); } break; @@ -2498,12 +2454,11 @@ void lim_process_quiet_bss_timeout(tpAniSirGlobal mac_ctx) lim_timer->gLimQuietBssTimer.sessionId); if (psession_entry == NULL) { - lim_log(mac_ctx, LOGE, - FL("Session Does not exist for given sessionID")); + pe_err("Session Does not exist for given sessionID"); return; } - lim_log(mac_ctx, LOGD, FL("quietState = %d"), + pe_debug("quietState: %d", psession_entry->gLimSpecMgmt.quietState); if (LIM_IS_AP_ROLE(psession_entry)) @@ -2527,13 +2482,13 @@ void lim_process_quiet_bss_timeout(tpAniSirGlobal mac_ctx) eLIM_RESUME_TX); lim_restore_pre_quiet_state(mac_ctx, psession_entry); } - lim_log(mac_ctx, LOGD, FL("Quiet BSS: Resuming traffic...")); + pe_debug("Quiet BSS: Resuming traffic"); break; case eLIM_QUIET_INIT: case eLIM_QUIET_BEGIN: case eLIM_QUIET_END: - lim_log(mac_ctx, LOGD, FL("Quiet state not in RUNNING")); + pe_debug("Quiet state not in RUNNING"); /* * If the quiet period has ended, then resume the * frame transmission @@ -2563,8 +2518,7 @@ void lim_start_quiet_timer(tpAniSirGlobal pMac, uint8_t sessionId) psessionEntry = pe_find_session_by_session_id(pMac, sessionId); if (psessionEntry == NULL) { - lim_log(pMac, LOGE, - FL("Session Does not exist for given sessionID")); + pe_err("Session Does not exist for given sessionID"); return; } @@ -2577,9 +2531,7 @@ void lim_start_quiet_timer(tpAniSirGlobal pMac, uint8_t sessionId) (pMac, TRACE_CODE_TIMER_ACTIVATE, sessionId, eLIM_QUIET_TIMER)); if (TX_SUCCESS != tx_timer_deactivate(&pMac->lim.limTimers.gLimQuietTimer)) { - lim_log(pMac, LOGE, - FL - ("Unable to deactivate gLimQuietTimer! Will still attempt to re-activate anyway...")); + pe_err("Unable to deactivate gLimQuietTimer! Will still attempt to re-activate anyway"); } /* Set the NEW timeout value, in ticks */ if (TX_SUCCESS != tx_timer_change(&pMac->lim.limTimers.gLimQuietTimer, @@ -2587,17 +2539,13 @@ void lim_start_quiet_timer(tpAniSirGlobal pMac, uint8_t sessionId) gLimSpecMgmt. quietTimeoutValue), 0)) { - lim_log(pMac, LOGE, - FL - ("Unable to change gLimQuietTimer! Will still attempt to re-activate anyway...")); + pe_err("Unable to change gLimQuietTimer! Will still attempt to re-activate anyway"); } pMac->lim.limTimers.gLimQuietTimer.sessionId = sessionId; if (TX_SUCCESS != tx_timer_activate(&pMac->lim.limTimers.gLimQuietTimer)) { - lim_log(pMac, LOGE, - FL - ("Unable to activate gLimQuietTimer! STA cannot honor Quiet BSS!")); + pe_err("Unable to activate gLimQuietTimer! STA cannot honor Quiet BSS!"); lim_restore_pre_quiet_state(pMac, psessionEntry); psessionEntry->gLimSpecMgmt.quietState = eLIM_QUIET_INIT; @@ -2648,9 +2596,7 @@ lim_util_count_sta_del(tpAniSirGlobal pMac, pSta->fAniCount = 0; if (pMac->lim.gLimNumOfAniSTAs <= 0) { - lim_log(pMac, LOGE, - FL - ("CountStaDel: ignoring Delete Req when AniPeer count is %d"), + pe_err("CountStaDel: ignoring Delete Req when AniPeer count: %d", pMac->lim.gLimNumOfAniSTAs); return; } @@ -2689,17 +2635,14 @@ void lim_switch_channel_cback(tpAniSirGlobal pMac, QDF_STATUS status, /* We need to restore pre-channelSwitch state on the STA */ if (lim_restore_pre_channel_switch_state(pMac, psessionEntry) != eSIR_SUCCESS) { - lim_log(pMac, LOGE, - FL - ("Could not restore pre-channelSwitch (11h) state, resetting the system")); + pe_err("Could not restore pre-channelSwitch (11h) state, resetting the system"); return; } mmhMsg.type = eWNI_SME_SWITCH_CHL_IND; pSirSmeSwitchChInd = qdf_mem_malloc(sizeof(tSirSmeSwitchChannelInd)); if (NULL == pSirSmeSwitchChInd) { - lim_log(pMac, LOGE, - FL("Failed to allocate buffer for buffer descriptor")); + pe_err("Failed to allocate buffer for buffer descriptor"); return; } @@ -2717,8 +2660,7 @@ void lim_switch_channel_cback(tpAniSirGlobal pMac, QDF_STATUS status, pSirSmeSwitchChInd->chan_params.center_freq_seg1 = psessionEntry->gLimChannelSwitch.ch_center_freq_seg1; - lim_log(pMac, LOGD, - FL("session:%d chan:%d width:%d sec offset:%d seg0:%d seg1:%d"), + pe_debug("session: %d chan: %d width: %d sec offset: %d seg0: %d seg1: %d", pSirSmeSwitchChInd->sessionId, pSirSmeSwitchChInd->newChannelId, pSirSmeSwitchChInd->chan_params.ch_width, @@ -2752,8 +2694,7 @@ void lim_switch_channel_cback(tpAniSirGlobal pMac, QDF_STATUS status, void lim_switch_primary_channel(tpAniSirGlobal pMac, uint8_t newChannel, tpPESession psessionEntry) { - lim_log(pMac, LOGD, - FL("lim_switch_primary_channel: old chnl %d --> new chnl %d "), + pe_debug("old chnl: %d --> new chnl: %d", psessionEntry->currentOperChannel, newChannel); psessionEntry->currentReqChannel = newChannel; @@ -2813,15 +2754,13 @@ void lim_switch_primary_secondary_channel(tpAniSirGlobal pMac, /* Store the new primary and secondary channel in session entries if different */ if (psessionEntry->currentOperChannel != newChannel) { - lim_log(pMac, LOGW, - FL("switch old chnl %d --> new chnl %d "), + pe_warn("switch old chnl: %d --> new chnl: %d", psessionEntry->currentOperChannel, newChannel); psessionEntry->currentOperChannel = newChannel; } if (psessionEntry->htSecondaryChannelOffset != psessionEntry->gLimChannelSwitch.sec_ch_offset) { - lim_log(pMac, LOGW, - FL("switch old sec chnl %d --> new sec chnl %d "), + pe_warn("switch old sec chnl: %d --> new sec chnl: %d", psessionEntry->htSecondaryChannelOffset, subband); psessionEntry->htSecondaryChannelOffset = psessionEntry->gLimChannelSwitch.sec_ch_offset; @@ -2867,13 +2806,12 @@ uint8_t lim_active_scan_allowed(tpAniSirGlobal pMac, uint8_t channelNum) uint32_t len = WNI_CFG_SCAN_CONTROL_LIST_LEN; if (wlan_cfg_get_str(pMac, WNI_CFG_SCAN_CONTROL_LIST, channelPair, &len) != eSIR_SUCCESS) { - lim_log(pMac, LOGE, FL("Unable to get scan control list")); + pe_err("Unable to get scan control list"); return false; } if (len > WNI_CFG_SCAN_CONTROL_LIST_LEN) { - lim_log(pMac, LOGE, FL("Invalid scan control list length:%d"), - len); + pe_err("Invalid scan control list length: %d", len); return false; } @@ -3168,8 +3106,7 @@ lim_enable_11a_protection(tpAniSirGlobal mac_ctx, } /* This part is common for station as well. */ if (false == pe_session->beaconParams.llaCoexist) { - lim_log(mac_ctx, LOGW, - FL(" => protection from 11A Enabled")); + pe_warn(" => protection from 11A Enabled"); bcn_prms->llaCoexist = true; pe_session->beaconParams.llaCoexist = true; bcn_prms->paramChangeBitmap |= PARAM_llACOEXIST_CHANGED; @@ -3199,8 +3136,7 @@ lim_disable_11a_protection(tpAniSirGlobal mac_ctx, /* for station role */ if (!LIM_IS_AP_ROLE(pe_session)) { - lim_log(mac_ctx, LOGW, - FL("===> Protection from 11A Disabled")); + pe_warn("===> Protection from 11A Disabled"); bcn_prms->llaCoexist = false; pe_session->beaconParams.llaCoexist = false; bcn_prms->paramChangeBitmap |= PARAM_llACOEXIST_CHANGED; @@ -3278,8 +3214,7 @@ lim_disable_11a_protection(tpAniSirGlobal mac_ctx, disable_11a_end: if (!mac_ctx->lim.gLimOverlap11aParams.protectionEnabled && !pe_session->gLim11aParams.protectionEnabled) { - lim_log(mac_ctx, LOGW, - FL("===> Protection from 11A Disabled")); + pe_warn("===> Protection from 11A Disabled"); bcn_prms->llaCoexist = false; pe_session->beaconParams.llaCoexist = false; bcn_prms->paramChangeBitmap |= PARAM_llACOEXIST_CHANGED; @@ -3305,7 +3240,7 @@ lim_update_11a_protection(tpAniSirGlobal mac_ctx, uint8_t enable, tpPESession session) { if (NULL == session) { - lim_log(mac_ctx, LOGW, FL("session is NULL")); + pe_err("session is NULL"); return eSIR_FAILURE; } /* overlapping protection configuration check. */ @@ -3314,8 +3249,7 @@ lim_update_11a_protection(tpAniSirGlobal mac_ctx, uint8_t enable, if ((LIM_IS_AP_ROLE(session)) && (!session->cfgProtection.fromlla)) { /* protection disabled. */ - lim_log(mac_ctx, LOGW, - FL("protection from 11a is disabled")); + pe_warn("protection from 11a is disabled"); return eSIR_SUCCESS; } } @@ -3351,7 +3285,7 @@ lim_handle_enable11g_protection_enabled(tpAniSirGlobal mac_ctx, if (LIM_IS_AP_ROLE(session_entry) && overlap) { session_entry->gLimOlbcParams.protectionEnabled = true; - lim_log(mac_ctx, LOGD, FL("protection from olbc is enabled")); + pe_debug("protection from olbc is enabled"); if (true == session_entry->htCapability) { if ((eSIR_HT_OP_MODE_OVERLAP_LEGACY != @@ -3381,7 +3315,7 @@ lim_handle_enable11g_protection_enabled(tpAniSirGlobal mac_ctx, } } else if (LIM_IS_AP_ROLE(session_entry) && !overlap) { session_entry->gLim11bParams.protectionEnabled = true; - lim_log(mac_ctx, LOGD, FL("protection from 11b is enabled")); + pe_debug("protection from 11b is enabled"); if (true == session_entry->htCapability) { if (eSIR_HT_OP_MODE_MIXED != session_entry->htOperMode) { @@ -3399,7 +3333,7 @@ lim_handle_enable11g_protection_enabled(tpAniSirGlobal mac_ctx, /* This part is common for staiton as well. */ if (false == session_entry->beaconParams.llbCoexist) { - lim_log(mac_ctx, LOGD, FL("=> 11G Protection Enabled")); + pe_debug("=> 11G Protection Enabled"); beaconparams->llbCoexist = session_entry->beaconParams.llbCoexist = true; beaconparams->paramChangeBitmap |= @@ -3471,7 +3405,7 @@ lim_handle_11g_protection_for_11bcoexist(tpAniSirGlobal mac_ctx, } else if (LIM_IS_AP_ROLE(session_entry) && !overlap) { /* Disable protection from 11B stations. */ session_entry->gLim11bParams.protectionEnabled = false; - lim_log(mac_ctx, LOGD, FL("===> 11B Protection Disabled")); + pe_debug("===> 11B Protection Disabled"); /* Check if any other non-HT protection enabled. */ if (!session_entry->gLim11gParams.protectionEnabled) { /* Right now we are in HT OP Mixed mode. */ @@ -3491,8 +3425,7 @@ lim_handle_11g_protection_for_11bcoexist(tpAniSirGlobal mac_ctx, protectionEnabled) { session_entry->htOperMode = eSIR_HT_OP_MODE_OVERLAP_LEGACY; - lim_log(mac_ctx, LOGD, - FL("===> 11G Protection Disabled")); + pe_debug("===> 11G Protection Disabled"); lim_enable_ht_rifs_protection(mac_ctx, true, overlap, beaconparams, session_entry); @@ -3503,8 +3436,7 @@ lim_handle_11g_protection_for_11bcoexist(tpAniSirGlobal mac_ctx, eSIR_HT_OP_MODE_NO_LEGACY_20MHZ_HT; */ session_entry->htOperMode = eSIR_HT_OP_MODE_PURE; - lim_log(mac_ctx, LOGD, - FL("===> 11G Protection Disabled")); + pe_debug("===> 11G Protection Disabled"); lim_enable_ht_rifs_protection(mac_ctx, false, overlap, beaconparams, session_entry); @@ -3520,8 +3452,7 @@ lim_handle_11g_protection_for_11bcoexist(tpAniSirGlobal mac_ctx, if (LIM_IS_AP_ROLE(session_entry)) { if (!session_entry->gLimOlbcParams.protectionEnabled && !session_entry->gLim11bParams.protectionEnabled) { - lim_log(mac_ctx, LOGD, - FL("===> 11G Protection Disabled")); + pe_debug("===> 11G Protection Disabled"); beaconparams->llbCoexist = session_entry->beaconParams.llbCoexist = false; @@ -3531,7 +3462,7 @@ lim_handle_11g_protection_for_11bcoexist(tpAniSirGlobal mac_ctx, } /* For station role */ if (!LIM_IS_AP_ROLE(session_entry)) { - lim_log(mac_ctx, LOGD, FL("===> 11G Protection Disabled")); + pe_debug("===> 11G Protection Disabled"); beaconparams->llbCoexist = session_entry->beaconParams.llbCoexist = false; beaconparams->paramChangeBitmap |= @@ -3563,14 +3494,12 @@ lim_enable11g_protection(tpAniSirGlobal mac_ctx, uint8_t enable, if ((LIM_IS_AP_ROLE(session_entry)) && !session_entry->cfgProtection.fromllb) { /* protection disabled. */ - lim_log(mac_ctx, LOGD, - FL("protection from 11b is disabled")); + pe_debug("protection from 11b is disabled"); return eSIR_SUCCESS; } else if (!LIM_IS_AP_ROLE(session_entry)) { if (!mac_ctx->lim.cfgProtection.fromllb) { /* protection disabled. */ - lim_log(mac_ctx, LOGD, - FL("protection from 11b is disabled")); + pe_debug("protection from 11b is disabled"); return eSIR_SUCCESS; } } @@ -3608,8 +3537,7 @@ lim_enable_ht_protection_from11g(tpAniSirGlobal pMac, uint8_t enable, if ((LIM_IS_AP_ROLE(psessionEntry)) && (!psessionEntry->cfgProtection.overlapFromllg)) { /* protection disabled. */ - lim_log(pMac, LOGD, - FL("overlap protection from 11g is disabled")); + pe_debug("overlap protection from 11g is disabled"); return eSIR_SUCCESS; } } else { @@ -3617,14 +3545,12 @@ lim_enable_ht_protection_from11g(tpAniSirGlobal pMac, uint8_t enable, if (LIM_IS_AP_ROLE(psessionEntry) && !psessionEntry->cfgProtection.fromllg) { /* protection disabled. */ - lim_log(pMac, LOGD, - FL("protection from 11g is disabled")); + pe_debug("protection from 11g is disabled"); return eSIR_SUCCESS; } else if (!LIM_IS_AP_ROLE(psessionEntry)) { if (!pMac->lim.cfgProtection.fromllg) { /* protection disabled. */ - lim_log(pMac, LOGD, - FL("protection from 11g is disabled")); + pe_debug("protection from 11g is disabled"); return eSIR_SUCCESS; } } @@ -3796,8 +3722,7 @@ lim_enable_ht_protection_from11g(tpAniSirGlobal pMac, uint8_t enable, protectionEnabled && !psessionEntry->gLim11gParams. protectionEnabled) { - lim_log(pMac, LOGD, - FL("===> Protection from 11G Disabled")); + pe_debug("===> Protection from 11G Disabled"); pBeaconParams->llgCoexist = psessionEntry->beaconParams.llgCoexist = false; @@ -3807,8 +3732,7 @@ lim_enable_ht_protection_from11g(tpAniSirGlobal pMac, uint8_t enable, } /* for station role */ else { - lim_log(pMac, LOGD, - FL("===> Protection from 11G Disabled")); + pe_debug("===> Protection from 11G Disabled"); pBeaconParams->llgCoexist = psessionEntry->beaconParams.llgCoexist = false; pBeaconParams->paramChangeBitmap |= @@ -3846,14 +3770,12 @@ lim_enable_ht_obss_protection(tpAniSirGlobal pMac, uint8_t enable, if ((LIM_IS_AP_ROLE(psessionEntry)) && !psessionEntry->cfgProtection.obss) { /* ToDo Update this field */ /* protection disabled. */ - lim_log(pMac, LOGD, - FL("protection from Obss is disabled")); + pe_debug("protection from Obss is disabled"); return eSIR_SUCCESS; } else if (!LIM_IS_AP_ROLE(psessionEntry)) { if (!pMac->lim.cfgProtection.obss) { /* ToDo Update this field */ /* protection disabled. */ - lim_log(pMac, LOGD, - FL("protection from Obss is disabled")); + pe_debug("protection from Obss is disabled"); return eSIR_SUCCESS; } } @@ -3862,15 +3784,14 @@ lim_enable_ht_obss_protection(tpAniSirGlobal pMac, uint8_t enable, if (LIM_IS_AP_ROLE(psessionEntry)) { if ((enable) && (false == psessionEntry->beaconParams.gHTObssMode)) { - lim_log(pMac, LOGD, FL("=>obss protection enabled")); + pe_debug("=>obss protection enabled"); psessionEntry->beaconParams.gHTObssMode = true; pBeaconParams->paramChangeBitmap |= PARAM_OBSS_MODE_CHANGED; /* UPDATE AN ENUM FOR OBSS MODE <todo> */ } else if (!enable && (true == psessionEntry->beaconParams.gHTObssMode)) { - lim_log(pMac, LOGD, - FL("===> obss Protection disabled")); + pe_debug("===> obss Protection disabled"); psessionEntry->beaconParams.gHTObssMode = false; pBeaconParams->paramChangeBitmap |= PARAM_OBSS_MODE_CHANGED; @@ -3884,15 +3805,14 @@ lim_enable_ht_obss_protection(tpAniSirGlobal pMac, uint8_t enable, } else { if ((enable) && (false == psessionEntry->beaconParams.gHTObssMode)) { - lim_log(pMac, LOGD, FL("=>obss protection enabled")); + pe_debug("=>obss protection enabled"); psessionEntry->beaconParams.gHTObssMode = true; pBeaconParams->paramChangeBitmap |= PARAM_OBSS_MODE_CHANGED; /* UPDATE AN ENUM FOR OBSS MODE <todo> */ } else if (!enable && (true == psessionEntry->beaconParams.gHTObssMode)) { - lim_log(pMac, LOGD, - FL("===> obss Protection disabled")); + pe_debug("===> obss Protection disabled"); psessionEntry->beaconParams.gHTObssMode = false; pBeaconParams->paramChangeBitmap |= PARAM_OBSS_MODE_CHANGED; @@ -3947,8 +3867,7 @@ static void lim_handle_ht20protection_enabled(tpAniSirGlobal mac_ctx, } /* This part is common for staiton as well. */ if (false == session_entry->beaconParams.ht20Coexist) { - lim_log(mac_ctx, LOGD, - FL("=> Protection from HT20 Enabled")); + pe_debug("=> Protection from HT20 Enabled"); beaconparams->ht20MhzCoexist = session_entry->beaconParams.ht20Coexist = true; beaconparams->paramChangeBitmap |= @@ -4031,8 +3950,7 @@ static void lim_handle_ht20coexist_ht20protection(tpAniSirGlobal mac_ctx, } } if (LIM_IS_AP_ROLE(session_entry)) { - lim_log(mac_ctx, LOGD, - FL("===> Protection from HT 20 Disabled")); + pe_debug("===> Protection from HT 20 Disabled"); beaconparams->ht20MhzCoexist = session_entry->beaconParams.ht20Coexist = false; beaconparams->paramChangeBitmap |= @@ -4040,8 +3958,7 @@ static void lim_handle_ht20coexist_ht20protection(tpAniSirGlobal mac_ctx, } if (!LIM_IS_AP_ROLE(session_entry)) { /* For station role */ - lim_log(mac_ctx, LOGD, - FL("===> Protection from HT20 Disabled")); + pe_debug("===> Protection from HT20 Disabled"); beaconparams->ht20MhzCoexist = session_entry->beaconParams.ht20Coexist = false; beaconparams->paramChangeBitmap |= @@ -4075,14 +3992,12 @@ tSirRetStatus lim_enable_ht20_protection(tpAniSirGlobal mac_ctx, uint8_t enable, if ((LIM_IS_AP_ROLE(session_entry)) && !session_entry->cfgProtection.ht20) { /* protection disabled. */ - lim_log(mac_ctx, LOGD, - FL("protection from HT20 is disabled")); + pe_debug("protection from HT20 is disabled"); return eSIR_SUCCESS; } else if (!LIM_IS_AP_ROLE(session_entry)) { if (!mac_ctx->lim.cfgProtection.ht20) { /* protection disabled. */ - lim_log(mac_ctx, LOGD, - FL("protection from HT20 is disabled")); + pe_debug("protection from HT20 is disabled"); return eSIR_SUCCESS; } } @@ -4121,15 +4036,13 @@ lim_enable_ht_non_gf_protection(tpAniSirGlobal pMac, uint8_t enable, if (LIM_IS_AP_ROLE(psessionEntry) && !psessionEntry->cfgProtection.nonGf) { /* protection disabled. */ - lim_log(pMac, LOGD, - FL("protection from NonGf is disabled")); + pe_debug("protection from NonGf is disabled"); return eSIR_SUCCESS; } else if (!LIM_IS_AP_ROLE(psessionEntry)) { /* normal protection config check */ if (!pMac->lim.cfgProtection.nonGf) { /* protection disabled. */ - lim_log(pMac, LOGD, - FL("protection from NonGf is disabled")); + pe_debug("protection from NonGf is disabled"); return eSIR_SUCCESS; } } @@ -4137,8 +4050,7 @@ lim_enable_ht_non_gf_protection(tpAniSirGlobal pMac, uint8_t enable, if (LIM_IS_AP_ROLE(psessionEntry)) { if ((enable) && (false == psessionEntry->beaconParams.llnNonGFCoexist)) { - lim_log(pMac, LOGD, - FL(" => Protection from non GF Enabled")); + pe_debug(" => Protection from non GF Enabled"); pBeaconParams->llnNonGFCoexist = psessionEntry->beaconParams.llnNonGFCoexist = true; pBeaconParams->paramChangeBitmap |= @@ -4146,8 +4058,7 @@ lim_enable_ht_non_gf_protection(tpAniSirGlobal pMac, uint8_t enable, } else if (!enable && (true == psessionEntry->beaconParams.llnNonGFCoexist)) { - lim_log(pMac, LOGD, - FL("===> Protection from Non GF Disabled")); + pe_debug("===> Protection from Non GF Disabled"); pBeaconParams->llnNonGFCoexist = psessionEntry->beaconParams.llnNonGFCoexist = false; pBeaconParams->paramChangeBitmap |= @@ -4156,8 +4067,7 @@ lim_enable_ht_non_gf_protection(tpAniSirGlobal pMac, uint8_t enable, } else { if ((enable) && (false == psessionEntry->beaconParams.llnNonGFCoexist)) { - lim_log(pMac, LOGD, - FL(" => Protection from non GF Enabled")); + pe_debug(" => Protection from non GF Enabled"); pBeaconParams->llnNonGFCoexist = psessionEntry->beaconParams.llnNonGFCoexist = true; pBeaconParams->paramChangeBitmap |= @@ -4165,8 +4075,7 @@ lim_enable_ht_non_gf_protection(tpAniSirGlobal pMac, uint8_t enable, } else if (!enable && (true == psessionEntry->beaconParams.llnNonGFCoexist)) { - lim_log(pMac, LOGD, - FL("===> Protection from Non GF Disabled")); + pe_debug("===> Protection from Non GF Disabled"); pBeaconParams->llnNonGFCoexist = psessionEntry->beaconParams.llnNonGFCoexist = false; pBeaconParams->paramChangeBitmap |= @@ -4201,15 +4110,13 @@ lim_enable_ht_lsig_txop_protection(tpAniSirGlobal pMac, uint8_t enable, if (LIM_IS_AP_ROLE(psessionEntry) && !psessionEntry->cfgProtection.lsigTxop) { /* protection disabled. */ - lim_log(pMac, LOGD, - FL(" protection from LsigTxop not supported is disabled")); + pe_debug("protection from LsigTxop not supported is disabled"); return eSIR_SUCCESS; } else if (!LIM_IS_AP_ROLE(psessionEntry)) { /* normal protection config check */ if (!pMac->lim.cfgProtection.lsigTxop) { /* protection disabled. */ - lim_log(pMac, LOGD, - FL(" protection from LsigTxop not supported is disabled")); + pe_debug("protection from LsigTxop not supported is disabled"); return eSIR_SUCCESS; } } @@ -4220,8 +4127,7 @@ lim_enable_ht_lsig_txop_protection(tpAniSirGlobal pMac, uint8_t enable, && (false == psessionEntry->beaconParams. fLsigTXOPProtectionFullSupport)) { - lim_log(pMac, LOGD, - FL(" => Protection from LsigTxop Enabled")); + pe_debug(" => Protection from LsigTxop Enabled"); pBeaconParams->fLsigTXOPProtectionFullSupport = psessionEntry->beaconParams. fLsigTXOPProtectionFullSupport = true; @@ -4231,8 +4137,7 @@ lim_enable_ht_lsig_txop_protection(tpAniSirGlobal pMac, uint8_t enable, && (true == psessionEntry->beaconParams. fLsigTXOPProtectionFullSupport)) { - lim_log(pMac, LOGD, - FL("===> Protection from LsigTxop Disabled")); + pe_debug("===> Protection from LsigTxop Disabled"); pBeaconParams->fLsigTXOPProtectionFullSupport = psessionEntry->beaconParams. fLsigTXOPProtectionFullSupport = false; @@ -4244,8 +4149,7 @@ lim_enable_ht_lsig_txop_protection(tpAniSirGlobal pMac, uint8_t enable, && (false == psessionEntry->beaconParams. fLsigTXOPProtectionFullSupport)) { - lim_log(pMac, LOGD, - FL(" => Protection from LsigTxop Enabled")); + pe_debug(" => Protection from LsigTxop Enabled"); pBeaconParams->fLsigTXOPProtectionFullSupport = psessionEntry->beaconParams. fLsigTXOPProtectionFullSupport = true; @@ -4255,8 +4159,7 @@ lim_enable_ht_lsig_txop_protection(tpAniSirGlobal pMac, uint8_t enable, && (true == psessionEntry->beaconParams. fLsigTXOPProtectionFullSupport)) { - lim_log(pMac, LOGD, - FL("===> Protection from LsigTxop Disabled")); + pe_debug("===> Protection from LsigTxop Disabled"); pBeaconParams->fLsigTXOPProtectionFullSupport = psessionEntry->beaconParams. fLsigTXOPProtectionFullSupport = false; @@ -4292,15 +4195,13 @@ lim_enable_ht_rifs_protection(tpAniSirGlobal pMac, uint8_t enable, if (LIM_IS_AP_ROLE(psessionEntry) && !psessionEntry->cfgProtection.rifs) { /* protection disabled. */ - lim_log(pMac, LOGD, - FL(" protection from Rifs is disabled")); + pe_debug("protection from Rifs is disabled"); return eSIR_SUCCESS; } else if (!LIM_IS_AP_ROLE(psessionEntry)) { /* normal protection config check */ if (!pMac->lim.cfgProtection.rifs) { /* protection disabled. */ - lim_log(pMac, LOGD, - FL(" protection from Rifs is disabled")); + pe_debug("protection from Rifs is disabled"); return eSIR_SUCCESS; } } @@ -4310,7 +4211,7 @@ lim_enable_ht_rifs_protection(tpAniSirGlobal pMac, uint8_t enable, /* Disabling the RIFS Protection means Enable the RIFS mode of operation in the BSS */ if ((!enable) && (false == psessionEntry->beaconParams.fRIFSMode)) { - lim_log(pMac, LOGD, FL(" => Rifs protection Disabled")); + pe_debug(" => Rifs protection Disabled"); pBeaconParams->fRIFSMode = psessionEntry->beaconParams.fRIFSMode = true; pBeaconParams->paramChangeBitmap |= @@ -4319,7 +4220,7 @@ lim_enable_ht_rifs_protection(tpAniSirGlobal pMac, uint8_t enable, /* Enabling the RIFS Protection means Disable the RIFS mode of operation in the BSS */ else if (enable && (true == psessionEntry->beaconParams.fRIFSMode)) { - lim_log(pMac, LOGD, FL("===> Rifs Protection Enabled")); + pe_debug("===> Rifs Protection Enabled"); pBeaconParams->fRIFSMode = psessionEntry->beaconParams.fRIFSMode = false; pBeaconParams->paramChangeBitmap |= @@ -4329,7 +4230,7 @@ lim_enable_ht_rifs_protection(tpAniSirGlobal pMac, uint8_t enable, /* Disabling the RIFS Protection means Enable the RIFS mode of operation in the BSS */ if ((!enable) && (false == psessionEntry->beaconParams.fRIFSMode)) { - lim_log(pMac, LOGD, FL(" => Rifs protection Disabled")); + pe_debug(" => Rifs protection Disabled"); pBeaconParams->fRIFSMode = psessionEntry->beaconParams.fRIFSMode = true; pBeaconParams->paramChangeBitmap |= @@ -4338,7 +4239,7 @@ lim_enable_ht_rifs_protection(tpAniSirGlobal pMac, uint8_t enable, /* Enabling the RIFS Protection means Disable the RIFS mode of operation in the BSS */ else if (enable && (true == psessionEntry->beaconParams.fRIFSMode)) { - lim_log(pMac, LOGD, FL("===> Rifs Protection Enabled")); + pe_debug("===> Rifs Protection Enabled"); pBeaconParams->fRIFSMode = psessionEntry->beaconParams.fRIFSMode = false; pBeaconParams->paramChangeBitmap |= @@ -4374,8 +4275,7 @@ lim_enable_short_preamble(tpAniSirGlobal pMac, uint8_t enable, if (wlan_cfg_get_int(pMac, WNI_CFG_SHORT_PREAMBLE, &val) != eSIR_SUCCESS) { /* Could not get short preamble enabled flag from CFG. Log error. */ - lim_log(pMac, LOGE, - FL("could not retrieve short preamble flag")); + pe_err("could not retrieve short preamble flag"); return eSIR_FAILURE; } @@ -4384,9 +4284,7 @@ lim_enable_short_preamble(tpAniSirGlobal pMac, uint8_t enable, if (wlan_cfg_get_int(pMac, WNI_CFG_11G_SHORT_PREAMBLE_ENABLED, &val) != eSIR_SUCCESS) { - lim_log(pMac, LOGE, - FL - ("could not retrieve 11G short preamble switching enabled flag")); + pe_err("could not retrieve 11G short preamble switching enabled flag"); return eSIR_FAILURE; } @@ -4395,7 +4293,7 @@ lim_enable_short_preamble(tpAniSirGlobal pMac, uint8_t enable, if (LIM_IS_AP_ROLE(psessionEntry)) { if (enable && (psessionEntry->beaconParams.fShortPreamble == 0)) { - lim_log(pMac, LOGD, FL("===> Short Preamble Enabled")); + pe_debug("===> Short Preamble Enabled"); psessionEntry->beaconParams.fShortPreamble = true; pBeaconParams->fShortPreamble = (uint8_t) psessionEntry->beaconParams. @@ -4405,7 +4303,7 @@ lim_enable_short_preamble(tpAniSirGlobal pMac, uint8_t enable, } else if (!enable && (psessionEntry->beaconParams.fShortPreamble == 1)) { - lim_log(pMac, LOGD, FL("===> Short Preamble Disabled")); + pe_debug("===> Short Preamble Disabled"); psessionEntry->beaconParams.fShortPreamble = false; pBeaconParams->fShortPreamble = (uint8_t) psessionEntry->beaconParams. @@ -4489,8 +4387,7 @@ void lim_update_sta_run_time_ht_switch_chnl_params(tpAniSirGlobal pMac, return; if (psessionEntry->ftPEContext.ftPreAuthSession) { - lim_log(pMac, LOGE, - FL("FT PREAUTH channel change is in progress")); + pe_err("FT PREAUTH channel change is in progress"); return; } @@ -4504,7 +4401,7 @@ void lim_update_sta_run_time_ht_switch_chnl_params(tpAniSirGlobal pMac, * end... */ if (pMac->lim.gpLimRemainOnChanReq) { - lim_log(pMac, LOGD, FL("RoC is in progress")); + pe_debug("RoC is in progress"); return; } @@ -4527,10 +4424,10 @@ void lim_update_sta_run_time_ht_switch_chnl_params(tpAniSirGlobal pMac, } /* notify HAL */ - lim_log(pMac, LOGW, FL("Channel Information in HT IE change" - "d; sending notification to HAL.")); - lim_log(pMac, LOGW, FL("Primary Channel: %d, Secondary Chan" - "nel Offset: %d, Channel Width: %d"), + pe_debug("Channel Information in HT IE change" + "d; sending notification to HAL."); + pe_debug("Primary Channel: %d Secondary Chan" + "nel Offset: %d Channel Width: %d", pHTInfo->primaryChannel, center_freq, psessionEntry->htRecommendedTxWidthSet); psessionEntry->channelChangeReasonCode = @@ -4705,15 +4602,13 @@ tSirRetStatus lim_process_hal_ind_messages(tpAniSirGlobal pMac, uint32_t msgId, default: qdf_mem_free(msgParam); - lim_log(pMac, LOGE, FL("invalid message id = %d received"), - msgId); + pe_err("invalid message id: %d received", msgId); return eSIR_FAILURE; } if (lim_post_msg_api(pMac, &msg) != eSIR_SUCCESS) { qdf_mem_free(msgParam); - lim_log(pMac, LOGE, FL("lim_post_msg_api failed for msgid = %d"), - msg.type); + pe_err("lim_post_msg_api failed for msgid: %d", msg.type); return eSIR_FAILURE; } return eSIR_SUCCESS; @@ -4750,8 +4645,7 @@ lim_validate_delts_req(tpAniSirGlobal mac_ctx, tpSirDeltsReq delts_req, * - del sta tspec locally */ if (delts_req == NULL) { - lim_log(mac_ctx, LOGE, - FL("Delete TS request pointer is NULL")); + pe_err("Delete TS request pointer is NULL"); return eSIR_FAILURE; } @@ -4787,16 +4681,14 @@ lim_validate_delts_req(tpAniSirGlobal mac_ctx, tpSirDeltsReq delts_req, } if (sta == NULL) { - lim_log(mac_ctx, LOGE, - FL("Cannot find station context for delts req")); + pe_err("Cannot find station context for delts req"); return eSIR_FAILURE; } if ((!sta->valid) || (sta->mlmStaContext.mlmState != eLIM_MLM_LINK_ESTABLISHED_STATE)) { - lim_log(mac_ctx, LOGE, - FL("Invalid Sta (or state) for DelTsReq")); + pe_err("Invalid Sta (or state) for DelTsReq"); return eSIR_FAILURE; } @@ -4813,15 +4705,13 @@ lim_validate_delts_req(tpAniSirGlobal mac_ctx, tpSirDeltsReq delts_req, else if (sta->lleEnabled) delts_req->req.lleTspecPresent = 1; else { - lim_log(mac_ctx, LOGW, - FL("DELTS_REQ ignore - qos is disabled")); + pe_warn("DELTS_REQ ignore - qos is disabled"); return eSIR_FAILURE; } tsinfo = delts_req->req.wmeTspecPresent ? &delts_req->req.tspec.tsinfo : &delts_req->req.tsinfo; - lim_log(mac_ctx, LOGD, - FL("received DELTS_REQ message (wmeTspecPresent = %d, lleTspecPresent = %d, wsmTspecPresent = %d, tsid %d, up %d, direction = %d)"), + pe_debug("received DELTS_REQ message wmeTspecPresent: %d lleTspecPresent: %d wsmTspecPresent: %d tsid: %d up: %d direction: %d", delts_req->req.wmeTspecPresent, delts_req->req.lleTspecPresent, delts_req->req.wsmTspecPresent, tsinfo->traffic.tsid, @@ -4830,8 +4720,7 @@ lim_validate_delts_req(tpAniSirGlobal mac_ctx, tpSirDeltsReq delts_req, /* if no Access Control, ignore the request */ if (lim_admit_control_delete_ts(mac_ctx, sta->assocId, tsinfo, &ts_status, &tspec_idx) != eSIR_SUCCESS) { - lim_log(mac_ctx, LOGE, - FL("ERROR DELTS request for sta assocId %d (tsid %d, up %d)"), + pe_err("DELTS request for sta assocId: %d tsid: %d up: %d", sta->assocId, tsinfo->traffic.tsid, tsinfo->traffic.userPrio); return eSIR_FAILURE; @@ -4846,8 +4735,7 @@ lim_validate_delts_req(tpAniSirGlobal mac_ctx, tpSirDeltsReq delts_req, tspec_idx, delts_req->req, psession_entry->peSessionId, psession_entry->bssId)) { - lim_log(mac_ctx, LOGW, - FL("DelTs with UP %d failed in lim_send_hal_msg_del_ts - ignoring request"), + pe_warn("DelTs with UP: %d failed in lim_send_hal_msg_del_ts - ignoring request", tsinfo->traffic.userPrio); return eSIR_FAILURE; } @@ -4868,7 +4756,7 @@ void lim_register_hal_ind_call_back(tpAniSirGlobal pMac) pHalCB = qdf_mem_malloc(sizeof(tHalIndCB)); if (NULL == pHalCB) { - lim_log(pMac, LOGE, FL("AllocateMemory() failed")); + pe_err("AllocateMemory() failed"); return; } @@ -4881,7 +4769,7 @@ void lim_register_hal_ind_call_back(tpAniSirGlobal pMac) MTRACE(mac_trace_msg_tx(pMac, NO_SESSION, msg.type)); if (eSIR_SUCCESS != wma_post_ctrl_msg(pMac, &msg)) { qdf_mem_free(pHalCB); - lim_log(pMac, LOGE, FL("wma_post_ctrl_msg() failed")); + pe_err("wma_post_ctrl_msg() failed"); } return; @@ -4913,8 +4801,7 @@ void lim_process_del_ts_ind(tpAniSirGlobal pMac, tpSirMsgQ limMsg) psessionEntry = pe_find_session_by_bssid(pMac, pDelTsParam->bssId, &sessionId); if (psessionEntry == NULL) { - lim_log(pMac, LOGE, - FL("session does not exist for given BssId")); + pe_err("session does not exist for given BssId"); qdf_mem_free(limMsg->bodyptr); limMsg->bodyptr = NULL; return; @@ -4922,8 +4809,7 @@ void lim_process_del_ts_ind(tpAniSirGlobal pMac, tpSirMsgQ limMsg) pTspecInfo = &(pMac->lim.tspecInfo[pDelTsParam->tspecIdx]); if (pTspecInfo->inuse == false) { - lim_log(pMac, LOGE, - FL("tspec entry with index %d is not in use"), + pe_err("tspec entry with index: %d is not in use", pDelTsParam->tspecIdx); goto error1; } @@ -4932,15 +4818,14 @@ void lim_process_del_ts_ind(tpAniSirGlobal pMac, tpSirMsgQ limMsg) dph_get_hash_entry(pMac, pTspecInfo->assocId, &psessionEntry->dph.dphHashTable); if (pSta == NULL) { - lim_log(pMac, LOGE, - FL("Could not find entry in DPH table for assocId = %d"), + pe_err("Could not find entry in DPH table for assocId: %d", pTspecInfo->assocId); goto error1; } pDelTsReq = qdf_mem_malloc(sizeof(tSirDeltsReq)); if (NULL == pDelTsReq) { - lim_log(pMac, LOGE, FL("AllocateMemory() failed")); + pe_err("AllocateMemory() failed"); goto error1; } @@ -4955,10 +4840,10 @@ void lim_process_del_ts_ind(tpAniSirGlobal pMac, tpSirMsgQ limMsg) /* validate the req */ if (eSIR_SUCCESS != lim_validate_delts_req(pMac, pDelTsReq, peerMacAddr, psessionEntry)) { - lim_log(pMac, LOGE, FL("lim_validate_delts_req failed")); + pe_err("lim_validate_delts_req failed"); goto error2; } - lim_log(pMac, LOGD, "Sent DELTS request to station with " + pe_debug("Sent DELTS request to station with " "assocId = %d MacAddr = " MAC_ADDRESS_STR, pDelTsReq->aid, MAC_ADDR_ARRAY(peerMacAddr)); @@ -4970,7 +4855,7 @@ void lim_process_del_ts_ind(tpAniSirGlobal pMac, tpSirMsgQ limMsg) /* prepare and send an sme indication to HDD */ pDelTsReqInfo = qdf_mem_malloc(sizeof(tSirDeltsReqInfo)); if (NULL == pDelTsReqInfo) { - lim_log(pMac, LOGE, FL("AllocateMemory() failed")); + pe_err("AllocateMemory() failed"); goto error3; } @@ -5026,7 +4911,7 @@ lim_post_sm_state_update(tpAniSirGlobal pMac, /* Allocate for WMA_SET_MIMOPS_REQ */ pMIMO_PSParams = qdf_mem_malloc(sizeof(tSetMIMOPS)); if (NULL == pMIMO_PSParams) { - lim_log(pMac, LOGE, FL(" AllocateMemory failed")); + pe_err(" AllocateMemory failed"); return eSIR_MEM_ALLOC_FAILED; } @@ -5039,14 +4924,12 @@ lim_post_sm_state_update(tpAniSirGlobal pMac, msgQ.bodyptr = pMIMO_PSParams; msgQ.bodyval = 0; - lim_log(pMac, LOGD, FL("Sending WMA_SET_MIMOPS_REQ...")); + pe_debug("Sending WMA_SET_MIMOPS_REQ"); MTRACE(mac_trace_msg_tx(pMac, NO_SESSION, msgQ.type)); retCode = wma_post_ctrl_msg(pMac, &msgQ); if (eSIR_SUCCESS != retCode) { - lim_log(pMac, LOGE, - FL - ("Posting WMA_SET_MIMOPS_REQ to HAL failed! Reason = %d"), + pe_err("Posting WMA_SET_MIMOPS_REQ to HAL failed! Reason: %d", retCode); qdf_mem_free(pMIMO_PSParams); return retCode; @@ -5124,8 +5007,7 @@ tAniBool lim_is_channel_valid_for_channel_switch(tpAniSirGlobal pMac, uint8_t ch (uint8_t *) validChannelList, (uint32_t *) &validChannelListLen) != eSIR_SUCCESS) { - lim_log(pMac, LOGE, - FL("could not retrieve valid channel list")); + pe_err("could not retrieve valid channel list"); return eSIR_FALSE; } @@ -5181,7 +5063,7 @@ __lim_fill_tx_control_params(tpAniSirGlobal pMac, tpTxControlParams pTxCtrlMsg, case eLIM_TX_BSS: /* Fall thru... */ default: - lim_log(pMac, LOGW, FL("Invalid case: Not Handled")); + pe_warn("Invalid case: Not Handled"); return QDF_STATUS_E_FAILURE; } @@ -5221,15 +5103,14 @@ void lim_frame_transmission_control(tpAniSirGlobal pMac, tLimQuietTxMode type, pTxCtrlMsg = qdf_mem_malloc(sizeof(*pTxCtrlMsg) + nBytes); if (NULL == pTxCtrlMsg) { - lim_log(pMac, LOGE, FL("AllocateMemory() failed")); + pe_err("AllocateMemory() failed"); return; } status = __lim_fill_tx_control_params(pMac, pTxCtrlMsg, type, mode); if (status != QDF_STATUS_SUCCESS) { qdf_mem_free(pTxCtrlMsg); - lim_log(pMac, LOGE, - FL("__lim_fill_tx_control_params failed, status = %d"), + pe_err("__lim_fill_tx_control_params failed, status: %d", status); return; } @@ -5242,12 +5123,11 @@ void lim_frame_transmission_control(tpAniSirGlobal pMac, tLimQuietTxMode type, MTRACE(mac_trace_msg_tx(pMac, NO_SESSION, msgQ.type)); if (wma_post_ctrl_msg(pMac, &msgQ) != eSIR_SUCCESS) { qdf_mem_free(pTxCtrlMsg); - lim_log(pMac, LOGE, FL("Posting Message to HAL failed")); + pe_err("Posting Message to HAL failed"); return; } - lim_log(pMac, LOGD, - FL("Stopping the transmission of all packets, indicated softmac tx_control: %d,"), + pe_debug("Stopping the transmission of all packets, indicated softmac tx_control: %d", mode); return; @@ -5345,8 +5225,7 @@ lim_prepare_for11h_channel_switch(tpAniSirGlobal pMac, tpPESession psessionEntry if (pMac->lim.gLimSmeState == eLIM_SME_LINK_EST_WT_SCAN_STATE || pMac->lim.gLimSmeState == eLIM_SME_CHANNEL_SCAN_STATE) { - lim_log(pMac, LOGD, - FL("Posting finish scan as we are in scan state")); + pe_debug("Posting finish scan as we are in scan state"); /* Stop ongoing scanning if any */ if (GET_LIM_PROCESS_DEFD_MESGS(pMac)) { /* Set the resume channel to Any valid channel (invalid). */ @@ -5357,8 +5236,7 @@ lim_prepare_for11h_channel_switch(tpAniSirGlobal pMac, tpPESession psessionEntry } return; } else { - lim_log(pMac, LOGD, - FL("Not in scan state, start channel switch timer")); + pe_debug("Not in scan state, start channel switch timer"); /** We are safe to switch channel at this point */ lim_stop_tx_and_switch_channel(pMac, psessionEntry->peSessionId); } @@ -5400,7 +5278,7 @@ tSirNwType lim_get_nw_type(tpAniSirGlobal pMac, uint8_t channelNum, uint32_t typ } } if (pBeacon->extendedRatesPresent) { - lim_log(pMac, LOGD, FL("Beacon, nwtype=G")); + pe_debug("Beacon, nwtype: G"); nwType = eSIR_11G_NW_TYPE; } else if (pBeacon->HTInfo.present || IS_BSS_VHT_CAPABLE(pBeacon->VHTCaps)) { @@ -5408,7 +5286,7 @@ tSirNwType lim_get_nw_type(tpAniSirGlobal pMac, uint8_t channelNum, uint32_t typ } } else { /* 11a packet */ - lim_log(pMac, LOGD, FL("Beacon, nwtype=A")); + pe_debug("Beacon, nwtype: A"); nwType = eSIR_11A_NW_TYPE; } } @@ -5445,7 +5323,7 @@ void lim_set_tspec_uapsd_mask_per_session(tpAniSirGlobal pMac, uint16_t direction = pTsInfo->traffic.direction; uint8_t ac = upToAc(userPrio); - lim_log(pMac, LOGD, FL("Set UAPSD mask for AC %d, dir %d, action=%d") + pe_debug("Set UAPSD mask for AC: %d dir: %d action: %d" , ac, direction, action); /* Converting AC to appropriate Uapsd Bit Mask @@ -5484,8 +5362,7 @@ void lim_set_tspec_uapsd_mask_per_session(tpAniSirGlobal pMac, } } - lim_log(pMac, LOGD, - FL("New session entry for UAPSD, trigger=0x%x, delivery=0x%x"), + pe_debug("New session entry for UAPSD, trigger: 0x%x delivery: 0x%x", psessionEntry->gUapsdPerAcTriggerEnableMask, psessionEntry->gUapsdPerAcDeliveryEnableMask); @@ -5526,7 +5403,7 @@ void lim_handle_heart_beat_timeout_for_session(tpAniSirGlobal mac_ctx, * Activate Probe After HeartBeat Timer incase HB * Failure detected */ - lim_log(mac_ctx, LOGD, FL("Sending Probe for Session: %d"), + pe_debug("Sending Probe for Session: %d", psession_entry->bssIdx); lim_deactivate_and_change_timer(mac_ctx, eLIM_PROBE_AFTER_HB_TIMER); @@ -5534,8 +5411,7 @@ void lim_handle_heart_beat_timeout_for_session(tpAniSirGlobal mac_ctx, eLIM_PROBE_AFTER_HB_TIMER)); if (tx_timer_activate(&lim_timer->gLimProbeAfterHBTimer) != TX_SUCCESS) - lim_log(mac_ctx, LOGE, - FL("Fail to re-activate Probe-after-hb timer")); + pe_err("Fail to re-activate Probe-after-hb timer"); } } @@ -5573,8 +5449,7 @@ void lim_process_add_sta_rsp(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) session = pe_find_session_by_session_id(mac_ctx, add_sta_params->sessionId); if (session == NULL) { - lim_log(mac_ctx, LOGE, - FL("Session Does not exist for given sessionID")); + pe_err("Session Does not exist for given sessionID"); qdf_mem_free(add_sta_params); return; } @@ -5648,7 +5523,7 @@ void lim_handle_heart_beat_failure_timeout(tpAniSirGlobal mac_ctx) psession_entry = &mac_ctx->lim.gpSession[i]; if (psession_entry->LimHBFailureStatus != true) continue; - lim_log(mac_ctx, LOGE, FL("SME %d, MLME %d, HB-Count %d"), + pe_debug("SME: %d MLME: %d HB-Count: %d", psession_entry->limSmeState, psession_entry->limMlmState, psession_entry->LimRxedBeaconCntDuringHB); @@ -5669,7 +5544,7 @@ void lim_handle_heart_beat_failure_timeout(tpAniSirGlobal mac_ctx) * beacon after connection. */ (psession_entry->currentBssBeaconCnt == 0))) { - lim_log(mac_ctx, LOGE, FL("for session:%d "), + pe_debug("for session: %d", psession_entry->peSessionId); /* * AP did not respond to Probe Request. @@ -5680,8 +5555,7 @@ void lim_handle_heart_beat_failure_timeout(tpAniSirGlobal mac_ctx) eSIR_BEACON_MISSED); mac_ctx->lim.gLimProbeFailureAfterHBfailedCnt++; } else { - lim_log(mac_ctx, LOGE, - FL("Unexpected wt-probe-timeout in state ")); + pe_err("Unexpected wt-probe-timeout in state"); lim_print_mlm_state(mac_ctx, LOGE, psession_entry->limMlmState); } @@ -5802,9 +5676,7 @@ uint8_t *lim_get_ie_ptr_new(tpAniSirGlobal pMac, uint8_t *pIes, int length, left -= (size_of_len_field + 1); if (elem_len > left) { - lim_log(pMac, LOGE, - FL - ("****Invalid IEs eid = %d elem_len=%d left=%d*****"), + pe_err("Invalid IEs eid: %d elem_len: %d left: %d", eid, elem_len, left); return NULL; } @@ -5988,23 +5860,21 @@ void lim_pmf_sa_query_timer_handler(void *pMacGlobal, uint32_t param) tpDphHashNode pSta; uint32_t maxRetries; - lim_log(pMac, LOGD, FL("SA Query timer fires")); + pe_debug("SA Query timer fires"); timerId.value = param; /* Check that SA Query is in progress */ psessionEntry = pe_find_session_by_session_id(pMac, timerId.fields.sessionId); if (psessionEntry == NULL) { - lim_log(pMac, LOGE, - FL("Session does not exist for given session ID %d"), + pe_err("Session does not exist for given session ID: %d", timerId.fields.sessionId); return; } pSta = dph_get_hash_entry(pMac, timerId.fields.peerIdx, &psessionEntry->dph.dphHashTable); if (pSta == NULL) { - lim_log(pMac, LOGE, - FL("Entry does not exist for given peer index %d"), + pe_err("Entry does not exist for given peer index: %d", timerId.fields.peerIdx); return; } @@ -6014,15 +5884,13 @@ void lim_pmf_sa_query_timer_handler(void *pMacGlobal, uint32_t param) /* Increment the retry count, check if reached maximum */ if (wlan_cfg_get_int(pMac, WNI_CFG_PMF_SA_QUERY_MAX_RETRIES, &maxRetries) != eSIR_SUCCESS) { - lim_log(pMac, LOGE, - FL - ("Could not retrieve PMF SA Query maximum retries value")); + pe_err("Could not retrieve PMF SA Query maximum retries value"); pSta->pmfSaQueryState = DPH_SA_QUERY_NOT_IN_PROGRESS; return; } pSta->pmfSaQueryRetryCount++; if (pSta->pmfSaQueryRetryCount >= maxRetries) { - lim_log(pMac, LOGE, FL("SA Query timed out,Deleting STA")); + pe_err("SA Query timed out,Deleting STA"); lim_print_mac_addr(pMac, pSta->staAddr, LOGE); lim_send_disassoc_mgmt_frame(pMac, eSIR_MAC_DISASSOC_DUE_TO_INACTIVITY_REASON, @@ -6037,10 +5905,9 @@ void lim_pmf_sa_query_timer_handler(void *pMacGlobal, uint32_t param) pmfSaQueryCurrentTransId), pSta->staAddr, psessionEntry); pSta->pmfSaQueryCurrentTransId++; - lim_log(pMac, LOGE, FL("Starting SA Query retry %d"), - pSta->pmfSaQueryRetryCount); + pe_debug("Starting SA Query retry: %d", pSta->pmfSaQueryRetryCount); if (tx_timer_activate(&pSta->pmfSaQueryTimer) != TX_SUCCESS) { - lim_log(pMac, LOGE, FL("PMF SA Query timer activation failed!")); + pe_err("PMF SA Query timer activation failed!"); pSta->pmfSaQueryState = DPH_SA_QUERY_NOT_IN_PROGRESS; } } @@ -6139,8 +6006,7 @@ void lim_get_short_slot_from_phy_mode(tpAniSirGlobal pMac, tpPESession psessionE val = false; } - lim_log(pMac, LOGD, FL("phyMode = %u shortslotsupported = %u"), phyMode, - val); + pe_debug("phyMode: %u shortslotsupported: %u", phyMode, val); *pShortSlotEnabled = val; } @@ -6202,7 +6068,7 @@ void lim_set_ht_caps(tpAniSirGlobal p_mac, tpPESession p_session_entry, populate_dot11f_ht_caps(p_mac, p_session_entry, &dot11_ht_cap); p_ie = lim_get_ie_ptr_new(p_mac, p_ie_start, num_bytes, DOT11F_EID_HTCAPS, ONE_BYTE); - lim_log(p_mac, LOGD, FL("p_ie %p dot11_ht_cap.supportedMCSSet[0]=0x%x"), + pe_debug("p_ie: %p dot11_ht_cap.supportedMCSSet[0]: 0x%x", p_ie, dot11_ht_cap.supportedMCSSet[0]); if (p_ie) { /* convert from unpacked to packed structure */ @@ -6345,8 +6211,7 @@ bool lim_validate_received_frame_a1_addr(tpAniSirGlobal mac_ctx, tSirMacAddr a1, tpPESession session) { if (mac_ctx == NULL || session == NULL) { - QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG, - "mac or session context is null"); + pe_err("mac or session context is null"); /* let main routine handle it */ return true; } @@ -6355,8 +6220,7 @@ bool lim_validate_received_frame_a1_addr(tpAniSirGlobal mac_ctx, return true; } if (qdf_mem_cmp(a1, session->selfMacAddr, 6)) { - lim_log(mac_ctx, LOGE, - FL("Invalid A1 address in received frame")); + pe_err("Invalid A1 address in received frame"); return false; } return true; @@ -6413,8 +6277,7 @@ void lim_set_stads_rtt_cap(tpDphHashNode sta_ds, struct s_ext_cap *ext_cap, RTT_FINE_TIME_MEAS_RESPONDER_CAPABILITY : RTT_INVALID; - lim_log(mac_ctx, LOGD, - FL("ExtCap present, timingMeas: %d Initiator: %d Responder: %d"), + pe_debug("ExtCap present, timingMeas: %d Initiator: %d Responder: %d", ext_cap->timing_meas, ext_cap->fine_time_meas_initiator, ext_cap->fine_time_meas_responder); } @@ -6443,7 +6306,7 @@ static QDF_STATUS lim_send_ie(tpAniSirGlobal mac_ctx, uint32_t sme_session_id, /* Allocate memory for the WMI request */ ie_msg = qdf_mem_malloc(sizeof(*ie_msg) + len); if (!ie_msg) { - lim_log(mac_ctx, LOGE, FL("Failed to allocate memory")); + pe_err("Failed to allocate memory"); return QDF_STATUS_E_NOMEM; } @@ -6461,8 +6324,7 @@ static QDF_STATUS lim_send_ie(tpAniSirGlobal mac_ctx, uint32_t sme_session_id, status = cds_mq_post_message(QDF_MODULE_ID_WMA, &msg); if (QDF_STATUS_SUCCESS != status) { - lim_log(mac_ctx, LOGE, - FL("Not able to post WMA_SET_IE_INFO to WMA")); + pe_err("Not able to post WMA_SET_IE_INFO to WMA"); qdf_mem_free(ie_msg); return status; } @@ -6483,7 +6345,7 @@ bool lim_get_rx_ldpc(tpAniSirGlobal mac_ctx, uint8_t ch, enum hw_mode_dbs_capab hw_mode_to_use; hw_mode_to_use = is_hw_mode_dbs ? HW_MODE_DBS : HW_MODE_DBS_NONE; - lim_log(mac_ctx, LOG1, FL("ch[%d] rx_ldpc[%d] hw_mode_to_use[%d]"), + pe_debug("ch: %d rx_ldpc: %d hw_mode_to_use: %d", ch, is_hw_mode_dbs, hw_mode_to_use); if (mac_ctx->roam.configParam.rx_ldpc_enable && wma_is_rx_ldpc_supported_for_channel( @@ -6613,7 +6475,7 @@ QDF_STATUS lim_send_ext_cap_ie(tpAniSirGlobal mac_ctx, status = populate_dot11f_ext_cap(mac_ctx, vht_enabled, &ext_cap_data, NULL); if (eSIR_SUCCESS != status) { - lim_log(mac_ctx, LOGE, FL("Failed to populate ext cap IE")); + pe_err("Failed to populate ext cap IE"); return QDF_STATUS_E_FAILURE; } @@ -6628,7 +6490,7 @@ QDF_STATUS lim_send_ext_cap_ie(tpAniSirGlobal mac_ctx, /* Allocate memory for the WMI request, and copy the parameter */ vdev_ie = qdf_mem_malloc(sizeof(*vdev_ie) + num_bytes); if (!vdev_ie) { - lim_log(mac_ctx, LOGE, FL("Failed to allocate memory")); + pe_err("Failed to allocate memory"); return QDF_STATUS_E_NOMEM; } @@ -6637,11 +6499,11 @@ QDF_STATUS lim_send_ext_cap_ie(tpAniSirGlobal mac_ctx, vdev_ie->length = num_bytes; vdev_ie->band = 0; - lim_log(mac_ctx, LOGD, FL("vdev %d ieid %d len %d"), session_id, + pe_debug("vdev: %d ieid: %d len: %d", session_id, DOT11F_EID_EXTCAP, num_bytes); temp = ext_cap_data.bytes; for (i = 0; i < num_bytes; i++, temp++) - lim_log(mac_ctx, LOGD, FL("%d byte is %02x"), i+1, *temp); + pe_debug("%d byte is %02x", i+1, *temp); vdev_ie->data = (uint8_t *)vdev_ie + sizeof(*vdev_ie); qdf_mem_copy(vdev_ie->data, ext_cap_data.bytes, num_bytes); @@ -6652,8 +6514,7 @@ QDF_STATUS lim_send_ext_cap_ie(tpAniSirGlobal mac_ctx, if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) { - lim_log(mac_ctx, LOGE, - FL("Not able to post WMA_SET_IE_INFO to WDA")); + pe_err("Not able to post WMA_SET_IE_INFO to WDA"); qdf_mem_free(vdev_ie); return QDF_STATUS_E_FAILURE; } @@ -6691,13 +6552,13 @@ tSirRetStatus lim_strip_ie(tpAniSirGlobal mac_ctx, uint16_t elem_len; if (NULL == addn_ie) { - lim_log(mac_ctx, LOGD, FL("NULL addn_ie pointer")); + pe_err("NULL addn_ie pointer"); return eSIR_IGNORE_IE; } tempbuf = qdf_mem_malloc(left); if (NULL == tempbuf) { - lim_log(mac_ctx, LOGE, FL("Unable to allocate memory")); + pe_err("Unable to allocate memory"); return eSIR_MEM_ALLOC_FAILED; } @@ -6712,8 +6573,7 @@ tSirRetStatus lim_strip_ie(tpAniSirGlobal mac_ctx, left -= 1; } if (elem_len > left) { - lim_log(mac_ctx, LOGE, - FL("Invalid IEs eid = %d elem_len=%d left=%d"), + pe_err("Invalid IEs eid: %d elem_len: %d left: %d", elem_id, elem_len, left); qdf_mem_free(tempbuf); return eSIR_FAILURE; @@ -6766,15 +6626,14 @@ tSirRetStatus lim_strip_supp_op_class_update_struct(tpAniSirGlobal mac_ctx, NULL, 0, extracted_buff, DOT11F_IE_SUPPOPERATINGCLASSES_MAX_LEN); if (eSIR_SUCCESS != status) { - lim_log(mac_ctx, LOGD, - FL("Failed to strip supp_op_mode IE status = (%d)."), + pe_warn("Failed to strip supp_op_mode IE status: %d", status); return status; } if (DOT11F_EID_SUPPOPERATINGCLASSES != extracted_buff[0] || extracted_buff[1] > DOT11F_IE_SUPPOPERATINGCLASSES_MAX_LEN) { - lim_log(mac_ctx, LOGD, FL("Invalid IEs eid = %d elem_len=%d "), + pe_warn("Invalid IEs eid: %d elem_len: %d", extracted_buff[0], extracted_buff[1]); return eSIR_FAILURE; } @@ -6782,7 +6641,7 @@ tSirRetStatus lim_strip_supp_op_class_update_struct(tpAniSirGlobal mac_ctx, /* update the extracted supp op class to struct*/ if (DOT11F_PARSE_SUCCESS != dot11f_unpack_ie_supp_operating_classes( mac_ctx, &extracted_buff[2], extracted_buff[1], dst)) { - lim_log(mac_ctx, LOGE, FL("dot11f_unpack Parse Error ")); + pe_err("dot11f_unpack Parse Error"); return eSIR_FAILURE; } @@ -6806,17 +6665,17 @@ void lim_update_extcap_struct(tpAniSirGlobal mac_ctx, uint8_t out[DOT11F_IE_EXTCAP_MAX_LEN]; if (NULL == buf) { - lim_log(mac_ctx, LOGE, FL("Invalid Buffer Address")); + pe_err("Invalid Buffer Address"); return; } if (NULL == dst) { - lim_log(mac_ctx, LOGE, FL("NULL dst pointer")); + pe_err("NULL dst pointer"); return; } if (DOT11F_EID_EXTCAP != buf[0] || buf[1] > DOT11F_IE_EXTCAP_MAX_LEN) { - lim_log(mac_ctx, LOGD, FL("Invalid IEs eid = %d elem_len=%d "), + pe_warn("Invalid IEs eid: %d elem_len: %d", buf[0], buf[1]); return; } @@ -6826,7 +6685,7 @@ void lim_update_extcap_struct(tpAniSirGlobal mac_ctx, if (DOT11F_PARSE_SUCCESS != dot11f_unpack_ie_ext_cap(mac_ctx, &out[0], buf[1], dst)) - lim_log(mac_ctx, LOGE, FL("dot11f_unpack Parse Error ")); + pe_err("dot11f_unpack Parse Error"); } /** @@ -6855,8 +6714,7 @@ tSirRetStatus lim_strip_extcap_update_struct(tpAniSirGlobal mac_ctx, NULL, 0, extracted_buff, DOT11F_IE_EXTCAP_MAX_LEN); if (eSIR_SUCCESS != status) { - lim_log(mac_ctx, LOGD, - FL("Failed to strip extcap IE status = (%d)."), status); + pe_err("Failed to strip extcap IE status: %d", status); return status; } @@ -6988,8 +6846,7 @@ void lim_init_obss_params(tpAniSirGlobal mac_ctx, tpPESession session) if (wlan_cfg_get_int(mac_ctx, WNI_CFG_OBSS_HT40_SCAN_ACTIVE_DWELL_TIME, &cfg_value) != eSIR_SUCCESS) { - lim_log(mac_ctx, LOGE, - FL("Fail to retrieve %x value"), + pe_err("Fail to retrieve: %x value", WNI_CFG_OBSS_HT40_SCAN_ACTIVE_DWELL_TIME); return; } @@ -6997,8 +6854,7 @@ void lim_init_obss_params(tpAniSirGlobal mac_ctx, tpPESession session) if (wlan_cfg_get_int(mac_ctx, WNI_CFG_OBSS_HT40_SCAN_PASSIVE_DWELL_TIME, &cfg_value) != eSIR_SUCCESS) { - lim_log(mac_ctx, LOGE, - FL("Fail to retrieve %x value"), + pe_err("Fail to retrieve: %x value", WNI_CFG_OBSS_HT40_SCAN_PASSIVE_DWELL_TIME); return; } @@ -7007,8 +6863,7 @@ void lim_init_obss_params(tpAniSirGlobal mac_ctx, tpPESession session) if (wlan_cfg_get_int(mac_ctx, WNI_CFG_OBSS_HT40_SCAN_WIDTH_TRIGGER_INTERVAL, &cfg_value) != eSIR_SUCCESS) { - lim_log(mac_ctx, LOGE, - FL("Fail to retrieve %x value"), + pe_err("Fail to retrieve: %x value", WNI_CFG_OBSS_HT40_SCAN_WIDTH_TRIGGER_INTERVAL); return; } @@ -7016,8 +6871,7 @@ void lim_init_obss_params(tpAniSirGlobal mac_ctx, tpPESession session) if (wlan_cfg_get_int(mac_ctx, WNI_CFG_OBSS_HT40_SCAN_ACTIVE_TOTAL_PER_CHANNEL, &cfg_value) != eSIR_SUCCESS) { - lim_log(mac_ctx, LOGE, - FL("Fail to retrieve %x value"), + pe_err("Fail to retrieve: %x value", WNI_CFG_OBSS_HT40_SCAN_ACTIVE_TOTAL_PER_CHANNEL); return; } @@ -7025,8 +6879,7 @@ void lim_init_obss_params(tpAniSirGlobal mac_ctx, tpPESession session) if (wlan_cfg_get_int(mac_ctx, WNI_CFG_OBSS_HT40_SCAN_PASSIVE_TOTAL_PER_CHANNEL, &cfg_value) != eSIR_SUCCESS) { - lim_log(mac_ctx, LOGE, - FL("Fail to retrieve %x value"), + pe_err("Fail to retrieve: %x value", WNI_CFG_OBSS_HT40_SCAN_PASSIVE_TOTAL_PER_CHANNEL); return; } @@ -7035,8 +6888,7 @@ void lim_init_obss_params(tpAniSirGlobal mac_ctx, tpPESession session) if (wlan_cfg_get_int(mac_ctx, WNI_CFG_OBSS_HT40_WIDTH_CH_TRANSITION_DELAY, &cfg_value) != eSIR_SUCCESS) { - lim_log(mac_ctx, LOGE, - FL("Fail to retrieve %x value"), + pe_err("Fail to retrieve: %x value", WNI_CFG_OBSS_HT40_WIDTH_CH_TRANSITION_DELAY); return; } @@ -7045,8 +6897,7 @@ void lim_init_obss_params(tpAniSirGlobal mac_ctx, tpPESession session) if (wlan_cfg_get_int(mac_ctx, WNI_CFG_OBSS_HT40_SCAN_ACTIVITY_THRESHOLD, &cfg_value) != eSIR_SUCCESS) { - lim_log(mac_ctx, LOGE, - FL("Fail to retrieve %x value"), + pe_err("Fail to retrieve: %x value", WNI_CFG_OBSS_HT40_SCAN_ACTIVITY_THRESHOLD); return; } @@ -7153,9 +7004,7 @@ bool lim_is_robust_mgmt_action_frame(uint8_t action_category) case SIR_MAC_ACTION_FST: return true; default: - QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG, - FL("non-PMF action category[%d] "), - action_category); + pe_warn("non-PMF action category: %d", action_category); break; } return false; @@ -7199,20 +7048,17 @@ void lim_update_caps_info_for_bss(tpAniSirGlobal mac_ctx, { if (!(bss_caps & LIM_SPECTRUM_MANAGEMENT_BIT_MASK)) { *caps &= (~LIM_SPECTRUM_MANAGEMENT_BIT_MASK); - lim_log(mac_ctx, LOGD, - FL("Clearing spectrum management:no AP support")); + pe_debug("Clearing spectrum management:no AP support"); } if (!(bss_caps & LIM_SHORT_PREAMBLE_BIT_MASK)) { *caps &= (~LIM_SHORT_PREAMBLE_BIT_MASK); - lim_log(mac_ctx, LOGD, - FL("Clearing short preamble:no AP support")); + pe_debug("Clearing short preamble:no AP support"); } if (!(bss_caps & LIM_IMMEDIATE_BLOCK_ACK_MASK)) { *caps &= (~LIM_IMMEDIATE_BLOCK_ACK_MASK); - lim_log(mac_ctx, LOGD, - FL("Clearing Immed Blk Ack:no AP support")); + pe_debug("Clearing Immed Blk Ack:no AP support"); } } /** @@ -7232,13 +7078,12 @@ void lim_send_set_dtim_period(tpAniSirGlobal mac_ctx, uint8_t dtim_period, tSirMsgQ msg; if (session == NULL) { - lim_log(mac_ctx, LOGE, FL("Inavalid parameters")); + pe_err("Inavalid parameters"); return; } dtim_params = qdf_mem_malloc(sizeof(*dtim_params)); if (NULL == dtim_params) { - lim_log(mac_ctx, LOGE, - FL("Unable to allocate memory")); + pe_err("Unable to allocate memory"); return; } dtim_params->dtim_period = dtim_period; @@ -7246,10 +7091,10 @@ void lim_send_set_dtim_period(tpAniSirGlobal mac_ctx, uint8_t dtim_period, msg.type = WMA_SET_DTIM_PERIOD; msg.bodyptr = dtim_params; msg.bodyval = 0; - lim_log(mac_ctx, LOGD, FL("Post WMA_SET_DTIM_PERIOD to WMA")); + pe_debug("Post WMA_SET_DTIM_PERIOD to WMA"); ret = wma_post_ctrl_msg(mac_ctx, &msg); if (eSIR_SUCCESS != ret) { - lim_log(mac_ctx, LOGE, FL("wma_post_ctrl_msg() failed")); + pe_err("wma_post_ctrl_msg() failed"); qdf_mem_free(dtim_params); } } @@ -7274,8 +7119,7 @@ bool lim_is_valid_frame(last_processed_msg *last_processed_frm, tpSirMacMgmtHdr pHdr; if (!pRxPacketInfo) { - QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR, - FL("Invalid RX frame")); + pe_err("Invalid RX frame"); return false; } @@ -7290,8 +7134,7 @@ bool lim_is_valid_frame(last_processed_msg *last_processed_frm, if (last_processed_frm->seq_num == seq_num && qdf_mem_cmp(last_processed_frm->sa, pHdr->sa, ETH_ALEN) == 0) { - QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR, - FL("Duplicate frame from "MAC_ADDRESS_STR " Seq Number %d"), + pe_err("Duplicate frame from "MAC_ADDRESS_STR " Seq Number %d", MAC_ADDR_ARRAY(pHdr->sa), seq_num); return false; } @@ -7313,8 +7156,7 @@ void lim_update_last_processed_frame(last_processed_msg *last_processed_frm, tpSirMacMgmtHdr pHdr; if (!pRxPacketInfo) { - QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR, - FL("Invalid RX frame")); + pe_err("Invalid RX frame"); return; } @@ -7334,8 +7176,7 @@ tCsrRoamSession *lim_get_session_by_macaddr(tpAniSirGlobal mac_ctx, tCsrRoamSession *session; if (!mac_ctx || !self_mac) { - QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR, - FL("Invalid arguments")); + pe_err("Invalid arguments"); return NULL; } @@ -7346,9 +7187,8 @@ tCsrRoamSession *lim_get_session_by_macaddr(tpAniSirGlobal mac_ctx, else if (!qdf_mem_cmp(&session->selfMacAddr, self_mac, sizeof(tSirMacAddr))) { - QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG, - FL("session %d exists with mac address " - MAC_ADDRESS_STR), session->sessionId, + pe_debug("session: %d exists with mac address " + MAC_ADDRESS_STR, session->sessionId, MAC_ADDR_ARRAY(self_mac)); return session; |