qcacld-3.0: Replace lim_log() with pe_* log levels in lim_process_action_frame.c

Replace lim_log() with pe_* appropriate log levels in lim_process_action_frame.c

Change-Id: I9ad548077d08fd37fc4299e01b18a59a3823e0a4
CRs-Fixed: 1093093

1 files changed, 126 insertions, 230 deletions

diff --git a/core/mac/src/pe/lim/lim_process_action_frame.c b/core/mac/src/pe/lim/lim_process_action_frame.c
index 78b4b2ee0439..1a43c88d5a83 100644
--- a/core/mac/src/pe/lim/lim_process_action_frame.c
+++ b/core/mac/src/pe/lim/lim_process_action_frame.c
@@ -82,11 +82,11 @@ void lim_stop_tx_and_switch_channel(tpAniSirGlobal pMac, uint8_t sessionId)
 	psessionEntry = pe_find_session_by_session_id(pMac, sessionId);
 
 	if (NULL == psessionEntry) {
-		lim_log(pMac, LOGE, FL("Session %d not active"), sessionId);
+		pe_err("Session: %d not active", sessionId);
 		return;
 	}
 
-	lim_log(pMac, LOGD, FL("Channel switch Mode == %d"),
+	pe_debug("Channel switch Mode: %d",
 		       psessionEntry->gLimChannelSwitch.switchMode);
 
 	if (psessionEntry->gLimChannelSwitch.switchMode ==
@@ -115,7 +115,7 @@ void lim_stop_tx_and_switch_channel(tpAniSirGlobal pMac, uint8_t sessionId)
 
 	if (tx_timer_activate(&pMac->lim.limTimers.gLimChannelSwitchTimer) !=
 	    TX_SUCCESS) {
-		lim_log(pMac, LOGE, FL("tx_timer_activate failed"));
+		pe_err("tx_timer_activate failed");
 	}
 	return;
 }
@@ -133,14 +133,14 @@ void lim_stop_tx_and_switch_channel(tpAniSirGlobal pMac, uint8_t sessionId)
 tSirRetStatus lim_start_channel_switch(tpAniSirGlobal pMac,
 				       tpPESession psessionEntry)
 {
-	lim_log(pMac, LOGD, FL("Starting the channel switch"));
+	pe_debug("Starting the channel switch");
 
 	/*If channel switch is already running and it is on a different session, just return */
 	/*This need to be removed for MCC */
 	if ((lim_is_chan_switch_running(pMac) &&
 	     psessionEntry->gLimSpecMgmt.dot11hChanSwState !=
 	     eLIM_11H_CHANSW_RUNNING) || psessionEntry->csaOffloadEnable) {
-		lim_log(pMac, LOGW, FL("Ignoring channel switch on session %d"),
+		pe_warn("Ignoring channel switch on session: %d",
 			psessionEntry->peSessionId);
 		return eSIR_SUCCESS;
 	}
@@ -152,14 +152,14 @@ tSirRetStatus lim_start_channel_switch(tpAniSirGlobal pMac,
 		       eLIM_CHANNEL_SWITCH_TIMER));
 	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!");
 		return eSIR_FAILURE;
 	}
 
 	if (tx_timer_change(&pMac->lim.limTimers.gLimChannelSwitchTimer,
 			    psessionEntry->gLimChannelSwitch.switchTimeoutValue,
 			    0) != TX_SUCCESS) {
-		lim_log(pMac, LOGE, FL("tx_timer_change failed "));
+		pe_err("tx_timer_change failed");
 		return eSIR_FAILURE;
 	}
 
@@ -172,7 +172,7 @@ tSirRetStatus lim_start_channel_switch(tpAniSirGlobal pMac,
 			       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");
 			return eSIR_FAILURE;
 		}
 	} else if (psessionEntry->gLimSpecMgmt.quietState == eLIM_QUIET_RUNNING) {
@@ -181,7 +181,7 @@ tSirRetStatus lim_start_channel_switch(tpAniSirGlobal pMac,
 			       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");
 			return eSIR_FAILURE;
 		}
 	}
