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

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

Change-Id: I280870f1f7c639cc0599a639bf91910a8159aa56
CRs-Fixed: 1093093

1 files changed, 62 insertions, 100 deletions

diff --git a/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c b/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c
index d72871b60a8b..b59040c96b1a 100644
--- a/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c
+++ b/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c
@@ -386,12 +386,12 @@ ibss_coalesce_save(tpAniSirGlobal pMac,
 
 	pMac->lim.ibssInfo.pHdr = qdf_mem_malloc(sizeof(*pHdr));
 	if (NULL == pMac->lim.ibssInfo.pHdr) {
-		lim_log(pMac, LOGE, FL("ibbs-save: Failed malloc pHdr"));
+		pe_err("ibbs-save: Failed malloc pHdr");
 		return;
 	}
 	pMac->lim.ibssInfo.pBeacon = qdf_mem_malloc(sizeof(*pBeacon));
 	if (NULL == pMac->lim.ibssInfo.pBeacon) {
-		lim_log(pMac, LOGE, FL("ibbs-save: Failed malloc pBeacon"));
+		pe_err("ibbs-save: Failed malloc pBeacon");
 		ibss_coalesce_free(pMac);
 		return;
 	}
@@ -419,7 +419,7 @@ ibss_dph_entry_add(tpAniSirGlobal pMac,
 				      &psessionEntry->dph.dphHashTable);
 	if (pStaDs != NULL) {
 		/* Trying to add context for already existing STA in IBSS */
-		lim_log(pMac, LOGE, FL("STA exists already "));
+		pe_err("STA exists already");
 		lim_print_mac_addr(pMac, peerAddr, LOGE);
 		return eSIR_FAILURE;
 	}
@@ -445,8 +445,7 @@ ibss_dph_entry_add(tpAniSirGlobal pMac,
 				   &psessionEntry->dph.dphHashTable);
 	if (pStaDs == NULL) {
 		/* Could not add hash table entry */
-		lim_log(pMac, LOGE,
-			FL("could not add hash entry at DPH for peerIdx/aid=%d MACaddr:"),
+		pe_err("could not add hash entry at DPH for peerIdx/aid: %d MACaddr:",
 			       peerIdx);
 		lim_print_mac_addr(pMac, peerAddr, LOGE);
 		return eSIR_FAILURE;
@@ -497,8 +496,7 @@ static void ibss_bss_add(tpAniSirGlobal pMac, tpPESession psessionEntry)
 	uint8_t numExtRates = 0;
 
 	if ((pHdr == NULL) || (pBeacon == NULL)) {
-		lim_log(pMac, LOGE,
-			FL("Unable to add BSS (no cached BSS info)"));
+		pe_err("Unable to add BSS (no cached BSS info)");
 		return;
 	}
 
@@ -542,8 +540,7 @@ static void ibss_bss_add(tpAniSirGlobal pMac, tpPESession psessionEntry)
 	if (cfg_set_str(pMac, WNI_CFG_EXTENDED_OPERATIONAL_RATE_SET,
 			(uint8_t *) &pBeacon->extendedRates.rate,
 			numExtRates) != eSIR_SUCCESS) {
-		lim_log(pMac, LOGP,
-			FL("could not update ExtendedOperRateset at CFG"));
+		pe_err("could not update ExtendedOperRateset at CFG");
 		return;
 	}
 
@@ -580,16 +577,15 @@ static void ibss_bss_add(tpAniSirGlobal pMac, tpPESession psessionEntry)
 		     (uint8_t *) &psessionEntry->pLimStartBssReq->ssId,
 		     psessionEntry->pLimStartBssReq->ssId.length + 1);
 
-	lim_log(pMac, LOGD, FL("invoking ADD_BSS as part of coalescing!"));
+	pe_debug("invoking ADD_BSS as part of coalescing!");
 	if (lim_mlm_add_bss(pMac, &mlmStartReq, psessionEntry) !=
 	    eSIR_SME_SUCCESS) {
-		lim_log(pMac, LOGE, FL("AddBss failure"));
+		pe_err("AddBss failure");
 		return;
 	}
 	/* Update fields in Beacon */
 	if (sch_set_fixed_beacon_fields(pMac, psessionEntry) != eSIR_SUCCESS) {
-		lim_log(pMac, LOGE,
-			FL("*** Unable to set fixed Beacon fields ***"));
+		pe_err("Unable to set fixed Beacon fields");
 		return;
 	}
 
@@ -599,16 +595,15 @@ static void ibss_bss_add(tpAniSirGlobal pMac, tpPESession psessionEntry)
 static void ibss_bss_delete(tpAniSirGlobal pMac, tpPESession psessionEntry)
 {
 	tSirRetStatus status;
-	lim_log(pMac, LOGD, FL("Initiating IBSS Delete BSS"));
+	pe_debug("Initiating IBSS Delete BSS");
 	if (psessionEntry->limMlmState != eLIM_MLM_BSS_STARTED_STATE) {
-		lim_log(pMac, LOGW,
-			FL("Incorrect LIM MLM state for delBss (%d)"),
+		pe_warn("Incorrect LIM MLM state for delBss: %d",
 			psessionEntry->limMlmState);
 		return;
 	}
 	status = lim_del_bss(pMac, NULL, psessionEntry->bssIdx, psessionEntry);
 	if (status != eSIR_SUCCESS)
-		lim_log(pMac, LOGE, FL("delBss failed for bss %d"),
+		pe_err("delBss failed for bss: %d",
 			       psessionEntry->bssIdx);
 }
 
@@ -666,9 +661,7 @@ static void lim_ibss_delete_all_peers(tpAniSirGlobal pMac,
 
 	while (pCurrNode != NULL) {
 		if (!pMac->lim.gLimNumIbssPeers) {
-			lim_log(pMac, LOGP,
-				FL
-					("Number of peers in the list is zero and node present"));
+			pe_err("Number of peers in the list is zero and node present");
 			return;
 		}
 		/* Delete the dph entry for the station
@@ -712,8 +705,7 @@ static void lim_ibss_delete_all_peers(tpAniSirGlobal pMac,
 	}
 
 	if (pMac->lim.gLimNumIbssPeers)
-		lim_log(pMac, LOGP,
-			FL("Number of peers[%d] in the list is non-zero"),
+		pe_err("Number of peers: %d in the list is non-zero",
 			pMac->lim.gLimNumIbssPeers);
 
 	pMac->lim.gLimNumIbssPeers = 0;
@@ -752,7 +744,7 @@ lim_ibss_set_protection(tpAniSirGlobal pMac, uint8_t enable,
 {
 
 	if (!pMac->lim.cfgProtection.fromllb) {
-		lim_log(pMac, LOGE, FL("protection from 11b is disabled"));
+		pe_err("protection from 11b is disabled");
 		return;
 	}
 
@@ -761,7 +753,7 @@ lim_ibss_set_protection(tpAniSirGlobal pMac, uint8_t enable,
 		if (false ==
 		    psessionEntry->beaconParams.
 		    llbCoexist /*pMac->lim.llbCoexist */) {
-			lim_log(pMac, LOGD, FL("=> IBSS: Enable Protection "));
+			pe_debug("=> IBSS: Enable Protection");
 			pBeaconParams->llbCoexist =
 				psessionEntry->beaconParams.llbCoexist = true;
 			pBeaconParams->paramChangeBitmap |=
@@ -771,7 +763,7 @@ lim_ibss_set_protection(tpAniSirGlobal pMac, uint8_t enable,
 		   psessionEntry->beaconParams.
 		   llbCoexist /*pMac->lim.llbCoexist */) {
 		psessionEntry->gLim11bParams.protectionEnabled = false;
-		lim_log(pMac, LOGD, FL("===> IBSS: Disable protection "));
+		pe_debug("===> IBSS: Disable protection");
 		pBeaconParams->llbCoexist =
 			psessionEntry->beaconParams.llbCoexist = false;
 		pBeaconParams->paramChangeBitmap |= PARAM_llBCOEXIST_CHANGED;
@@ -796,20 +788,19 @@ lim_ibss_update_protection_params(tpAniSirGlobal pMac,
 {
 	uint32_t i;
 
-	lim_log(pMac, LOGD, FL("STA is associated Addr : "));
+	pe_debug("STA is associated Addr :");
 	lim_print_mac_addr(pMac, peerMacAddr, LOGD);
 
 	for (i = 0; i < LIM_PROT_STA_CACHE_SIZE; i++) {
 		if (pMac->lim.protStaCache[i].active) {
-			lim_log(pMac, LOGD, FL("Addr: "));
+			pe_debug("Addr:");
 			lim_print_mac_addr
 				(pMac, pMac->lim.protStaCache[i].addr, LOGD);
 
 			if (!qdf_mem_cmp(pMac->lim.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;
 			}
@@ -822,7 +813,7 @@ lim_ibss_update_protection_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;
 	}
 
@@ -860,7 +851,7 @@ lim_ibss_decide_protection(tpAniSirGlobal pMac, tpDphHashNode pStaDs,
 	pBeaconParams->paramChangeBitmap = 0;
 
 	if (NULL == pStaDs) {
-		lim_log(pMac, LOGE, FL("pStaDs is NULL"));
+		pe_err("pStaDs is NULL");
 		return;
 	}
 
@@ -878,8 +869,7 @@ lim_ibss_decide_protection(tpAniSirGlobal pMac, tpDphHashNode pStaDs,
 			if ((pStaDs->erpEnabled == eHAL_CLEAR) &&
 			    (!pStaDs->mlmStaContext.htCapability)) {
 				protStaCacheType = eLIM_PROT_STA_CACHE_TYPE_llB;
-				lim_log(pMac, LOGE,
-					FL("Enable protection from 11B"));
+				pe_err("Enable protection from 11B");
 				lim_ibss_set_protection(pMac, true,
 							pBeaconParams,
 							psessionEntry);
@@ -950,11 +940,11 @@ lim_ibss_sta_add(tpAniSirGlobal pMac, void *pBody, tpPESession psessionEntry)
 	qdf_mem_set((uint8_t *) &beaconParams, sizeof(tUpdateBeaconParams), 0);
 
 	if (pBody == 0) {
-		lim_log(pMac, LOGE, FL("Invalid IBSS AddSta"));
+		pe_err("Invalid IBSS AddSta");
 		return eSIR_FAILURE;
 	}
 
-	lim_log(pMac, LOGD, FL("Rx Add-Ibss-Sta for MAC:"));
+	pe_debug("Rx Add-Ibss-Sta for MAC:");
 	lim_print_mac_addr(pMac, *pPeerAddr, LOGD);
 
 	pPeerNode = ibss_peer_find(pMac, *pPeerAddr);
@@ -968,13 +958,11 @@ lim_ibss_sta_add(tpAniSirGlobal pMac, void *pBody, tpPESession psessionEntry)
 
 			ibss_sta_info_update(pMac, pStaDs, pPeerNode,
 					     psessionEntry);
-			lim_log(pMac, LOGD,
-				FL("initiating ADD STA for the IBSS peer."));
+			pe_debug("initiating ADD STA for the IBSS peer");
 			retCode =
 				lim_add_sta(pMac, pStaDs, false, psessionEntry);
 			if (retCode != eSIR_SUCCESS) {
-				lim_log(pMac, LOGE,
-					FL("ibss-sta-add failed (reason %x)"),
+				pe_err("ibss-sta-add failed (reason %x)",
 					       retCode);
 				lim_print_mac_addr(pMac, *pPeerAddr, LOGE);
 				pStaDs->mlmStaContext.mlmState = prevState;
@@ -990,8 +978,7 @@ lim_ibss_sta_add(tpAniSirGlobal pMac, void *pBody, tpPESession psessionEntry)
 								   psessionEntry);
 
 				if (beaconParams.paramChangeBitmap) {
-					lim_log(pMac, LOGD,
-						FL("---> Update Beacon Params "));
+					pe_debug("---> Update Beacon Params");
 					sch_set_fixed_beacon_fields(pMac,
 								    psessionEntry);
 					beaconParams.bssIdx =
@@ -1001,8 +988,7 @@ lim_ibss_sta_add(tpAniSirGlobal pMac, void *pBody, tpPESession psessionEntry)
 				}
 			}
 		} else {
-			lim_log(pMac, LOGE, FL("hashTblAdd failed (reason %x)"),
-				       retCode);
+			pe_err("hashTblAdd failed reason: %x", retCode);
 			lim_print_mac_addr(pMac, *pPeerAddr, LOGE);
 		}
 	} else {
@@ -1038,7 +1024,7 @@ __lim_ibss_search_and_delete_peer(tpAniSirGlobal mac_ptr,
 
 	prev_node = temp_node = mac_ptr->lim.gLimIbssPeerList;
 
-	lim_log(mac_ptr, LOGD, FL(" PEER ADDR :" MAC_ADDRESS_STR),
+	pe_debug(" PEER ADDR :" MAC_ADDRESS_STR,
 		MAC_ADDR_ARRAY(mac_addr));
 
 	/** Compare Peer */
@@ -1107,8 +1093,7 @@ __lim_ibss_search_and_delete_peer(tpAniSirGlobal mac_ptr,
 	 * we set IBSS state to inactive.
 	 */
 	if (0 == mac_ptr->lim.gLimNumIbssPeers) {
-		QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG,
-			  "Last STA from IBSS walked out");
+		pe_debug("Last STA from IBSS walked out");
 		session_entry->limIbssActive = false;
 	}
 }
@@ -1123,7 +1108,7 @@ lim_ibss_add_sta_rsp(tpAniSirGlobal pMac, void *msg, tpPESession psessionEntry)
 
 	SET_LIM_PROCESS_DEFD_MESGS(pMac, true);
 	if (pAddStaParams == NULL) {
-		lim_log(pMac, LOGE, FL("IBSS: ADD_STA_RSP with no body!"));
+		pe_err("IBSS: ADD_STA_RSP with no body!");
 		return eSIR_FAILURE;
 	}
 
@@ -1131,18 +1116,14 @@ lim_ibss_add_sta_rsp(tpAniSirGlobal pMac, void *msg, tpPESession psessionEntry)
 		dph_lookup_hash_entry(pMac, pAddStaParams->staMac, &peerIdx,
 				      &psessionEntry->dph.dphHashTable);
 	if (pStaDs == NULL) {
-		lim_log(pMac, LOGE,
-			FL("IBSS: ADD_STA_RSP for unknown MAC addr: "
-			MAC_ADDRESS_STR),
+		pe_err("IBSS: ADD_STA_RSP for unknown MAC addr: "MAC_ADDRESS_STR,
 			MAC_ADDR_ARRAY(pAddStaParams->staMac));
 		qdf_mem_free(pAddStaParams);
 		return eSIR_FAILURE;
 	}
 
 	if (pAddStaParams->status != QDF_STATUS_SUCCESS) {
-		lim_log(pMac, LOGE,
-			FL("IBSS: ADD_STA_RSP error (%x) for MAC: "
-			MAC_ADDRESS_STR),
+		pe_err("IBSS: ADD_STA_RSP error: %x for MAC:"MAC_ADDRESS_STR,
 			pAddStaParams->status,
 			MAC_ADDR_ARRAY(pAddStaParams->staMac));
 		__lim_ibss_search_and_delete_peer(pMac,
@@ -1158,7 +1139,7 @@ lim_ibss_add_sta_rsp(tpAniSirGlobal pMac, void *msg, tpPESession psessionEntry)
 	pStaDs->valid = 1;
 	pStaDs->mlmStaContext.mlmState = eLIM_MLM_LINK_ESTABLISHED_STATE;
 
-	lim_log(pMac, LOGW, FL("IBSS: sending IBSS_NEW_PEER msg to SME!"));
+	pe_debug("IBSS: sending IBSS_NEW_PEER msg to SME!");
 
 	ibss_status_chg_notify(pMac, pAddStaParams->staMac,
 			       pStaDs->staIndex, pStaDs->ucUcastSig,
@@ -1176,17 +1157,15 @@ void lim_ibss_del_bss_rsp_when_coalescing(tpAniSirGlobal pMac, void *msg,
 {
 	tpDeleteBssParams pDelBss = (tpDeleteBssParams) msg;
 
-	lim_log(pMac, LOGW, FL("IBSS: DEL_BSS_RSP Rcvd during coalescing!"));
+	pe_debug("IBSS: DEL_BSS_RSP Rcvd during coalescing!");
 
 	if (pDelBss == NULL) {
-		lim_log(pMac, LOGE,
-			FL("IBSS: DEL_BSS_RSP(coalesce) with no body!"));
+		pe_err("IBSS: DEL_BSS_RSP(coalesce) with no body!");
 		goto end;
 	}
 
 	if (pDelBss->status != QDF_STATUS_SUCCESS) {
-		lim_log(pMac, LOGE,
-			FL("IBSS: DEL_BSS_RSP(coalesce) error (%x) Bss %d "),
+		pe_err("IBSS: DEL_BSS_RSP(coalesce) error: %x Bss: %d",
 			pDelBss->status, pDelBss->bssIdx);
 		goto end;
 	}
@@ -1214,8 +1193,7 @@ void lim_ibss_add_bss_rsp_when_coalescing(tpAniSirGlobal pMac, void *msg,
 		(tpSchBeaconStruct) pMac->lim.ibssInfo.pBeacon;
 
 	if ((pHdr == NULL) || (pBeacon == NULL)) {
-		lim_log(pMac, LOGE,
-			FL("Unable to handle AddBssRspWhenCoalescing (no cached BSS info)"));
+		pe_err("Unable to handle AddBssRspWhenCoalescing (no cached BSS info)");
 		goto end;
 	}
 	/* Inform Host of IBSS coalescing */
@@ -1228,7 +1206,7 @@ void lim_ibss_add_bss_rsp_when_coalescing(tpAniSirGlobal pMac, void *msg,
 	qdf_mem_copy((uint8_t *) &newBssInfo.ssId,
 		     (uint8_t *) &pBeacon->ssId, pBeacon->ssId.length + 1);
 
-	lim_log(pMac, LOGD, FL("Sending JOINED_NEW_BSS notification to SME."));
+	pe_debug("Sending JOINED_NEW_BSS notification to SME");
 
 	lim_send_sme_wm_status_change_ntf(pMac, eSIR_SME_JOINED_NEW_BSS,
 					  (uint32_t *) &newBssInfo,
@@ -1250,15 +1228,14 @@ void lim_ibss_del_bss_rsp(tpAniSirGlobal pMac, void *msg, tpPESession psessionEn
 
 	SET_LIM_PROCESS_DEFD_MESGS(pMac, true);
 	if (pDelBss == NULL) {
-		lim_log(pMac, LOGE, FL("IBSS: DEL_BSS_RSP with no body!"));
+		pe_err("IBSS: DEL_BSS_RSP with no body!");
 		rc = eSIR_SME_REFUSED;
 		goto end;
 	}
 
 	psessionEntry = pe_find_session_by_session_id(pMac, pDelBss->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");
 		goto end;
 	}
 
@@ -1275,7 +1252,7 @@ void lim_ibss_del_bss_rsp(tpAniSirGlobal pMac, void *msg, tpPESession psessionEn
 	}
 
 	if (pDelBss->status != QDF_STATUS_SUCCESS) {
-		lim_log(pMac, LOGE, FL("IBSS: DEL_BSS_RSP error (%x) Bss %d "),
+		pe_err("IBSS: DEL_BSS_RSP error: %x Bss: %d",
 			       pDelBss->status, pDelBss->bssIdx);
 		rc = eSIR_SME_STOP_BSS_FAILURE;
 		goto end;
@@ -1284,8 +1261,7 @@ void lim_ibss_del_bss_rsp(tpAniSirGlobal pMac, void *msg, tpPESession psessionEn
 	if (lim_set_link_state(pMac, eSIR_LINK_IDLE_STATE, nullBssid,
 			       psessionEntry->selfMacAddr, NULL,
 			       NULL) != eSIR_SUCCESS) {
-		lim_log(pMac, LOGE,
-			FL("IBSS: DEL_BSS_RSP setLinkState failed"));
+		pe_err("IBSS: DEL_BSS_RSP setLinkState failed");
 		rc = eSIR_SME_REFUSED;
 		goto end;
 	}
@@ -1358,9 +1334,8 @@ lim_ibss_coalesce(tpAniSirGlobal pMac,
 
 	sir_copy_mac_addr(currentBssId, psessionEntry->bssId);
 
-	lim_log(pMac, LOGD,
-		FL("Current BSSID :" MAC_ADDRESS_STR " Received BSSID :"
-		   MAC_ADDRESS_STR), MAC_ADDR_ARRAY(currentBssId),
+	pe_debug("Current BSSID :" MAC_ADDRESS_STR " Received BSSID :"
+		   MAC_ADDRESS_STR, MAC_ADDR_ARRAY(currentBssId),
 		MAC_ADDR_ARRAY(pHdr->bssId));
 
 	/* Check for IBSS Coalescing only if Beacon is from different BSS */
@@ -1380,13 +1355,12 @@ lim_ibss_coalesce(tpAniSirGlobal pMac,
 		if (NULL != pPeerNode) {
 			__lim_ibss_search_and_delete_peer(pMac, psessionEntry,
 							  pHdr->sa);
-			lim_log(pMac, LOGW,
-				FL("** Peer attempting to reconnect before HB timeout, deleted **"));
+			pe_warn("Peer attempting to reconnect before HB timeout, deleted");
 			return eSIR_LIM_IGNORE_BEACON;
 		}
 
 		if (!fTsfLater) { /* No Coalescing happened. */
-			lim_log(pMac, LOGW, FL("No Coalescing happened"));
+			pe_warn("No Coalescing happened");
 			return eSIR_LIM_IGNORE_BEACON;
 		}
 		/*
@@ -1396,8 +1370,7 @@ lim_ibss_coalesce(tpAniSirGlobal pMac,
 		 */
 		pMac->lim.gLimIbssCoalescingHappened = true;
 		ibss_coalesce_save(pMac, pHdr, pBeacon);
-		lim_log(pMac, LOGD,
-			FL("IBSS Coalescing happened Delete BSSID :" MAC_ADDRESS_STR),
+		pe_debug("IBSS Coalescing happened Delete BSSID :" MAC_ADDRESS_STR,
 			MAC_ADDR_ARRAY(currentBssId));
 		ibss_bss_delete(pMac, psessionEntry);
 		return eSIR_SUCCESS;
@@ -1425,21 +1398,18 @@ lim_ibss_coalesce(tpAniSirGlobal pMac,
 		    pMac->lim.gLimIbssStaLimit) {
 			/*Print every 100th time */
 			if (pMac->lim.ibss_retry_cnt % 100 == 0) {
-				lim_log(pMac, LOGD,
-				    FL("**** MAX STA LIMIT HAS REACHED ****"));
+				pe_debug("**** MAX STA LIMIT HAS REACHED ****");
 			}
 			pMac->lim.ibss_retry_cnt++;
 			return eSIR_LIM_MAX_STA_REACHED_ERROR;
 		}
-		lim_log(pMac, LOGD,
-			FL("IBSS Peer node does not exist, adding it***"));
+		pe_debug("IBSS Peer node does not exist, adding it");
 		frameLen =
 			sizeof(tLimIbssPeerNode) + ieLen - sizeof(uint32_t);
 
 		pPeerNode = qdf_mem_malloc((uint16_t) frameLen);
 		if (NULL == pPeerNode) {
-			lim_log(pMac, LOGE,
-				FL("alloc fail (%d bytes) storing IBSS peer info"),
+			pe_err("alloc fail %d bytes storing IBSS peer info",
 				frameLen);
 			return eSIR_MEM_ALLOC_FAILED;
 		}
@@ -1451,8 +1421,7 @@ lim_ibss_coalesce(tpAniSirGlobal pMac,
 				  psessionEntry);
 		pPeerNode->beacon = qdf_mem_malloc(ieLen);
 		if (NULL == pPeerNode->beacon) {
-			lim_log(pMac, LOGE,
-				FL("Unable to allocate memory to store beacon"));
+			pe_err("Unable to allocate memory to store beacon");
 		} else {
 			qdf_mem_copy(pPeerNode->beacon, pIEs, ieLen);
 			pPeerNode->beaconLen = (uint16_t) ieLen;
@@ -1464,8 +1433,7 @@ lim_ibss_coalesce(tpAniSirGlobal pMac,
 					      &psessionEntry->dph.dphHashTable);
 		if (pStaDs != NULL) {
 			/* / DPH node already exists for the peer */
-			lim_log(pMac, LOGW,
-				FL("DPH Node present for just learned peer"));
+			pe_warn("DPH Node present for just learned peer");
 			lim_print_mac_addr(pMac, pPeerNode->peerMacAddr, LOGD);
 			ibss_sta_info_update(pMac, pStaDs, pPeerNode,
 					     psessionEntry);
@@ -1474,9 +1442,7 @@ lim_ibss_coalesce(tpAniSirGlobal pMac,
 		retCode =
 			lim_ibss_sta_add(pMac, pPeerNode->peerMacAddr, psessionEntry);
 		if (retCode != eSIR_SUCCESS) {
-			lim_log(pMac, LOGE,
-				FL("lim-ibss-sta-add failed (reason %x)"),
-				retCode);
+			pe_err("lim-ibss-sta-add failed reason: %x", retCode);
 			lim_print_mac_addr(pMac, pPeerNode->peerMacAddr, LOGE);
 			return retCode;
 		}
@@ -1490,8 +1456,7 @@ lim_ibss_coalesce(tpAniSirGlobal pMac,
 						   psessionEntry);
 
 		if (beaconParams.paramChangeBitmap) {
-			lim_log(pMac, LOGE,
-				FL("beaconParams.paramChangeBitmap=1 ---> Update Beacon Params "));
+			pe_err("beaconParams.paramChangeBitmap=1 ---> Update Beacon Params");
 			sch_set_fixed_beacon_fields(pMac, psessionEntry);
 			beaconParams.bssIdx = psessionEntry->bssIdx;
 			lim_send_beacon_params(pMac, &beaconParams, psessionEntry);
@@ -1507,8 +1472,7 @@ lim_ibss_coalesce(tpAniSirGlobal pMac,
 	/* if not already that IBSS is active. */
 	if (psessionEntry->limIbssActive == false) {
 		limResetHBPktCount(psessionEntry);
-		lim_log(pMac, LOGW,
-			FL("Partner joined our IBSS, Sending IBSS_ACTIVE Notification to SME"));
+		pe_warn("Partner joined our IBSS, Sending IBSS_ACTIVE Notification to SME");
 		psessionEntry->limIbssActive = true;
 		lim_send_sme_wm_status_change_ntf(pMac, eSIR_SME_IBSS_ACTIVE, NULL, 0,
 						  psessionEntry->smeSessionId);
@@ -1567,7 +1531,7 @@ void lim_ibss_heart_beat_handle(tpAniSirGlobal mac_ctx, tpPESession session)
 
 		/* There wasnt any beacon received during heartbeat timer. */
 		tempnode->heartbeatFailure++;
-		lim_log(mac_ctx, LOGE, FL("Heartbeat fail = %d  thres = %d"),
+		pe_err("Heartbeat fail: %d  thres: %d",
 		    tempnode->heartbeatFailure, mac_ctx->lim.gLimNumIbssPeers);
 		if (tempnode->heartbeatFailure >= threshold) {
 			/* Remove this entry from the list. */
@@ -1628,7 +1592,7 @@ void lim_ibss_heart_beat_handle(tpAniSirGlobal mac_ctx, tpPESession session)
 		limResetHBPktCount(session);
 		return;
 	} else {
-		lim_log(mac_ctx, LOGW, FL("Heartbeat Failure"));
+		pe_warn("Heartbeat Failure");
 		mac_ctx->lim.gLimHBfailureCntInLinkEstState++;
 
 		if (session->limIbssActive == true) {
@@ -1637,7 +1601,7 @@ void lim_ibss_heart_beat_handle(tpAniSirGlobal mac_ctx, tpPESession session)
 			 * other STA in IBSS. Announce IBSS inactive
 			 * to Roaming algorithm
 			 */
-			lim_log(mac_ctx, LOGW, FL("Alone in IBSS"));
+			pe_warn("Alone in IBSS");
 			session->limIbssActive = false;
 
 			lim_send_sme_wm_status_change_ntf(mac_ctx,
@@ -1681,13 +1645,11 @@ void lim_ibss_decide_protection_on_delete(tpAniSirGlobal mac_ctx,
 	/* we are HT or 11G and 11B station is getting deleted. */
 	if (((phymode == WNI_CFG_PHY_MODE_11G) ||
 	     session->htCapability) && (erpenabled == eHAL_CLEAR)) {
-		lim_log(mac_ctx, LOGE,
-			FL("(%d) A legacy STA is disassociated. Addr is "),
+		pe_err("%d A legacy STA is disassociated Addr is",
 			session->gLim11bParams.numSta);
 			lim_print_mac_addr(mac_ctx, stads->staAddr, LOGE);
 		if (session->gLim11bParams.numSta == 0) {
-			lim_log(mac_ctx, LOGE,
-				FL("No 11B STA exists. Disable protection."));
+			pe_err("No 11B STA exists. Disable protection");
 			lim_ibss_set_protection(mac_ctx, false,
 				bcn_param, session);
 		}