@@ -223,14 +223,13 @@ static void __lim_process_channel_switch_action_frame(tpAniSirGlobal mac_ctx,
 	body_ptr = WMA_GET_RX_MPDU_DATA(rx_pkt_info);
 	frame_len = WMA_GET_RX_PAYLOAD_LEN(rx_pkt_info);
 
-	lim_log(mac_ctx, LOGD,
-		FL("Received Channel switch action frame"));
+	pe_debug("Received Channel switch action frame");
 	if (!session->lim11hEnable)
 		return;
 
 	chnl_switch_frame = qdf_mem_malloc(sizeof(*chnl_switch_frame));
 	if (NULL == chnl_switch_frame) {
-		lim_log(mac_ctx, LOGE, FL("AllocateMemory failed"));
+		pe_err("AllocateMemory failed");
 		return;
 	}
 
@@ -239,21 +238,18 @@ static void __lim_process_channel_switch_action_frame(tpAniSirGlobal mac_ctx,
 			chnl_switch_frame);
 
 	if (DOT11F_FAILED(status)) {
-		lim_log(mac_ctx, LOGE,
-			FL("Failed to unpack and parse (0x%08x, %d bytes)"),
+		pe_err("Failed to unpack and parse (0x%08x, %d bytes)",
 			status, frame_len);
 		qdf_mem_free(chnl_switch_frame);
 		return;
 	} else if (DOT11F_WARNED(status)) {
-		lim_log(mac_ctx, LOGW,
-			FL("warning: unpack 11h-CHANSW Req(0x%08x, %d bytes)"),
+		pe_warn("warning: unpack 11h-CHANSW Req(0x%08x, %d bytes)",
 			status, frame_len);
 	}
 
 	if (qdf_mem_cmp((uint8_t *) &session->bssId,
 			(uint8_t *) &mac_hdr->sa, sizeof(tSirMacAddr))) {
-		lim_log(mac_ctx, LOGD,
-			FL("Rcvd action frame not from our BSS, dropping..."));
+		pe_warn("Rcvd action frame not from our BSS, dropping");
 		qdf_mem_free(chnl_switch_frame);
 		return;
 	}
@@ -285,8 +281,7 @@ static void __lim_process_channel_switch_action_frame(tpAniSirGlobal mac_ctx,
 		session->gLimWiderBWChannelSwitch.newCenterChanFreq1 =
 			wbw_chnlswitch_ie->newCenterChanFreq1;
 	}
-	lim_log(mac_ctx, LOGD,
-		FL("Rcv Chnl Swtch Frame: Timeout in %d ticks"),
+	pe_debug("Rcv Chnl Swtch Frame: Timeout in %d ticks",
 		session->gLimChannelSwitch.switchTimeoutValue);
 	if (session->htSupportedChannelWidthSet) {
 		sec_chnl_offset = &chnl_switch_frame->sec_chan_offset_ele;
@@ -330,8 +325,7 @@ static void __lim_process_channel_switch_action_frame(tpAniSirGlobal mac_ctx,
 	}
 
 	if (eSIR_SUCCESS != lim_start_channel_switch(mac_ctx, session))
-		lim_log(mac_ctx, LOGD,
-			FL("Could not start channel switch"));
+		pe_err("Could not start channel switch");
 
 	qdf_mem_free(chnl_switch_frame);
 	return;
@@ -364,12 +358,12 @@ lim_process_ext_channel_switch_action_frame(tpAniSirGlobal mac_ctx,
 	body = WMA_GET_RX_MPDU_DATA(rx_packet_info);
 	frame_len = WMA_GET_RX_PAYLOAD_LEN(rx_packet_info);
 
-	lim_log(mac_ctx, LOGD, FL("Received EXT Channel switch action frame"));
+	pe_debug("Received EXT Channel switch action frame");
 
 	ext_channel_switch_frame =
 		 qdf_mem_malloc(sizeof(*ext_channel_switch_frame));
 	if (NULL == ext_channel_switch_frame) {
-		lim_log(mac_ctx, LOGE, FL("AllocateMemory failed"));
+		pe_err("AllocateMemory failed");
 		return;
 	}
 
@@ -378,16 +372,12 @@ lim_process_ext_channel_switch_action_frame(tpAniSirGlobal mac_ctx,
 			body, frame_len, ext_channel_switch_frame);
 
 	if (DOT11F_FAILED(status)) {
-
-		lim_log(mac_ctx, LOGE,
-			FL("Failed to parse CHANSW action frame (0x%08x, len %d):"),
+		pe_err("Failed to parse CHANSW action frame (0x%08x, len %d):",
 			status, frame_len);
 		qdf_mem_free(ext_channel_switch_frame);
 		return;
 	} else if (DOT11F_WARNED(status)) {
-
-		lim_log(mac_ctx, LOGW,
-		  FL("There were warnings while unpacking CHANSW Request (0x%08x, %d bytes):"),
+		pe_warn("There were warnings while unpacking CHANSW Request (0x%08x, %d bytes):",
 		  status, frame_len);
 	}
 
@@ -406,8 +396,7 @@ lim_process_ext_channel_switch_action_frame(tpAniSirGlobal mac_ctx,
 				== CHANNEL_STATE_ENABLE) ||
 	 (cds_get_channel_state(target_channel) == CHANNEL_STATE_DFS &&
 	 !cds_concurrent_open_sessions_running())))) {
-		lim_log(mac_ctx, LOGE, FL("Channel %d is not valid"),
-							target_channel);
+		pe_err("Channel: %d is not valid", target_channel);
 		return;
 	}
 
@@ -418,8 +407,7 @@ lim_process_ext_channel_switch_action_frame(tpAniSirGlobal mac_ctx,
 
 		ext_cng_chan_ind = qdf_mem_malloc(sizeof(*ext_cng_chan_ind));
 		if (NULL == ext_cng_chan_ind) {
-			lim_log(mac_ctx, LOGE,
-			  FL("AllocateMemory failed for ext_cng_chan_ind"));
+			pe_err("AllocateMemory failed for ext_cng_chan_ind");
 			return;
 		}
 
@@ -469,8 +457,7 @@ static void __lim_process_operating_mode_action_frame(tpAniSirGlobal mac_ctx,
 	body_ptr = WMA_GET_RX_MPDU_DATA(rx_pkt_info);
 	frame_len = WMA_GET_RX_PAYLOAD_LEN(rx_pkt_info);
 
-	lim_log(mac_ctx, LOGD,
-		FL("Received Operating Mode action frame"));
+	pe_debug("Received Operating Mode action frame");
 	if (CHAN_ENUM_14 >= session->currentOperChannel)
 		cb_mode = mac_ctx->roam.configParam.channelBondingMode24GHz;
 	else
@@ -479,33 +466,31 @@ static void __lim_process_operating_mode_action_frame(tpAniSirGlobal mac_ctx,
 	 * mode is disabled in INI.
 	 */
 	if (WNI_CFG_CHANNEL_BONDING_MODE_DISABLE == cb_mode) {
-		lim_log(mac_ctx, LOGW, FL("channel bonding disabled"));
+		pe_warn("channel bonding disabled");
 		return;
 	}
 	operating_mode_frm = qdf_mem_malloc(sizeof(*operating_mode_frm));
 	if (NULL == operating_mode_frm) {
-		lim_log(mac_ctx, LOGE, FL("AllocateMemory failed"));
+		pe_err("AllocateMemory failed");
 		return;
 	}
 	/* Unpack channel switch frame */
 	status = dot11f_unpack_operating_mode(mac_ctx, body_ptr, frame_len,
 			operating_mode_frm);
 	if (DOT11F_FAILED(status)) {
-		lim_log(mac_ctx, LOGE,
-			FL("Failed to unpack and parse (0x%08x, %d bytes)"),
+		pe_err("Failed to unpack and parse (0x%08x, %d bytes)",
 			status, frame_len);
 		qdf_mem_free(operating_mode_frm);
 		return;
 	} else if (DOT11F_WARNED(status)) {
-		lim_log(mac_ctx, LOGW,
-			FL("warnings while unpacking (0x%08x, %d bytes):"),
+		pe_warn("warnings while unpacking (0x%08x, %d bytes):",
 			status, frame_len);
 	}
 	sta_ptr = dph_lookup_hash_entry(mac_ctx, mac_hdr->sa, &aid,
 			&session->dph.dphHashTable);
 
 	if (sta_ptr == NULL) {
-		lim_log(mac_ctx, LOGE, FL("Station context not found"));
+		pe_err("Station context not found");
 		goto end;
 	}
 
@@ -528,13 +513,11 @@ static void __lim_process_operating_mode_action_frame(tpAniSirGlobal mac_ctx,
 		operating_mode_frm->OperatingMode.chanWidth)) {
 		uint32_t fw_vht_ch_wd = wma_get_vht_ch_width();
 
-		lim_log(mac_ctx, LOGE,
-			FL(" received Chanwidth %d, staIdx = %d"),
+		pe_debug("received Chanwidth: %d staIdx: %d",
 			(operating_mode_frm->OperatingMode.chanWidth),
 			sta_ptr->staIndex);
 
-		lim_log(mac_ctx, LOGE,
-			FL(" MAC - %0x:%0x:%0x:%0x:%0x:%0x"),
+		pe_debug(" MAC: %0x:%0x:%0x:%0x:%0x:%0x",
 			mac_hdr->sa[0], mac_hdr->sa[1], mac_hdr->sa[2],
 			mac_hdr->sa[3], mac_hdr->sa[4], mac_hdr->sa[5]);
 
@@ -614,10 +597,10 @@ static void __lim_process_gid_management_action_frame(tpAniSirGlobal mac_ctx,
 	body_ptr = WMA_GET_RX_MPDU_DATA(rx_pkt_info);
 	frame_len = WMA_GET_RX_PAYLOAD_LEN(rx_pkt_info);
 
-	lim_log(mac_ctx, LOGD, FL("Received GID Management action frame"));
+	pe_debug("Received GID Management action frame");
 	gid_mgmt_frame = qdf_mem_malloc(sizeof(*gid_mgmt_frame));
 	if (NULL == gid_mgmt_frame) {
-		lim_log(mac_ctx, LOGE, FL("AllocateMemory failed"));
+		pe_err("AllocateMemory failed");
 		return;
 	}
 
@@ -625,29 +608,24 @@ static void __lim_process_gid_management_action_frame(tpAniSirGlobal mac_ctx,
 	status = dot11f_unpack_vht_gid_management_action_frame(mac_ctx,
 			body_ptr, frame_len, gid_mgmt_frame);
 	if (DOT11F_FAILED(status)) {
-		lim_log(mac_ctx, LOGE,
-			FL("Fail to parse an Grp id frame (0x%08x, %d bytes):"),
+		pe_err("Fail to parse an Grp id frame (0x%08x, %d bytes):",
 			status, frame_len);
 		qdf_mem_free(gid_mgmt_frame);
 		return;
 	} else if (DOT11F_WARNED(status)) {
-		lim_log(mac_ctx, LOGW,
-		 FL("warnings while unpacking Grp id frm (0x%08x, %d bytes):"),
+		pe_warn("warnings while unpacking Grp id frm (0x%08x, %d bytes):",
 		 status, frame_len);
 	}
 	sta_ptr = dph_lookup_hash_entry(mac_ctx, mac_hdr->sa, &aid,
 			&session->dph.dphHashTable);
 	if (!sta_ptr) {
-		lim_log(mac_ctx, LOGE,
-			FL("Failed to get STA entry from hash table"));
+		pe_err("Failed to get STA entry from hash table");
 		goto out;
 	}
-	lim_log(mac_ctx, LOGE,
-		FL("received Gid Management Action Frame , staIdx = %d"),
+	pe_debug("received Gid Management Action Frame staIdx: %d",
 		sta_ptr->staIndex);
 
-	lim_log(mac_ctx, LOGE,
-		FL(" MAC - %0x:%0x:%0x:%0x:%0x:%0x"),
+	pe_debug(" MAC: %0x:%0x:%0x:%0x:%0x:%0x",
 		mac_hdr->sa[0], mac_hdr->sa[1], mac_hdr->sa[2],
 		mac_hdr->sa[3], mac_hdr->sa[4], mac_hdr->sa[5]);
 	vht_member_status = &gid_mgmt_frame->VhtMembershipStatusArray;
@@ -655,8 +633,7 @@ static void __lim_process_gid_management_action_frame(tpAniSirGlobal mac_ctx,
 	mem_upper = (uint32_t *) &vht_member_status->membershipStatusArray[4];
 
 	if (*mem_lower && *mem_upper) {
-		lim_log(mac_ctx, LOGE,
-			FL("rcved frame with mult group ID set, staIdx = %d"),
+		pe_err("rcved frame with mult group ID set, staIdx = %d",
 			sta_ptr->staIndex);
 		goto out;
 	}
@@ -666,8 +643,7 @@ static void __lim_process_gid_management_action_frame(tpAniSirGlobal mac_ctx,
 		mem_cur = mem_upper;
 		membership += sizeof(uint32_t);
 	} else {
-		lim_log(mac_ctx, LOGE,
-			FL("rcved Gid frame with no group ID set, staIdx = %d"),
+		pe_err("rcved Gid frame with no group ID set, staIdx: %d",
 			sta_ptr->staIndex);
 		goto out;
 	}
@@ -676,8 +652,7 @@ static void __lim_process_gid_management_action_frame(tpAniSirGlobal mac_ctx,
 		++membership;
 	}
 	if (*mem_cur) {
-		lim_log(mac_ctx, LOGE,
-			FL("rcved frame with mult group ID set, staIdx = %d"),
+		pe_err("rcved frame with mult group ID set, staIdx: %d",
 			sta_ptr->staIndex);
 		goto out;
 	}
@@ -729,26 +704,23 @@ static void __lim_process_add_ts_rsp(tpAniSirGlobal mac_ctx,
 	body_ptr = WMA_GET_RX_MPDU_DATA(rx_pkt_info);
 	frameLen = WMA_GET_RX_PAYLOAD_LEN(rx_pkt_info);
 
-	lim_log(mac_ctx, LOGW, "Recv AddTs Response");
+	pe_warn("Recv AddTs Response");
 	if (LIM_IS_AP_ROLE(session)) {
-		lim_log(mac_ctx, LOGW,
-			FL("AddTsRsp recvd at AP: ignoring"));
+		pe_warn("AddTsRsp recvd at AP: ignoring");
 		return;
 	}
 
 	sta_ptr = dph_lookup_hash_entry(mac_ctx, mac_hdr->sa, &aid,
 				&session->dph.dphHashTable);
 	if (sta_ptr == NULL) {
-		lim_log(mac_ctx, LOGE,
-			FL("Station context not found - ignoring AddTsRsp"));
+		pe_err("Station context not found - ignoring AddTsRsp");
 		return;
 	}
 
 	retval = sir_convert_addts_rsp2_struct(mac_ctx, body_ptr,
 			frameLen, &addts);
 	if (retval != eSIR_SUCCESS) {
-		lim_log(mac_ctx, LOGW,
-			FL("AddTsRsp parsing failed (error %d)"), retval);
+		pe_err("AddTsRsp parsing failed %d", retval);
 		return;
 	}
 	/*
@@ -757,14 +729,12 @@ static void __lim_process_add_ts_rsp(tpAniSirGlobal mac_ctx,
 	 */
 	if (!mac_ctx->lim.gLimAddtsSent) {
 		/* we never sent an addts request! */
-		lim_log(mac_ctx, LOGW,
-			FL("rx AddTsRsp but no req was ever sent-ignoring"));
+		pe_warn("rx AddTsRsp but no req was ever sent-ignoring");
 		return;
 	}
 
 	if (mac_ctx->lim.gLimAddtsReq.req.dialogToken != addts.dialogToken) {
-		lim_log(mac_ctx, LOGW,
-			FL("token mismatch (got %d, exp %d) - ignoring"),
+		pe_warn("token mismatch got: %d exp: %d - ignoring",
 			addts.dialogToken,
 			mac_ctx->lim.gLimAddtsReq.req.dialogToken);
 		return;
@@ -786,18 +756,16 @@ static void __lim_process_add_ts_rsp(tpAniSirGlobal mac_ctx,
 		/* add the classifier - this should always succeed */
 		if (addts.numTclas > 1) {
 			/* currently no support for multiple tclas elements */
-			lim_log(mac_ctx, LOGE,
-				FL("Sta %d: Too many Tclas (%d), 1 supported"),
+			pe_err("Sta: %d Too many Tclas: %d 1 supported",
 				aid, addts.numTclas);
 			return;
 		} else if (addts.numTclas == 1) {
-			lim_log(mac_ctx, LOGW,
-				FL("Response from STA %d: tsid %d, UP %d, OK!"),
+			pe_debug("Response from STA: %d tsid: %d UP: %d OK!",
 				aid, addts.tspec.tsinfo.traffic.tsid,
 				addts.tspec.tsinfo.traffic.userPrio);
 		}
 	}
-	lim_log(mac_ctx, LOGW, FL("Recv AddTsRsp: tsid %d, UP %d, status %d "),
+	pe_debug("Recv AddTsRsp: tsid: %d UP: %d status: %d",
 		addts.tspec.tsinfo.traffic.tsid,
 		addts.tspec.tsinfo.traffic.userPrio, addts.status);
 
@@ -805,8 +773,7 @@ static void __lim_process_add_ts_rsp(tpAniSirGlobal mac_ctx,
 	lim_deactivate_and_change_timer(mac_ctx, eLIM_ADDTS_RSP_TIMER);
 
 	if (addts.status != eSIR_MAC_SUCCESS_STATUS) {
-		lim_log(mac_ctx, LOGW,
-			FL("Recv AddTsRsp: tsid %d, UP %d, status %d "),
+		pe_debug("Recv AddTsRsp: tsid: %d UP: %d status: %d",
 			addts.tspec.tsinfo.traffic.tsid,
 			addts.tspec.tsinfo.traffic.userPrio, addts.status);
 		lim_send_sme_addts_rsp(mac_ctx, true, addts.status, session,
@@ -820,7 +787,7 @@ static void __lim_process_add_ts_rsp(tpAniSirGlobal mac_ctx,
 	}
 #ifdef FEATURE_WLAN_ESE
 	if (addts.tsmPresent) {
-		lim_log(mac_ctx, LOGW, "TSM IE Present");
+		pe_debug("TSM IE Present");
 		session->eseContext.tsm.tid =
 			addts.tspec.tsinfo.traffic.userPrio;
 		qdf_mem_copy(&session->eseContext.tsm.tsmInfo,
@@ -878,7 +845,7 @@ static void __lim_process_add_ts_rsp(tpAniSirGlobal mac_ctx,
 		lim_send_edca_params(mac_ctx, session->gLimEdcaParamsActive,
 				     sta_ds_ptr->bssId);
 	else
-		lim_log(mac_ctx, LOGE, FL("Self entry missing in Hash Table "));
+		pe_err("Self entry missing in Hash Table");
 	sir_copy_mac_addr(peer_macaddr, session->bssId);
 	/* if schedule is not present then add TSPEC with svcInterval as 0. */
 	if (!addts.schedulePresent)
@@ -886,8 +853,7 @@ static void __lim_process_add_ts_rsp(tpAniSirGlobal mac_ctx,
 	if (eSIR_SUCCESS !=
 	    lim_tspec_add(mac_ctx, sta_ptr->staAddr, sta_ptr->assocId,
 		&addts.tspec, addts.schedule.svcInterval, &tspec_info)) {
-		lim_log(mac_ctx, LOGE,
-			FL("Adding entry in lim Tspec Table failed "));
+		pe_err("Adding entry in lim Tspec Table failed");
 		lim_send_delts_req_action_frame(mac_ctx, peer_macaddr, rsp_reqd,
 						&addts.tspec.tsinfo,
 						&addts.tspec, session);
@@ -927,17 +893,14 @@ static void __lim_process_add_ts_rsp(tpAniSirGlobal mac_ctx,
 			mac_ctx->lim.gLimAddtsSent = false;
 			return;
 		}
-		lim_log(mac_ctx, LOGW,
-			FL("AddTsRsp received successfully(UP %d, TSID %d)"),
+		pe_debug("AddTsRsp received successfully UP: %d TSID: %d",
 			addts.tspec.tsinfo.traffic.userPrio,
 			addts.tspec.tsinfo.traffic.tsid);
 	} else {
-		lim_log(mac_ctx, LOGW,
-			FL("AddTsRsp received successfully(UP %d, TSID %d)"),
+		pe_debug("AddTsRsp received successfully UP: %d TSID: %d",
 			addts.tspec.tsinfo.traffic.userPrio,
 			addts.tspec.tsinfo.traffic.tsid);
-		lim_log(mac_ctx, LOGW,
-			FL("no ACM: Bypass sending WMA_ADD_TS_REQ to HAL "));
+		pe_debug("no ACM: Bypass sending WMA_ADD_TS_REQ to HAL");
 		/*
 		 * Use the smesessionId and smetransactionId from the PE
 		 * session context
@@ -984,33 +947,29 @@ static void __lim_process_del_ts_req(tpAniSirGlobal mac_ctx,
 	sta_ptr = dph_lookup_hash_entry(mac_ctx, mac_hdr->sa, &aid,
 				      &session->dph.dphHashTable);
 	if (sta_ptr == NULL) {
-		lim_log(mac_ctx, LOGE,
-			FL("Station context not found - ignoring DelTs"));
+		pe_err("Station context not found - ignoring DelTs");
 		return;
 	}
 	/* parse the delts request */
 	retval = sir_convert_delts_req2_struct(mac_ctx, body_ptr,
 			frame_len, &delts);
 	if (retval != eSIR_SUCCESS) {
-		lim_log(mac_ctx, LOGW,
-			FL("DelTs parsing failed (error %d)"), retval);
+		pe_err("DelTs parsing failed %d", retval);
 		return;
 	}
 
 	if (delts.wmeTspecPresent) {
 		if ((!session->limWmeEnabled) || (!sta_ptr->wmeEnabled)) {
-			lim_log(mac_ctx, LOGW,
-				FL("Ignore delts req: wme not enabled"));
+			pe_warn("Ignore delts req: wme not enabled");
 			return;
 		}
-		lim_log(mac_ctx, LOGD, FL("WME Delts received"));
+		pe_debug("WME Delts received");
 	} else if ((session->limQosEnabled) && sta_ptr->lleEnabled) {
-		lim_log(mac_ctx, LOGD, FL("11e QoS Delts received"));
+		pe_debug("11e QoS Delts received");
 	} else if ((session->limWsmEnabled) && sta_ptr->wsmEnabled) {
-		lim_log(mac_ctx, LOGD, FL("WSM Delts received"));
+		pe_debug("WSM Delts received");
 	} else {
-		lim_log(mac_ctx, LOGW,
-			FL("Ignoring delts request: qos not enabled/capable"));
+		pe_warn("Ignoring delts request: qos not enabled/capable");
 		return;
 	}
 
@@ -1020,8 +979,7 @@ static void __lim_process_del_ts_req(tpAniSirGlobal mac_ctx,
 	if ((tsinfo->traffic.accessPolicy == SIR_MAC_ACCESSPOLICY_EDCA)) {
 
 		if (upToAc(tsinfo->traffic.userPrio) >= MAX_NUM_AC) {
-			lim_log(mac_ctx, LOGW,
-				FL("DelTs with UP %d has no AC - ignoring req"),
+			pe_warn("DelTs with UP: %d has no AC - ignoring req",
 				tsinfo->traffic.userPrio);
 			return;
 		}
@@ -1034,7 +992,7 @@ static void __lim_process_del_ts_req(tpAniSirGlobal mac_ctx,
 	if (eSIR_SUCCESS !=
 	    lim_admit_control_delete_ts(mac_ctx, sta_ptr->assocId, tsinfo,
 				&ts_status, &tspec_idx)) {
-		lim_log(mac_ctx, LOGW, FL("Unable to Delete TS"));
+		pe_warn("Unable to Delete TS");
 		return;
 	} else if (!((tsinfo->traffic.accessPolicy == SIR_MAC_ACCESSPOLICY_HCCA)
 			|| (tsinfo->traffic.accessPolicy ==
@@ -1044,8 +1002,7 @@ static void __lim_process_del_ts_req(tpAniSirGlobal mac_ctx,
 						sta_ptr->staIndex, tspec_idx,
 						delts, session->peSessionId,
 						session->bssId)) {
-			lim_log(mac_ctx, LOGW,
-				FL("DelTs with UP %d failed ignoring request"),
+			pe_warn("DelTs with UP: %d failed ignoring request",
 				tsinfo->traffic.userPrio);
 			return;
 		}
@@ -1095,9 +1052,9 @@ static void __lim_process_del_ts_req(tpAniSirGlobal mac_ctx,
 		lim_send_edca_params(mac_ctx, session->gLimEdcaParamsActive,
 				     sta_ds_ptr->bssId);
 	else
-		lim_log(mac_ctx, LOGE, FL("Self entry missing in Hash Table "));
+		pe_err("Self entry missing in Hash Table");
 
-	lim_log(mac_ctx, LOGD, FL("DeleteTS succeeded"));
+	pe_debug("DeleteTS succeeded");
 #ifdef FEATURE_WLAN_ESE
 	lim_send_sme_tsm_ie_ind(mac_ctx, session, 0, 0, 0);
 #endif
@@ -1126,9 +1083,7 @@ static void __lim_process_qos_map_configure_frame(tpAniSirGlobal mac_ctx,
 	retval = sir_convert_qos_map_configure_frame2_struct(mac_ctx,
 				body_ptr, frame_len, &session->QosMapSet);
 	if (retval != eSIR_SUCCESS) {
-		lim_log(mac_ctx, LOGE,
-			FL("QosMapConfigure frame parsing fail(error %d)"),
-			retval);
+		pe_err("QosMapConfigure frame parsing fail %d", retval);
 		return;
 	}
 	lim_send_sme_mgmt_frame_ind(mac_ctx, mac_hdr->fc.subType,
@@ -1146,7 +1101,7 @@ __lim_process_basic_meas_req(tpAniSirGlobal pMac,
 	if (lim_send_meas_report_frame(pMac, pMeasReqFrame,
 				       peerMacAddr, psessionEntry) !=
 					 eSIR_SUCCESS) {
-		lim_log(pMac, LOGE, FL("fail to send Basic Meas report "));
+		pe_err("fail to send Basic Meas report");
 		return;
 	}
 }
@@ -1158,7 +1113,7 @@ __lim_process_cca_meas_req(tpAniSirGlobal pMac,
 	if (lim_send_meas_report_frame(pMac, pMeasReqFrame,
 				       peerMacAddr, psessionEntry) !=
 					 eSIR_SUCCESS) {
-		lim_log(pMac, LOGE, FL("fail to send CCA Meas report "));
+		pe_err("fail to send CCA Meas report");
 		return;
 	}
 }
@@ -1170,7 +1125,7 @@ __lim_process_rpi_meas_req(tpAniSirGlobal pMac,
 	if (lim_send_meas_report_frame(pMac, pMeasReqFrame,
 				       peerMacAddr, psessionEntry) !=
 					 eSIR_SUCCESS) {
-		lim_log(pMac, LOGE, FL("fail to send RPI Meas report "));
+		pe_err("fail to send RPI Meas report");
 		return;
 	}
 }
@@ -1190,16 +1145,13 @@ __lim_process_measurement_request_frame(tpAniSirGlobal pMac,
 
 	pMeasReqFrame = qdf_mem_malloc(sizeof(tSirMacMeasReqActionFrame));
 	if (NULL == pMeasReqFrame) {
-		lim_log(pMac, LOGE,
-			FL
-				("limProcessMeasurementRequestFrame: AllocateMemory failed "));
+		pe_err("AllocateMemory failed");
 		return;
 	}
 
 	if (sir_convert_meas_req_frame2_struct(pMac, pBody, pMeasReqFrame, frameLen)
 	    != eSIR_SUCCESS) {
-		lim_log(pMac, LOGW,
-			       FL("Rcv invalid Measurement Request Action Frame "));
+		pe_warn("Rcv invalid Measurement Request Action Frame");
 		return;
 	}
 	switch (pMeasReqFrame->measReqIE.measType) {
@@ -1216,7 +1168,7 @@ __lim_process_measurement_request_frame(tpAniSirGlobal pMac,
 					   psessionEntry);
 		break;
 	default:
-		lim_log(pMac, LOGD, FL("Unknown Measurement Type %d "),
+		pe_warn("Unknown Measurement Type: %d",
 			       pMeasReqFrame->measReqIE.measType);
 		break;
 	}
@@ -1232,23 +1184,22 @@ __lim_process_tpc_request_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo,
 	pHdr = WMA_GET_RX_MAC_HEADER(pRxPacketInfo);
 	pBody = WMA_GET_RX_MPDU_DATA(pRxPacketInfo);
 	frameLen = WMA_GET_RX_PAYLOAD_LEN(pRxPacketInfo);
-	lim_log(pMac, LOGD,
-		       FL("****LIM: Processing TPC Request from peer ****"));
+	pe_debug("****LIM: Processing TPC Request from peer ****");
 
 	pTpcReqFrame = qdf_mem_malloc(sizeof(tSirMacTpcReqActionFrame));
 	if (NULL == pTpcReqFrame) {
-		lim_log(pMac, LOGE, FL("AllocateMemory failed "));
+		pe_err("AllocateMemory failed");
 		return;
 	}
 	if (sir_convert_tpc_req_frame2_struct(pMac, pBody, pTpcReqFrame, frameLen) !=
 	    eSIR_SUCCESS) {
-		lim_log(pMac, LOGW, FL("Rcv invalid TPC Req Action Frame "));
+		pe_warn("Rcv invalid TPC Req Action Frame");
 		return;
 	}
 	if (lim_send_tpc_report_frame(pMac,
 				      pTpcReqFrame,
 				      pHdr->sa, psessionEntry) != eSIR_SUCCESS) {
-		lim_log(pMac, LOGE, FL("fail to send TPC Report Frame. "));
+		pe_err("fail to send TPC Report Frame");
 		return;
 	}
 }
@@ -1275,10 +1226,8 @@ __lim_process_sm_power_save_update(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo,
 		dph_lookup_hash_entry(pMac, pHdr->sa, &aid,
 				      &psessionEntry->dph.dphHashTable);
 	if (pSta == NULL) {
-		lim_log(pMac, LOGE,
-			FL
-				("STA context not found - ignoring UpdateSM PSave Mode from "));
-		lim_print_mac_addr(pMac, pHdr->sa, LOGW);
+		pe_err("STA context not found - ignoring UpdateSM PSave Mode from");
+		lim_print_mac_addr(pMac, pHdr->sa, LOGE);
 		return;
 	}
 
@@ -1286,25 +1235,20 @@ __lim_process_sm_power_save_update(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo,
 	nStatus = dot11f_unpack_sm_power_save(pMac, pBody, frameLen, &frmSMPower);
 
 	if (DOT11F_FAILED(nStatus)) {
-		lim_log(pMac, LOGE,
-			FL
-				("Failed to unpack and parse a Update SM Power (0x%08x, %d bytes):"),
+		pe_err("Failed to unpack and parse a Update SM Power (0x%08x, %d bytes):",
 			nStatus, frameLen);
 		QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR,
 				   pBody, frameLen);
 		return;
 	} else if (DOT11F_WARNED(nStatus)) {
-		lim_log(pMac, LOGW,
-			FL
-				("There were warnings while unpacking a SMPower Save update (0x%08x, %d bytes):"),
+		pe_warn("There were warnings while unpacking a SMPower Save update (0x%08x, %d bytes):",
 			nStatus, frameLen);
 		QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR,
 				   pBody, frameLen);
 	}
 
-	lim_log(pMac, LOGD,
-		FL("Received SM Power save Mode update Frame with PS_Enable:%d"
-		   "PS Mode: %d"), frmSMPower.SMPowerModeSet.PowerSave_En,
+	pe_debug("Received SM Power save Mode update Frame with PS_Enable: %d PS Mode: %d",
+		frmSMPower.SMPowerModeSet.PowerSave_En,
 		frmSMPower.SMPowerModeSet.Mode);
 
 	/** Update in the DPH Table about the Update in the SM Power Save mode*/
@@ -1318,14 +1262,12 @@ __lim_process_sm_power_save_update(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo,
 		 && (frmSMPower.SMPowerModeSet.Mode == 0))
 		state = eSIR_HT_MIMO_PS_NO_LIMIT;
 	else {
-		lim_log(pMac, LOGW,
-			FL("Received SM Power save Mode update Frame with invalid mode"));
+		pe_warn("Received SM Power save Mode update Frame with invalid mode");
 		return;
 	}
 
 	if (state == pSta->htMIMOPSState) {
-		lim_log(pMac, LOGE,
-			FL("The PEER is already set in the same mode"));
+		pe_err("The PEER is already set in the same mode");
 		return;
 	}
 
@@ -1359,8 +1301,7 @@ __lim_process_radio_measure_request(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo,
 
 	frm = qdf_mem_malloc(sizeof(*frm));
 	if (frm == NULL) {
-		lim_log(pMac, LOGE,
-			FL("Failed to alloc memory for tDot11fRadioMeasurementRequest"));
+		pe_err("Failed to alloc memory for tDot11fRadioMeasurementRequest");
 		return;
 	}
 
@@ -1370,15 +1311,13 @@ __lim_process_radio_measure_request(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo,
 								frameLen, frm);
 
 	if (DOT11F_FAILED(nStatus)) {
-		lim_log(pMac, LOGE,
-			FL("Failed to unpack and parse a Radio Measure request (0x%08x, %d bytes):"),
+		pe_err("Failed to unpack and parse a Radio Measure request (0x%08x, %d bytes):",
 			nStatus, frameLen);
 		QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR,
 				   pBody, frameLen);
 		    goto err;
 	} else if (DOT11F_WARNED(nStatus)) {
-		lim_log(pMac, LOGW,
-			FL("There were warnings while unpacking a Radio Measure request (0x%08x, %d bytes):"),
+		pe_warn("There were warnings while unpacking a Radio Measure request (0x%08x, %d bytes):",
 			nStatus, frameLen);
 		QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_WARN,
 				   pBody, frameLen);
@@ -1413,17 +1352,13 @@ __lim_process_link_measurement_req(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo,
 		dot11f_unpack_link_measurement_request(pMac, pBody, frameLen, &frm);
 
 	if (DOT11F_FAILED(nStatus)) {
-		lim_log(pMac, LOGE,
-			FL
-				("Failed to unpack and parse a Link Measure request (0x%08x, %d bytes):"),
+		pe_err("Failed to unpack and parse a Link Measure request (0x%08x, %d bytes):",
 			nStatus, frameLen);
 		QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR,
 				   pBody, frameLen);
 		return eSIR_FAILURE;
 	} else if (DOT11F_WARNED(nStatus)) {
-		lim_log(pMac, LOGW,
-			FL
-				("There were warnings while unpacking a Link Measure request (0x%08x, %d bytes):"),
+		pe_warn("There were warnings while unpacking a Link Measure request (0x%08x, %d bytes):",
 			nStatus, frameLen);
 		QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_WARN,
 				   pBody, frameLen);
@@ -1450,9 +1385,7 @@ __lim_process_neighbor_report(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo,
 
 	pFrm = qdf_mem_malloc(sizeof(tDot11fNeighborReportResponse));
 	if (NULL == pFrm) {
-		lim_log(pMac, LOGE,
-			FL
-				("Unable to allocate memory in __lim_process_neighbor_report"));
+		pe_err("Unable to allocate memory");
 		return;
 	}
 
@@ -1466,18 +1399,14 @@ __lim_process_neighbor_report(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo,
 		dot11f_unpack_neighbor_report_response(pMac, pBody, frameLen, pFrm);
 
 	if (DOT11F_FAILED(nStatus)) {
-		lim_log(pMac, LOGE,
-			FL
-				("Failed to unpack and parse a Neighbor report response (0x%08x, %d bytes):"),
+		pe_err("Failed to unpack and parse a Neighbor report response (0x%08x, %d bytes):",
 			nStatus, frameLen);
 		QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR,
 				   pBody, frameLen);
 		qdf_mem_free(pFrm);
 		return;
 	} else if (DOT11F_WARNED(nStatus)) {
-		lim_log(pMac, LOGW,
-			FL
-				("There were warnings while unpacking a Neighbor report response (0x%08x, %d bytes):"),
+		pe_warn("There were warnings while unpacking a Neighbor report response (0x%08x, %d bytes):",
 			nStatus, frameLen);
 		QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_WARN,
 				   pBody, frameLen);
@@ -1530,8 +1459,7 @@ static void __lim_process_sa_query_request_action_frame(tpAniSirGlobal pMac,
 
 	/* 11w offload is enabled then firmware should not fwd this frame */
 	if (LIM_IS_STA_ROLE(psessionEntry) && pMac->pmf_offload) {
-		lim_log(pMac, LOGE,
-			FL("11w offload enabled, SA Query req isn't expected"));
+		pe_err("11w offload enabled, SA Query req isn't expected");
 		return;
 	}
 
@@ -1548,8 +1476,7 @@ static void __lim_process_sa_query_request_action_frame(tpAniSirGlobal pMac,
 					     transId,
 					     pHdr->sa,
 					     psessionEntry) != eSIR_SUCCESS) {
-		lim_log(pMac, LOGE,
-			FL("fail to send SA query response action frame."));
+		pe_err("fail to send SA query response action frame");
 		return;
 	}
 }
@@ -1587,8 +1514,7 @@ static void __lim_process_sa_query_response_action_frame(tpAniSirGlobal pMac,
 	pHdr = WMA_GET_RX_MAC_HEADER(pRxPacketInfo);
 	frameLen = WMA_GET_RX_PAYLOAD_LEN(pRxPacketInfo);
 	pBody = WMA_GET_RX_MPDU_DATA(pRxPacketInfo);
-	QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG,
-		  ("SA Query Response received..."));
+	pe_debug("SA Query Response received");
 
 	/* When a station, supplicant handles SA Query Response.
 	 * Forward to SME to HDD to wpa_supplicant.
@@ -1611,12 +1537,10 @@ static void __lim_process_sa_query_response_action_frame(tpAniSirGlobal pMac,
 	if (NULL == pSta)
 		return;
 
-	lim_log(pMac, LOGD,
-		FL("SA Query Response source addr - %0x:%0x:%0x:%0x:%0x:%0x"),
+	pe_info("SA Query Response source addr:  %0x:%0x:%0x:%0x:%0x:%0x",
 		pHdr->sa[0], pHdr->sa[1], pHdr->sa[2], pHdr->sa[3],
 		pHdr->sa[4], pHdr->sa[5]);
-	lim_log(pMac, LOGD,
-		FL("SA Query state for station - %d"), pSta->pmfSaQueryState);
+	pe_debug("SA Query state for station: %d", pSta->pmfSaQueryState);
 
 	if (DPH_SA_QUERY_IN_PROGRESS != pSta->pmfSaQueryState)
 		return;
@@ -1633,9 +1557,7 @@ static void __lim_process_sa_query_response_action_frame(tpAniSirGlobal pMac,
 	   query is from a rogue station, just go back to initial state. */
 	for (retryNum = 0; retryNum <= pSta->pmfSaQueryRetryCount; retryNum++)
 		if (transId == pSta->pmfSaQueryStartTransId + retryNum) {
-			lim_log(pMac, LOGD,
-				FL
-					("Found matching SA Query Request - transaction ID %d"),
+			pe_debug("Found matching SA Query Request - transaction ID: %d",
 				transId);
 			tx_timer_deactivate(&pSta->pmfSaQueryTimer);
 			pSta->pmfSaQueryState = DPH_SA_QUERY_NOT_IN_PROGRESS;
@@ -1685,8 +1607,8 @@ lim_drop_unprotected_action_frame(tpAniSirGlobal pMac, tpPESession psessionEntry
 		rmfConnection = true;
 
 	if (rmfConnection && (pHdr->fc.wep == 0)) {
-		lim_log(pMac, LOGE,
-			       FL("Dropping unprotected Action category %d frame since RMF is enabled."), category);
+		pe_err("Dropping unprotected Action category: %d frame since RMF is enabled",
+			category);
 		return true;
 	} else
 		return false;
@@ -1758,8 +1680,7 @@ void lim_process_action_frame(tpAniSirGlobal mac_ctx,
 						session);
 				break;
 			default:
-				lim_log(mac_ctx, LOGD,
-					FL("Qos action %d not handled"),
+				pe_warn("Qos action: %d not handled",
 					action_hdr->actionID);
 				break;
 			}
@@ -1790,8 +1711,7 @@ void lim_process_action_frame(tpAniSirGlobal mac_ctx,
 					mac_ctx, rx_pkt_info, session);
 			break;
 		default:
-			lim_log(mac_ctx, LOGD,
-				FL("Spectrum mgmt action id %d not handled"),
+			pe_warn("Spectrum mgmt action id: %d not handled",
 				action_hdr->actionID);
 			break;
 		}
@@ -1799,8 +1719,7 @@ void lim_process_action_frame(tpAniSirGlobal mac_ctx,
 
 	case SIR_MAC_ACTION_WME:
 		if (!session->limWmeEnabled) {
-			lim_log(mac_ctx, LOGW,
-				FL("WME mode disabled - dropping frame %d"),
+			pe_warn("WME mode disabled - dropping frame: %d",
 				action_hdr->actionID);
 			break;
 		}
@@ -1826,8 +1745,7 @@ void lim_process_action_frame(tpAniSirGlobal mac_ctx,
 			break;
 
 		default:
-			lim_log(mac_ctx, LOGD,
-				FL("WME action %d not handled"),
+			pe_warn("WME action: %d not handled",
 				action_hdr->actionID);
 			break;
 		}
@@ -1843,16 +1761,14 @@ void lim_process_action_frame(tpAniSirGlobal mac_ctx,
 						session);
 			break;
 		default:
-			lim_log(mac_ctx, LOGD,
-				FL("Action ID %d not handled in HT category"),
+			pe_warn("Action ID: %d not handled in HT category",
 				action_hdr->actionID);
 			break;
 		}
 		break;
 
 	case SIR_MAC_ACTION_WNM:
-		lim_log(mac_ctx, LOGD,
-			FL("WNM Action category %d action %d."),
+		pe_debug("WNM Action category: %d action: %d",
 			action_hdr->category, action_hdr->actionID);
 		switch (action_hdr->actionID) {
 		case SIR_MAC_WNM_BSS_TM_QUERY:
@@ -1872,8 +1788,7 @@ void lim_process_action_frame(tpAniSirGlobal mac_ctx,
 					session, rssi);
 			break;
 		default:
-			lim_log(mac_ctx, LOGD,
-				FL("Action ID %d not handled in WNM category"),
+			pe_debug("Action ID: %d not handled in WNM category",
 				action_hdr->actionID);
 			break;
 		}
@@ -1911,16 +1826,14 @@ void lim_process_action_frame(tpAniSirGlobal mac_ctx,
 						session);
 				break;
 			default:
-				lim_log(mac_ctx, LOGD,
-					FL("Action ID %d not handled in RRM"),
+				pe_warn("Action ID: %d not handled in RRM",
 					action_hdr->actionID);
 				break;
 
 			}
 		} else {
 			/* Else we will just ignore the RRM messages. */
-			lim_log(mac_ctx, LOGD,
-			  FL("RRM frm ignored, it is disabled in cfg %d or DHCP not completed %d"),
+			pe_debug("RRM frm ignored, it is disabled in cfg: %d or DHCP not completed: %d",
 			  mac_ctx->rrm.rrmPEContext.rrmEnable,
 			  mac_ctx->roam.roamSession
 			  [session->smeSessionId].dhcp_done);
@@ -1941,8 +1854,7 @@ void lim_process_action_frame(tpAniSirGlobal mac_ctx,
 					&mac_hdr->da[0], sizeof(tSirMacAddr)))
 		    && IS_WES_MODE_ENABLED(mac_ctx)
 		    && !qdf_mem_cmp(vendor_specific->Oui, oui, 3)) {
-			lim_log(mac_ctx, LOGW,
-				FL("Rcvd Vendor specific frame, OUI %x %x %x"),
+			pe_debug("Rcvd Vendor specific frame OUI: %x %x %x",
 				vendor_specific->Oui[0],
 				vendor_specific->Oui[1],
 				vendor_specific->Oui[2]);
@@ -1959,12 +1871,7 @@ void lim_process_action_frame(tpAniSirGlobal mac_ctx,
 					WMA_GET_RX_CH(rx_pkt_info),
 					session, 0);
 		} else {
-			lim_log(mac_ctx, LOGD,
-				FL("Dropping the vendor specific action frame"
-					"beacause of (WES Mode not enabled "
-					"(WESMODE = %d) or OUI mismatch "
-					"(%02x %02x %02x) or not received with"
-					"SelfSta address) system role = %d"),
+			pe_debug("Dropping the vendor specific action frame beacause of (WES Mode not enabled (WESMODE: %d) or OUI mismatch (%02x %02x %02x) or not received with SelfSta address) system role: %d",
 				IS_WES_MODE_ENABLED(mac_ctx),
 				vendor_specific->Oui[0],
 				vendor_specific->Oui[1],
@@ -1998,8 +1905,7 @@ void lim_process_action_frame(tpAniSirGlobal mac_ctx,
 						WMA_GET_RX_CH(rx_pkt_info),
 				session, WMA_GET_RX_RSSI_RAW(rx_pkt_info));
 			} else {
-				lim_log(mac_ctx, LOGD,
-					FL("Unhandled public action frame (Vendor specific). OUI %x %x %x %x"),
+				pe_debug("Unhandled public action frame (Vendor specific) OUI: %x %x %x %x",
 					pub_action->Oui[0], pub_action->Oui[1],
 					pub_action->Oui[2], pub_action->Oui[3]);
 			}
@@ -2042,8 +1948,7 @@ void lim_process_action_frame(tpAniSirGlobal mac_ctx,
 			mac_hdr = WMA_GET_RX_MAC_HEADER(rx_pkt_info);
 			frame_len = WMA_GET_RX_PAYLOAD_LEN(rx_pkt_info);
 			rssi = WMA_GET_RX_RSSI_NORMALIZED(rx_pkt_info);
-			QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG,
-				  ("Public Action TDLS Discovery RSP .."));
+			pe_debug("Public Action TDLS Discovery RSP");
 			lim_send_sme_mgmt_frame_ind(mac_ctx,
 				mac_hdr->fc.subType, (uint8_t *) mac_hdr,
 				frame_len + sizeof(tSirMacMgmtHdr),
@@ -2056,8 +1961,7 @@ void lim_process_action_frame(tpAniSirGlobal mac_ctx,
 							rx_pkt_info, session);
 			break;
 		default:
-			lim_log(mac_ctx, LOGD,
-				FL("Unhandled public action frame -- %x "),
+			pe_warn("Unhandled public action frame: %x",
 				action_hdr->actionID);
 			break;
 		}
@@ -2065,8 +1969,7 @@ void lim_process_action_frame(tpAniSirGlobal mac_ctx,
 
 #ifdef WLAN_FEATURE_11W
 	case SIR_MAC_ACTION_SA_QUERY:
-		lim_log(mac_ctx, LOGD,
-			FL("SA Query Action category %d action %d."),
+		pe_debug("SA Query Action category: %d action: %d",
 			action_hdr->category, action_hdr->actionID);
 		switch (action_hdr->actionID) {
 		case SIR_MAC_SA_QUERY_REQ:
@@ -2113,7 +2016,7 @@ void lim_process_action_frame(tpAniSirGlobal mac_ctx,
 		hdr = WMA_GET_RX_MAC_HEADER(rx_pkt_info);
 		frame_len = WMA_GET_RX_PAYLOAD_LEN(rx_pkt_info);
 
-		lim_log(mac_ctx, LOGD, FL("Received FST MGMT action frame"));
+		pe_debug("Received FST MGMT action frame");
 		/* Forward to the SME to HDD */
 		lim_send_sme_mgmt_frame_ind(mac_ctx, hdr->fc.subType,
 					    (uint8_t *)hdr,
@@ -2124,8 +2027,7 @@ void lim_process_action_frame(tpAniSirGlobal mac_ctx,
 		break;
 	}
 	case SIR_MAC_ACTION_PROT_DUAL_PUB:
-		lim_log(mac_ctx, LOGD,
-			FL("Rcvd Protected Dual of Public Action; action %d."),
+		pe_debug("Rcvd Protected Dual of Public Action: %d",
 			action_hdr->actionID);
 		switch (action_hdr->actionID) {
 		case SIR_MAC_PDPA_GAS_INIT_REQ:
@@ -2142,14 +2044,12 @@ void lim_process_action_frame(tpAniSirGlobal mac_ctx,
 				WMA_GET_RX_CH(rx_pkt_info), session, rssi);
 			break;
 		default:
-			lim_log(mac_ctx, LOGD,
-				FL("Unhandled - Protected Dual Public Action"));
+			pe_warn("Unhandled - Protected Dual Public Action");
 			break;
 		}
 		break;
 	default:
-		lim_log(mac_ctx, LOGD,
-			FL("Action category %d not handled"),
+		pe_warn("Action category: %d not handled",
 			action_hdr->category);
 		break;
 	}
@@ -2181,7 +2081,7 @@ void lim_process_action_frame_no_session(tpAniSirGlobal pMac, uint8_t *pBd)
 	tpSirMacVendorSpecificPublicActionFrameHdr pActionHdr =
 		(tpSirMacVendorSpecificPublicActionFrameHdr) pBody;
 
-	lim_log(pMac, LOGD, "Received a Action frame -- no session");
+	pe_debug("Received a Action frame -- no session");
 
 	switch (pActionHdr->category) {
 	case SIR_MAC_ACTION_PUBLIC_USAGE:
@@ -2209,9 +2109,7 @@ void lim_process_action_frame_no_session(tpAniSirGlobal pMac, uint8_t *pBd)
 							    WMA_GET_RX_CH
 								    (pBd), NULL, 0);
 			} else {
-				lim_log(pMac, LOGD,
-					FL
-						("Unhandled public action frame (Vendor specific). OUI %x %x %x %x"),
+				pe_debug("Unhandled public action frame (Vendor specific) OUI: %x %x %x %x",
 					pActionHdr->Oui[0],
 					pActionHdr->Oui[1],
 					pActionHdr->Oui[2],
@@ -2220,15 +2118,13 @@ void lim_process_action_frame_no_session(tpAniSirGlobal pMac, uint8_t *pBd)
 		}
 		break;
 		default:
-			lim_log(pMac, LOGW,
-				FL("Unhandled public action frame -- %x "),
+			pe_warn("Unhandled public action frame: %x",
 				       pActionHdr->actionID);
 			break;
 		}
 		break;
 	default:
-		lim_log(pMac, LOGW,
-			FL("Unhandled action frame without session -- %x "),
+		pe_warn("Unhandled action frame without session: %x",
 			       pActionHdr->category);
 		break;