qcacld-3.0: Reduce the log spam in lim

Move the logs to appropriate log levels to reduce
the log spam in lim_ft_preauth.c, lim_timer_utils.c,
lim_process_probe_rsp_frame.c,lim_security_utils.c,
lim_ser_des_utils.c and lim_process_beacon_frame.c

Change-Id: Icdc902150ac93806d69d466e0ef1d3a8e18829b0
CRs-Fixed: 1093093

6 files changed, 129 insertions, 145 deletions

diff --git a/core/mac/src/pe/lim/lim_ft_preauth.c b/core/mac/src/pe/lim/lim_ft_preauth.c
index 5feb841931d8..48af260bdd67 100644
--- a/core/mac/src/pe/lim/lim_ft_preauth.c
+++ b/core/mac/src/pe/lim/lim_ft_preauth.c
@@ -69,7 +69,7 @@ void lim_ft_cleanup_pre_auth_info(tpAniSirGlobal pMac,
 						 pFTPreAuthReq->preAuthbssId,
 						 &sessionId);
 
-		lim_log(pMac, LOG1, FL("Freeing pFTPreAuthReq= %p"),
+		lim_log(pMac, LOGD, FL("Freeing pFTPreAuthReq= %p"),
 			       psessionEntry->ftPEContext.pFTPreAuthReq);
 		if (psessionEntry->ftPEContext.pFTPreAuthReq->
 		    pbssDescription) {
@@ -183,7 +183,7 @@ int lim_process_ft_pre_auth_req(tpAniSirGlobal mac_ctx, tpSirMsgQ msg)
 	/* We need information from the Pre-Auth Req. Lets save that */
 	session->ftPEContext.pFTPreAuthReq = ft_pre_auth_req;
 
-	lim_log(mac_ctx, LOG1, FL("PRE Auth ft_ies_length=%02x%02x%02x"),
+	lim_log(mac_ctx, LOGD, FL("PRE Auth ft_ies_length=%02x%02x%02x"),
 		session->ftPEContext.pFTPreAuthReq->ft_ies[0],
 		session->ftPEContext.pFTPreAuthReq->ft_ies[1],
 		session->ftPEContext.pFTPreAuthReq->ft_ies[2]);
@@ -200,13 +200,13 @@ int lim_process_ft_pre_auth_req(tpAniSirGlobal mac_ctx, tpSirMsgQ msg)
 	    session->ftPEContext.pFTPreAuthReq->preAuthchannelNum)
 	    || lim_is_in_mcc(mac_ctx)) {
 		/* Need to suspend link only if the channels are different */
-		lim_log(mac_ctx, LOG2,
+		lim_log(mac_ctx, LOGD,
 			FL("Performing pre-auth on diff channel(session %p)"),
 			session);
 		lim_send_preauth_scan_offload(mac_ctx, session->peSessionId,
 				session->ftPEContext.pFTPreAuthReq);
 	} else {
-		lim_log(mac_ctx, LOG2,
+		lim_log(mac_ctx, LOGD,
 			FL("Performing pre-auth on same channel (session %p)"),
 			session);
 		/* We are in the same channel. Perform pre-auth */
@@ -237,7 +237,7 @@ void lim_perform_ft_pre_auth(tpAniSirGlobal pMac, QDF_STATUS status,
 	eCsrAuthType auth_type;
 
 	if (NULL == psessionEntry) {
-		PELOGE(lim_log(pMac, LOGE, FL("psessionEntry is NULL"));)
+		lim_log(pMac, LOGE, FL("psessionEntry is NULL"));
 		return;
 	}
 	session_id = psessionEntry->smeSessionId;
@@ -267,7 +267,7 @@ void lim_perform_ft_pre_auth(tpAniSirGlobal pMac, QDF_STATUS status,
 		lim_log(pMac, LOGE, FL("psessionEntry is not in STA mode"));
 		return;
 	}
-	lim_log(pMac, LOG2, "Entered wait auth2 state for FT (old session %p)",
+	lim_log(pMac, LOGD, "Entered wait auth2 state for FT (old session %p)",
 				 psessionEntry);
 	if (psessionEntry->is11Rconnection) {
 		/* Now we are on the right channel and need to send out Auth1
@@ -297,7 +297,7 @@ void lim_perform_ft_pre_auth(tpAniSirGlobal pMac, QDF_STATUS status,
 	MTRACE(mac_trace(pMac, TRACE_CODE_TIMER_ACTIVATE,
 		psessionEntry->peSessionId, eLIM_FT_PREAUTH_RSP_TIMER));
 
-	lim_log(pMac, LOG1, FL("FT Auth Rsp Timer Started"));
+	lim_log(pMac, LOGD, FL("FT Auth Rsp Timer Started"));
 #ifdef FEATURE_WLAN_DIAG_SUPPORT
 	lim_diag_event_report(pMac, WLAN_PE_DIAG_ROAM_AUTH_START_EVENT,
 			pMac->lim.pSessionEntry, eSIR_SUCCESS, eSIR_SUCCESS);
@@ -502,7 +502,7 @@ send_rsp:
 			psessionEntry->ftPEContext.pFTPreAuthReq->scan_id,
 			PREAUTH_REQUESTOR_ID);
 	} else {
-		lim_log(pMac, LOG1,
+		lim_log(pMac, LOGD,
 			"Pre auth on same channel as connected AP channel %d",
 			psessionEntry->ftPEContext.pFTPreAuthReq->
 			preAuthchannelNum);
@@ -572,7 +572,7 @@ void lim_process_ft_preauth_rsp_timeout(tpAniSirGlobal mac_ctx)
 		 * Preauth rsp processed so that any rsp from AP is dropped in
 		 * lim_process_auth_frame_no_session.
 		 */
-		lim_log(mac_ctx, LOG1,
+		lim_log(mac_ctx, LOGD,
 			FL("Auth rsp not yet posted to SME (session %p)"),
 			session);
 		session->ftPEContext.pFTPreAuthReq->bPreAuthRspProcessed = true;
@@ -615,7 +615,7 @@ void lim_post_ft_pre_auth_rsp(tpAniSirGlobal mac_ctx,
 		return;
 	}
 
-	lim_log(mac_ctx, LOG1, FL("Auth Rsp = %p"), ft_pre_auth_rsp);
+	lim_log(mac_ctx, LOGD, FL("Auth Rsp = %p"), ft_pre_auth_rsp);
 	if (session) {
 		/* Nothing to be done if the session is not in STA mode */
 		if (!LIM_IS_STA_ROLE(session)) {
@@ -649,7 +649,7 @@ void lim_post_ft_pre_auth_rsp(tpAniSirGlobal mac_ctx,
 		 * Ensure that on Pre-Auth failure the cached Pre-Auth Req and
 		 * other allocated memory is freed up before returning.
 		 */
-		lim_log(mac_ctx, LOG1, "Pre-Auth Failed, Cleanup!");
+		lim_log(mac_ctx, LOGD, "Pre-Auth Failed, Cleanup!");
 		lim_ft_cleanup(mac_ctx, session);
 	}
 
@@ -657,7 +657,7 @@ void lim_post_ft_pre_auth_rsp(tpAniSirGlobal mac_ctx,
 	mmh_msg.bodyptr = ft_pre_auth_rsp;
 	mmh_msg.bodyval = 0;
 
-	lim_log(mac_ctx, LOG1, FL("Posted Auth Rsp to SME with status of 0x%x"),
+	lim_log(mac_ctx, LOGD, FL("Posted Auth Rsp to SME with status of 0x%x"),
 		status);
 #ifdef FEATURE_WLAN_DIAG_SUPPORT_LIM    /* FEATURE_WLAN_DIAG_SUPPORT */
 	if (status == eSIR_SUCCESS)
@@ -723,7 +723,7 @@ QDF_STATUS lim_send_preauth_scan_offload(tpAniSirGlobal mac_ctx,
 	scan_offload_req->scan_id = ft_preauth_req->scan_id;
 	scan_offload_req->scan_requestor_id = PREAUTH_REQUESTOR_ID;
 
-	lim_log(mac_ctx, LOG1,
+	lim_log(mac_ctx, LOGD,
 		FL("Scan request: duration %u, session %hu, chan %hu"),
 		scan_offload_req->maxChannelTime, session_id,
 		ft_preauth_req->preAuthchannelNum);
diff --git a/core/mac/src/pe/lim/lim_process_beacon_frame.c b/core/mac/src/pe/lim/lim_process_beacon_frame.c
index 7ff7e61fa9c7..3e60e911d805 100644
--- a/core/mac/src/pe/lim/lim_process_beacon_frame.c
+++ b/core/mac/src/pe/lim/lim_process_beacon_frame.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2017 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -77,10 +77,10 @@ lim_process_beacon_frame(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info,
 	 * beacon counter
 	 */
 	mac_hdr = WMA_GET_RX_MAC_HEADER(rx_pkt_info);
-	lim_log(mac_ctx, LOG2,
+	lim_log(mac_ctx, LOGD,
 		FL("Received Beacon frame with length=%d from "),
 		WMA_GET_RX_MPDU_LEN(rx_pkt_info));
-		lim_print_mac_addr(mac_ctx, mac_hdr->sa, LOG2);
+		lim_print_mac_addr(mac_ctx, mac_hdr->sa, LOGD);
 
 	/* Expect Beacon in any state as Scan is independent of LIM state */
 	bcn_ptr = qdf_mem_malloc(sizeof(*bcn_ptr));
@@ -194,9 +194,9 @@ lim_process_beacon_frame_no_session(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo)
 	pMac->lim.gLimNumBeaconsRcvd++;
 	pHdr = WMA_GET_RX_MAC_HEADER(pRxPacketInfo);
 
-	lim_log(pMac, LOG2, FL("Received Beacon frame with length=%d from "),
+	lim_log(pMac, LOGD, FL("Received Beacon frame with length=%d from "),
 		WMA_GET_RX_MPDU_LEN(pRxPacketInfo));
-	lim_print_mac_addr(pMac, pHdr->sa, LOG2);
+	lim_print_mac_addr(pMac, pHdr->sa, LOGD);
 
 
 	/**
@@ -246,7 +246,7 @@ lim_process_beacon_frame_no_session(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo)
 		qdf_mem_free(pBeacon);
 	} /* end of (eLIM_MLM_WT_PROBE_RESP_STATE) || (eLIM_MLM_PASSIVE_SCAN_STATE) */
 	else {
-		lim_log(pMac, LOG1, FL("Rcvd Beacon in unexpected MLM state %s (%d)"),
+		lim_log(pMac, LOGD, FL("Rcvd Beacon in unexpected MLM state %s (%d)"),
 			lim_mlm_state_str(pMac->lim.gLimMlmState),
 			pMac->lim.gLimMlmState);
 #ifdef WLAN_DEBUG
diff --git a/core/mac/src/pe/lim/lim_process_probe_rsp_frame.c b/core/mac/src/pe/lim/lim_process_probe_rsp_frame.c
index 047294ab7d02..23664fe39b0b 100644
--- a/core/mac/src/pe/lim/lim_process_probe_rsp_frame.c
+++ b/core/mac/src/pe/lim/lim_process_probe_rsp_frame.c
@@ -138,7 +138,7 @@ lim_process_probe_rsp_frame(tpAniSirGlobal mac_ctx, uint8_t *rx_Packet_info,
 
 	header = WMA_GET_RX_MAC_HEADER(rx_Packet_info);
 
-	lim_log(mac_ctx, LOG2,
+	lim_log(mac_ctx, LOGD,
 		FL("Rx Probe Response with length = %d from "MAC_ADDRESS_STR),
 		WMA_GET_RX_MPDU_LEN(rx_Packet_info),
 		MAC_ADDR_ARRAY(header->sa));
@@ -147,7 +147,7 @@ lim_process_probe_rsp_frame(tpAniSirGlobal mac_ctx, uint8_t *rx_Packet_info,
 	if (lim_validate_ie_information_in_probe_rsp_frame(mac_ctx,
 				rx_Packet_info) !=
 		eSIR_SUCCESS) {
-		lim_log(mac_ctx, LOG1,
+		lim_log(mac_ctx, LOGE,
 			FL("Parse error ProbeResponse, length=%d"), frame_len);
 		qdf_mem_free(probe_rsp);
 		return;
@@ -165,7 +165,7 @@ lim_process_probe_rsp_frame(tpAniSirGlobal mac_ctx, uint8_t *rx_Packet_info,
 	if ((sir_convert_probe_frame2_struct(mac_ctx,
 		body, frame_len, probe_rsp) == eSIR_FAILURE) ||
 		!probe_rsp->ssidPresent) {
-		lim_log(mac_ctx, LOG1,
+		lim_log(mac_ctx, LOGE,
 			FL("Parse error ProbeResponse, length=%d"), frame_len);
 		qdf_mem_free(probe_rsp);
 		return;
@@ -272,16 +272,16 @@ lim_process_probe_rsp_frame(tpAniSirGlobal mac_ctx, uint8_t *rx_Packet_info,
 				&session_entry->dph.dphHashTable);
 		limGetQosMode(session_entry, &qos_enabled);
 		limGetWmeMode(session_entry, &wme_enabled);
-		lim_log(mac_ctx, LOG2,
+		lim_log(mac_ctx, LOGD,
 			FL("wmeEdcaPresent: %d wme_enabled: %d"),
 			probe_rsp->wmeEdcaPresent, wme_enabled);
-		lim_log(mac_ctx, LOG2,
+		lim_log(mac_ctx, LOGD,
 			FL("edcaPresent: %d, qos_enabled: %d"),
 			probe_rsp->edcaPresent, qos_enabled);
-		lim_log(mac_ctx, LOG2,
+		lim_log(mac_ctx, LOGD,
 			FL("edcaParams.qosInfo.count: %d"),
 			probe_rsp->edcaParams.qosInfo.count);
-		lim_log(mac_ctx, LOG2,
+		lim_log(mac_ctx, LOGD,
 			FL("schObject.gLimEdcaParamSetCount: %d"),
 			session_entry->gLimEdcaParamSetCount);
 		if (((probe_rsp->wmeEdcaPresent && wme_enabled) ||
@@ -360,16 +360,16 @@ lim_process_probe_rsp_frame_no_session(tpAniSirGlobal mac_ctx,
 
 	header = WMA_GET_RX_MAC_HEADER(rx_packet_info);
 
-	lim_log(mac_ctx, LOG2,
+	lim_log(mac_ctx, LOGD,
 		FL("Received Probe Response frame with length=%d from "),
 		WMA_GET_RX_MPDU_LEN(rx_packet_info));
-	lim_print_mac_addr(mac_ctx, header->sa, LOG2);
+	lim_print_mac_addr(mac_ctx, header->sa, LOGD);
 
 	/* Validate IE information before processing Probe Response Frame */
 	if (lim_validate_ie_information_in_probe_rsp_frame(mac_ctx,
 				rx_packet_info) !=
 								eSIR_SUCCESS) {
-		lim_log(mac_ctx, LOG1,
+		lim_log(mac_ctx, LOGE,
 			FL("Parse error ProbeResponse, length=%d"), frame_len);
 		qdf_mem_free(probe_rsp);
 		return;
@@ -388,14 +388,14 @@ lim_process_probe_rsp_frame_no_session(tpAniSirGlobal mac_ctx,
 	body = WMA_GET_RX_MPDU_DATA(rx_packet_info);
 	if (sir_convert_probe_frame2_struct(mac_ctx, body, frame_len,
 		probe_rsp) == eSIR_FAILURE) {
-		lim_log(mac_ctx, LOG1,
+		lim_log(mac_ctx, LOGE,
 			FL("Parse error ProbeResponse, length=%d\n"),
 			frame_len);
 		qdf_mem_free(probe_rsp);
 		return;
 	}
 
-	lim_log(mac_ctx, LOG2, FL("Save this probe rsp in LFR cache"));
+	lim_log(mac_ctx, LOGD, FL("Save this probe rsp in LFR cache"));
 	lim_check_and_add_bss_description(mac_ctx, probe_rsp,
 		  rx_packet_info, false, true);
 	qdf_mem_free(probe_rsp);
diff --git a/core/mac/src/pe/lim/lim_security_utils.c b/core/mac/src/pe/lim/lim_security_utils.c
index 6153cf4511b6..55a84f129234 100644
--- a/core/mac/src/pe/lim/lim_security_utils.c
+++ b/core/mac/src/pe/lim/lim_security_utils.c
@@ -201,7 +201,7 @@ void lim_delete_pre_auth_list(tpAniSirGlobal pMac)
 	while (pCurrNode != NULL) {
 		pTempNode = pCurrNode->next;
 
-		PELOG1(lim_log(pMac, LOG1, FL("=====> lim_delete_pre_auth_list "));)
+		lim_log(pMac, LOG1, FL("=====> lim_delete_pre_auth_list "));
 		lim_release_pre_auth_node(pMac, pCurrNode);
 
 		pCurrNode = pTempNode;
@@ -393,17 +393,10 @@ void lim_delete_pre_auth_node(tpAniSirGlobal pMac, tSirMacAddr macAddr)
 
 		pMac->lim.pLimPreAuthList = pTempNode->next;
 
-		PELOG1(lim_log
-			       (pMac, LOG1,
-			       FL
-				       ("=====> lim_delete_pre_auth_node : first node to delete"));
-		       )
-		PELOG1(lim_log
-			       (pMac, LOG1,
-			       FL("Release data entry: %x id %d peer "), pTempNode,
-			       pTempNode->authNodeIdx);
-		       lim_print_mac_addr(pMac, macAddr, LOG1);
-		       )
+		lim_log(pMac, LOGD,
+			FL("first node to delete, Release data entry: %p id %d peer"),
+			       pTempNode, pTempNode->authNodeIdx);
+		lim_print_mac_addr(pMac, macAddr, LOGD);
 		lim_release_pre_auth_node(pMac, pTempNode);
 
 		return;
@@ -419,15 +412,10 @@ void lim_delete_pre_auth_node(tpAniSirGlobal pMac, tSirMacAddr macAddr)
 
 			pPrevNode->next = pTempNode->next;
 
-			PELOG1(lim_log
-				       (pMac, LOG1,
-				       FL
-					       ("=====> lim_delete_pre_auth_node : subsequent node to delete"));
-			       lim_log(pMac, LOG1,
-				       FL("Release data entry: %x id %d peer "),
+			lim_log(pMac, LOGD,
+				FL("subsequent node to delete, Release data entry: %p id %d peer"),
 				       pTempNode, pTempNode->authNodeIdx);
-			       lim_print_mac_addr(pMac, macAddr, LOG1);
-			       )
+			lim_print_mac_addr(pMac, macAddr, LOGD);
 			lim_release_pre_auth_node(pMac, pTempNode);
 
 			return;
@@ -439,8 +427,8 @@ void lim_delete_pre_auth_node(tpAniSirGlobal pMac, tSirMacAddr macAddr)
 
 	/* Should not be here */
 	/* Log error */
-	lim_log(pMac, LOGP, FL("peer not found in pre-auth list, addr= "));
-	lim_print_mac_addr(pMac, macAddr, LOGP);
+	lim_log(pMac, LOGE, FL("peer not found in pre-auth list, addr= "));
+	lim_print_mac_addr(pMac, macAddr, LOGE);
 
 } /*** end lim_delete_pre_auth_node() ***/
 
@@ -748,9 +736,9 @@ lim_decrypt_auth_frame(tpAniSirGlobal pMac, uint8_t *pKey, uint8_t *pEncrBody,
 	lim_rc4(pPlainBody,
 		pEncrBody + SIR_MAC_WEP_IV_LENGTH, seed, keyLength, frameLen);
 
-	PELOG4(lim_log(pMac, LOG4, FL("plainbody is "));
-	       sir_dump_buf(pMac, SIR_LIM_MODULE_ID, LOG4, pPlainBody, frameLen);
-	       )
+	lim_log(pMac, LOGD, FL("plainbody is "));
+	       sir_dump_buf(pMac, SIR_LIM_MODULE_ID, LOGD, pPlainBody, frameLen);
+
 	/* Compute CRC-32 and place them in last 4 bytes of encrypted body */
 	lim_compute_crc32(icv,
 			  (uint8_t *) pPlainBody,
@@ -758,11 +746,10 @@ lim_decrypt_auth_frame(tpAniSirGlobal pMac, uint8_t *pKey, uint8_t *pEncrBody,
 
 	/* Compare RX_ICV with computed ICV */
 	for (i = 0; i < SIR_MAC_WEP_ICV_LENGTH; i++) {
-		PELOG4(lim_log
-			       (pMac, LOG4, FL(" computed ICV%d[%x], rxed ICV%d[%x]"),
-			       i, icv[i], i,
-			       pPlainBody[frameLen - SIR_MAC_WEP_ICV_LENGTH + i]);
-		       )
+		lim_log(pMac, LOGD, FL(" computed ICV%d[%x], rxed ICV%d[%x]"),
+			i, icv[i], i,
+			pPlainBody[frameLen - SIR_MAC_WEP_ICV_LENGTH + i]);
+
 		if (icv[i] !=
 		    pPlainBody[frameLen - SIR_MAC_WEP_ICV_LENGTH + i])
 			return LIM_DECRYPT_ICV_FAIL;
@@ -823,7 +810,7 @@ void lim_send_set_bss_key_req(tpAniSirGlobal pMac,
 	uint32_t val = 0;
 
 	if (pMlmSetKeysReq->numKeys > SIR_MAC_MAX_NUM_OF_DEFAULT_KEYS) {
-		lim_log(pMac, LOG1,
+		lim_log(pMac, LOGD,
 			FL
 				("numKeys = %d is more than SIR_MAC_MAX_NUM_OF_DEFAULT_KEYS"),
 			pMlmSetKeysReq->numKeys);
@@ -848,9 +835,8 @@ void lim_send_set_bss_key_req(tpAniSirGlobal pMac,
 	pSetBssKeyParams->bssIdx = psessionEntry->bssIdx;
 	pSetBssKeyParams->encType = pMlmSetKeysReq->edType;
 
-	if (eSIR_SUCCESS != wlan_cfg_get_int(pMac, WNI_CFG_SINGLE_TID_RC, &val)) {
-		lim_log(pMac, LOGP, FL("Unable to read WNI_CFG_SINGLE_TID_RC"));
-	}
+	if (eSIR_SUCCESS != wlan_cfg_get_int(pMac, WNI_CFG_SINGLE_TID_RC, &val))
+		lim_log(pMac, LOGW, FL("Unable to read WNI_CFG_SINGLE_TID_RC"));
 
 	pSetBssKeyParams->singleTidRc = (uint8_t) val;
 
@@ -938,7 +924,7 @@ void lim_send_set_sta_key_req(tpAniSirGlobal pMac,
 	/* Package WMA_SET_STAKEY_REQ message parameters */
 	pSetStaKeyParams = qdf_mem_malloc(sizeof(tSetStaKeyParams));
 	if (NULL == pSetStaKeyParams) {
-		lim_log(pMac, LOGP,
+		lim_log(pMac, LOGE,
 			FL("Unable to allocate memory during SET_BSSKEY"));
 		return;
 	}
@@ -947,9 +933,8 @@ void lim_send_set_sta_key_req(tpAniSirGlobal pMac,
 	pSetStaKeyParams->staIdx = staIdx;
 	pSetStaKeyParams->encType = pMlmSetKeysReq->edType;
 
-	if (eSIR_SUCCESS != wlan_cfg_get_int(pMac, WNI_CFG_SINGLE_TID_RC, &val)) {
-		lim_log(pMac, LOGP, FL("Unable to read WNI_CFG_SINGLE_TID_RC"));
-	}
+	if (eSIR_SUCCESS != wlan_cfg_get_int(pMac, WNI_CFG_SINGLE_TID_RC, &val))
+		lim_log(pMac, LOGW, FL("Unable to read WNI_CFG_SINGLE_TID_RC"));
 
 	pSetStaKeyParams->singleTidRc = (uint8_t) val;
 
diff --git a/core/mac/src/pe/lim/lim_ser_des_utils.c b/core/mac/src/pe/lim/lim_ser_des_utils.c
index 55da544f7a64..619b6e7016b6 100644
--- a/core/mac/src/pe/lim/lim_ser_des_utils.c
+++ b/core/mac/src/pe/lim/lim_ser_des_utils.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2015,2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2017 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -102,9 +102,9 @@ tSirRetStatus lim_send_disassoc_frm_req_ser_des(tpAniSirGlobal mac_ctx,
 	len = disassoc_frm_req->length = lim_get_u16(buf);
 	buf += sizeof(A_UINT16);
 
-	PELOG1(lim_log(mac_ctx, LOG1,
-		FL("SME_DISASSOC_REQ length %d bytes is:"), len);)
-		PELOG1(sirDumpBuf(mac_ctx, SIR_LIM_MODULE_ID, LOG1, buf, len);)
+	lim_log(mac_ctx, LOGD,
+		FL("SME_DISASSOC_REQ length %d bytes is:"), len);
+	sir_dump_buf(mac_ctx, SIR_LIM_MODULE_ID, LOGD, buf, len);
 
 	if (len < (A_INT16) sizeof(A_UINT32))
 		return eSIR_FAILURE;
diff --git a/core/mac/src/pe/lim/lim_timer_utils.c b/core/mac/src/pe/lim/lim_timer_utils.c
index a7b5d373dbc5..61750b8ef2ef 100644
--- a/core/mac/src/pe/lim/lim_timer_utils.c
+++ b/core/mac/src/pe/lim/lim_timer_utils.c
@@ -68,7 +68,7 @@ static bool lim_create_non_ap_timers(tpAniSirGlobal pMac)
 			    lim_channel_switch_timer_handler, 0,
 			    LIM_CHANNEL_SWITCH_TIMER_TICKS,
 			    0, TX_NO_ACTIVATE) != TX_SUCCESS) {
-		lim_log(pMac, LOGP, FL("failed to create Ch Switch timer"));
+		lim_log(pMac, LOGE, FL("failed to create Ch Switch timer"));
 		return false;
 	}
 	/* Create Quiet Timer
@@ -79,7 +79,7 @@ static bool lim_create_non_ap_timers(tpAniSirGlobal pMac)
 			    "QUIET TIMER", lim_quiet_timer_handler,
 			    SIR_LIM_QUIET_TIMEOUT, LIM_QUIET_TIMER_TICKS,
 			    0, TX_NO_ACTIVATE) != TX_SUCCESS) {
-		lim_log(pMac, LOGP, FL("failed to create Quiet Begin Timer"));
+		lim_log(pMac, LOGE, FL("failed to create Quiet Begin Timer"));
 		return false;
 	}
 	/* Create Quiet BSS Timer
@@ -91,13 +91,13 @@ static bool lim_create_non_ap_timers(tpAniSirGlobal pMac)
 			    "QUIET BSS TIMER", lim_quiet_bss_timer_handler,
 			    SIR_LIM_QUIET_BSS_TIMEOUT, LIM_QUIET_BSS_TIMER_TICK,
 			    0, TX_NO_ACTIVATE) != TX_SUCCESS) {
-		lim_log(pMac, LOGP, FL("failed to create Quiet Bss Timer"));
+		lim_log(pMac, LOGE, FL("failed to create Quiet Bss Timer"));
 		return false;
 	}
 
 	if (wlan_cfg_get_int(pMac, WNI_CFG_JOIN_FAILURE_TIMEOUT,
 			     &cfgValue) != eSIR_SUCCESS)
-		lim_log(pMac, LOGP,
+		lim_log(pMac, LOGE,
 			FL("could not retrieve JoinFailureTimeout value"));
 	cfgValue = SYS_MS_TO_TICKS(cfgValue);
 	/* Create Join failure timer and activate it later */
@@ -108,7 +108,7 @@ static bool lim_create_non_ap_timers(tpAniSirGlobal pMac)
 			    TX_NO_ACTIVATE) != TX_SUCCESS) {
 		/* / Could not create Join failure timer. */
 		/* Log error */
-		lim_log(pMac, LOGP,
+		lim_log(pMac, LOGE,
 			FL("could not create Join failure timer"));
 		return false;
 	}
@@ -120,7 +120,7 @@ static bool lim_create_non_ap_timers(tpAniSirGlobal pMac)
 			    SIR_LIM_PERIODIC_JOIN_PROBE_REQ_TIMEOUT,
 			    SYS_MS_TO_TICKS(LIM_JOIN_PROBE_REQ_TIMER_MS), 0,
 			    TX_NO_ACTIVATE) != TX_SUCCESS) {
-		lim_log(pMac, LOGP,
+		lim_log(pMac, LOGE,
 			FL("could not create Periodic Join Probe Request tmr"));
 		return false;
 	}
@@ -132,14 +132,14 @@ static bool lim_create_non_ap_timers(tpAniSirGlobal pMac)
 		lim_timer_handler, SIR_LIM_AUTH_RETRY_TIMEOUT,
 		SYS_MS_TO_TICKS(LIM_AUTH_RETRY_TIMER_MS), 0,
 		TX_NO_ACTIVATE)) != TX_SUCCESS) {
-		lim_log(pMac, LOGP,
+		lim_log(pMac, LOGE,
 			FL("could not create Periodic AUTH Timer"));
 		return false;
 	}
 
 	if (wlan_cfg_get_int(pMac, WNI_CFG_ASSOCIATION_FAILURE_TIMEOUT,
 			     &cfgValue) != eSIR_SUCCESS)
-		lim_log(pMac, LOGP,
+		lim_log(pMac, LOGE,
 			FL("could not retrieve AssocFailureTimeout value"));
 
 	cfgValue = SYS_MS_TO_TICKS(cfgValue);
@@ -148,14 +148,14 @@ static bool lim_create_non_ap_timers(tpAniSirGlobal pMac)
 			    "ASSOC FAILURE TIMEOUT",
 			    lim_assoc_failure_timer_handler, LIM_ASSOC,
 			    cfgValue, 0, TX_NO_ACTIVATE) != TX_SUCCESS) {
-		lim_log(pMac, LOGP,
+		lim_log(pMac, LOGE,
 			FL("could not create Association failure timer"));
 		return false;
 	}
 
 	if (wlan_cfg_get_int(pMac, WNI_CFG_ADDTS_RSP_TIMEOUT, &cfgValue)
 			     != eSIR_SUCCESS)
-		lim_log(pMac, LOGP,
+		lim_log(pMac, LOGE,
 			FL("Fail to get WNI_CFG_ADDTS_RSP_TIMEOUT "));
 
 	cfgValue = SYS_MS_TO_TICKS(cfgValue);
@@ -166,14 +166,14 @@ static bool lim_create_non_ap_timers(tpAniSirGlobal pMac)
 			    lim_addts_response_timer_handler,
 			    SIR_LIM_ADDTS_RSP_TIMEOUT,
 			    cfgValue, 0, TX_NO_ACTIVATE) != TX_SUCCESS) {
-		lim_log(pMac, LOGP,
+		lim_log(pMac, LOGE,
 			FL("could not create Addts response timer"));
 		return false;
 	}
 
 	if (wlan_cfg_get_int(pMac, WNI_CFG_AUTHENTICATE_FAILURE_TIMEOUT,
 			     &cfgValue) != eSIR_SUCCESS)
-		lim_log(pMac, LOGP,
+		lim_log(pMac, LOGE,
 			FL("could not retrieve AuthFailureTimeout value"));
 
 	cfgValue = SYS_MS_TO_TICKS(cfgValue);
@@ -183,13 +183,13 @@ static bool lim_create_non_ap_timers(tpAniSirGlobal pMac)
 			    lim_timer_handler,
 			    SIR_LIM_AUTH_FAIL_TIMEOUT,
 			    cfgValue, 0, TX_NO_ACTIVATE) != TX_SUCCESS) {
-		lim_log(pMac, LOGP, FL("could not create Auth failure timer"));
+		lim_log(pMac, LOGE, FL("could not create Auth failure timer"));
 		return false;
 	}
 
 	if (wlan_cfg_get_int(pMac, WNI_CFG_PROBE_AFTER_HB_FAIL_TIMEOUT,
 			     &cfgValue) != eSIR_SUCCESS)
-		lim_log(pMac, LOGP,
+		lim_log(pMac, LOGE,
 			FL("could not retrieve PROBE_AFTER_HB_FAIL_TIMEOUT value"));
 
 	/* Change timer to reactivate it in future */
@@ -199,7 +199,7 @@ static bool lim_create_non_ap_timers(tpAniSirGlobal pMac)
 			    lim_timer_handler,
 			    SIR_LIM_PROBE_HB_FAILURE_TIMEOUT,
 			    cfgValue, 0, TX_NO_ACTIVATE) != TX_SUCCESS) {
-		lim_log(pMac, LOGP, FL("unable to create ProbeAfterHBTimer"));
+		lim_log(pMac, LOGE, FL("unable to create ProbeAfterHBTimer"));
 		return false;
 	}
 
@@ -231,7 +231,7 @@ uint32_t lim_create_timers(tpAniSirGlobal pMac)
 
 	if (wlan_cfg_get_int(pMac, WNI_CFG_ACTIVE_MINIMUM_CHANNEL_TIME,
 			     &cfgValue) != eSIR_SUCCESS) {
-		lim_log(pMac, LOGP,
+		lim_log(pMac, LOGE,
 			FL("could not retrieve MinChannelTimeout value"));
 	}
 	cfgValue = SYS_MS_TO_TICKS(cfgValue);
@@ -247,14 +247,14 @@ uint32_t lim_create_timers(tpAniSirGlobal pMac)
 			"Periodic Probe Request Timer", lim_timer_handler,
 			SIR_LIM_PERIODIC_PROBE_REQ_TIMEOUT, cfgValue1, 0,
 			TX_NO_ACTIVATE) != TX_SUCCESS)) {
-		lim_log(pMac, LOGP,
+		lim_log(pMac, LOGE,
 			FL("could not create periodic probe timer"));
 		goto err_timer;
 	}
 
 	if (wlan_cfg_get_int(pMac, WNI_CFG_ACTIVE_MAXIMUM_CHANNEL_TIME,
 			     &cfgValue) != eSIR_SUCCESS)
-		lim_log(pMac, LOGP,
+		lim_log(pMac, LOGE,
 			FL("could not retrieve MAXChannelTimeout value"));
 
 	cfgValue = SYS_MS_TO_TICKS(cfgValue);
@@ -268,7 +268,7 @@ uint32_t lim_create_timers(tpAniSirGlobal pMac)
 	/* Create all CNF_WAIT Timers upfront */
 	if (wlan_cfg_get_int(pMac, WNI_CFG_WT_CNF_TIMEOUT, &cfgValue)
 		!= eSIR_SUCCESS) {
-		lim_log(pMac, LOGP, FL("could not retrieve CNF timeout value"));
+		lim_log(pMac, LOGE, FL("could not retrieve CNF timeout value"));
 	}
 
 	cfgValue = SYS_MS_TO_TICKS(cfgValue);
@@ -279,7 +279,7 @@ uint32_t lim_create_timers(tpAniSirGlobal pMac)
 				    lim_cnf_wait_tmer_handler,
 				    (uint32_t) i, cfgValue,
 				    0, TX_NO_ACTIVATE) != TX_SUCCESS) {
-			lim_log(pMac, LOGP, FL("Cannot create CNF wait timer"));
+			lim_log(pMac, LOGE, FL("Cannot create CNF wait timer"));
 			goto err_timer;
 		}
 	}
@@ -287,13 +287,13 @@ uint32_t lim_create_timers(tpAniSirGlobal pMac)
 	/* Alloc and init table for the preAuth timer list */
 	if (wlan_cfg_get_int(pMac, WNI_CFG_MAX_NUM_PRE_AUTH,
 			     &cfgValue) != eSIR_SUCCESS)
-		lim_log(pMac, LOGP, FL("could not retrieve mac preauth value"));
+		lim_log(pMac, LOGE, FL("could not retrieve mac preauth value"));
 	pMac->lim.gLimPreAuthTimerTable.numEntry = cfgValue;
 	pMac->lim.gLimPreAuthTimerTable.pTable =
 		qdf_mem_malloc(cfgValue * sizeof(tLimPreAuthNode *));
 
 	if (pMac->lim.gLimPreAuthTimerTable.pTable == NULL) {
-		lim_log(pMac, LOGP, FL("AllocateMemory failed!"));
+		lim_log(pMac, LOGE, FL("AllocateMemory failed!"));
 		goto err_timer;
 	}
 
@@ -302,18 +302,18 @@ uint32_t lim_create_timers(tpAniSirGlobal pMac)
 					qdf_mem_malloc(sizeof(tLimPreAuthNode));
 		if (pMac->lim.gLimPreAuthTimerTable.pTable[i] == NULL) {
 			pMac->lim.gLimPreAuthTimerTable.numEntry = 0;
-			lim_log(pMac, LOGP, FL("AllocateMemory failed!"));
+			lim_log(pMac, LOGE, FL("AllocateMemory failed!"));
 			goto err_timer;
 		}
 	}
 
 	lim_init_pre_auth_timer_table(pMac, &pMac->lim.gLimPreAuthTimerTable);
-	PELOG1(lim_log(pMac, LOG1,
-		FL("alloc and init table for preAuth timers"));)
+	lim_log(pMac, LOGD,
+		FL("alloc and init table for preAuth timers"));
 
 	if (wlan_cfg_get_int(pMac, WNI_CFG_OLBC_DETECT_TIMEOUT,
 			     &cfgValue) != eSIR_SUCCESS)
-		lim_log(pMac, LOGP,
+		lim_log(pMac, LOGE,
 			FL("could not retrieve OLBD detect timeout value"));
 
 	cfgValue = SYS_MS_TO_TICKS(cfgValue);
@@ -322,7 +322,7 @@ uint32_t lim_create_timers(tpAniSirGlobal pMac)
 			    lim_update_olbc_cache_timer_handler,
 			    SIR_LIM_UPDATE_OLBC_CACHEL_TIMEOUT, cfgValue,
 			    cfgValue, TX_NO_ACTIVATE) != TX_SUCCESS) {
-		lim_log(pMac, LOGP, FL("Cannot create update OLBC cache tmr"));
+		lim_log(pMac, LOGE, FL("Cannot create update OLBC cache tmr"));
 		goto err_timer;
 	}
 	cfgValue = 1000;
@@ -331,7 +331,7 @@ uint32_t lim_create_timers(tpAniSirGlobal pMac)
 			    "FT PREAUTH RSP TIMEOUT",
 			    lim_timer_handler, SIR_LIM_REMAIN_CHN_TIMEOUT,
 			    cfgValue, 0, TX_NO_ACTIVATE) != TX_SUCCESS) {
-		lim_log(pMac, LOGP, FL("could not create Join failure timer"));
+		lim_log(pMac, LOGE, FL("could not create Join failure timer"));
 		goto err_timer;
 	}
 
@@ -341,7 +341,7 @@ uint32_t lim_create_timers(tpAniSirGlobal pMac)
 			    "DISASSOC ACK TIMEOUT",
 			    lim_timer_handler, SIR_LIM_DISASSOC_ACK_TIMEOUT,
 			    cfgValue, 0, TX_NO_ACTIVATE) != TX_SUCCESS) {
-		lim_log(pMac, LOGP, FL("could not DISASSOC ACK TIMEOUT timer"));
+		lim_log(pMac, LOGE, FL("could not DISASSOC ACK TIMEOUT timer"));
 		goto err_timer;
 	}
 
@@ -351,7 +351,7 @@ uint32_t lim_create_timers(tpAniSirGlobal pMac)
 			    "DISASSOC ACK TIMEOUT",
 			    lim_timer_handler, SIR_LIM_DEAUTH_ACK_TIMEOUT,
 			    cfgValue, 0, TX_NO_ACTIVATE) != TX_SUCCESS) {
-		lim_log(pMac, LOGP,
+		lim_log(pMac, LOGE,
 			FL("could not create DEAUTH ACK TIMEOUT timer"));
 		goto err_timer;
 	}
@@ -367,7 +367,7 @@ uint32_t lim_create_timers(tpAniSirGlobal pMac)
 		"Single Shot NOA Insert timeout", lim_timer_handler,
 		SIR_LIM_INSERT_SINGLESHOT_NOA_TIMEOUT, cfgValue, 0,
 		TX_NO_ACTIVATE) != TX_SUCCESS) {
-		lim_log(pMac, LOGP,
+		lim_log(pMac, LOGE,
 			FL("Can't create Single Shot NOA Insert Timeout tmr"));
 		goto err_timer;
 	}
@@ -656,7 +656,7 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId)
 		    != TX_SUCCESS) {
 			/* Could not deactivate AddtsRsp Timer */
 			/* Log error */
-			lim_log(pMac, LOGP,
+			lim_log(pMac, LOGE,
 				FL("Unable to deactivate AddtsRsp timer"));
 		}
 		break;
@@ -667,7 +667,7 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId)
 		    != TX_SUCCESS) {
 			/* Could not deactivate min channel timer. */
 			/* Log error */
-			lim_log(pMac, LOGP,
+			lim_log(pMac, LOGE,
 				FL("Unable to deactivate periodic timer"));
 		}
 
@@ -680,7 +680,7 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId)
 			    val, 0) != TX_SUCCESS) {
 				/* Could not change min channel timer. */
 				/* Log error */
-				lim_log(pMac, LOGP,
+				lim_log(pMac, LOGE,
 				FL("Unable to change periodic timer"));
 			}
 		} else
@@ -701,7 +701,7 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId)
 			 * Could not deactivate Join Failure
 			 * timer. Log error.
 			 */
-			lim_log(pMac, LOGP,
+			lim_log(pMac, LOGE,
 				FL("Unable to deactivate Join Failure timer"));
 		}
 
@@ -711,7 +711,7 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId)
 			 * Could not get JoinFailureTimeout value
 			 * from CFG. Log error.
 			 */
-			lim_log(pMac, LOGP,
+			lim_log(pMac, LOGE,
 				FL
 					("could not retrieve JoinFailureTimeout value"));
 		}
@@ -723,7 +723,7 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId)
 			 * Could not change Join Failure
 			 * timer. Log error.
 			 */
-			lim_log(pMac, LOGP,
+			lim_log(pMac, LOGE,
 				FL("Unable to change Join Failure timer"));
 		}
 
@@ -734,7 +734,7 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId)
 			    (&pMac->lim.limTimers.gLimPeriodicJoinProbeReqTimer)
 		    != TX_SUCCESS) {
 			/* Could not deactivate periodic join req Times. */
-			lim_log(pMac, LOGP,
+			lim_log(pMac, LOGE,
 				FL
 					("Unable to deactivate periodic join request timer"));
 		}
@@ -745,7 +745,7 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId)
 			    0) != TX_SUCCESS) {
 			/* Could not change periodic join req times. */
 			/* Log error */
-			lim_log(pMac, LOGP,
+			lim_log(pMac, LOGE,
 				FL
 					("Unable to change periodic join request timer"));
 		}
@@ -758,7 +758,7 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId)
 		    != TX_SUCCESS) {
 			/* Could not deactivate Auth failure timer. */
 			/* Log error */
-			lim_log(pMac, LOGP,
+			lim_log(pMac, LOGE,
 				FL("Unable to deactivate auth failure timer"));
 		}
 		/* Change timer to reactivate it in future */
@@ -768,7 +768,7 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId)
 			 * Could not get AuthFailureTimeout value
 			 * from CFG. Log error.
 			 */
-			lim_log(pMac, LOGP,
+			lim_log(pMac, LOGE,
 				FL
 					("could not retrieve AuthFailureTimeout value"));
 		}
@@ -778,7 +778,7 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId)
 				    val, 0) != TX_SUCCESS) {
 			/* Could not change Authentication failure timer. */
 			/* Log error */
-			lim_log(pMac, LOGP,
+			lim_log(pMac, LOGE,
 				FL("unable to change Auth failure timer"));
 		}
 
@@ -821,7 +821,7 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId)
 		    TX_SUCCESS) {
 			/* Could not deactivate Association failure timer. */
 			/* Log error */
-			lim_log(pMac, LOGP,
+			lim_log(pMac, LOGE,
 				FL
 					("unable to deactivate Association failure timer"));
 		}
@@ -832,7 +832,7 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId)
 			 * Could not get AssocFailureTimeout value
 			 * from CFG. Log error.
 			 */
-			lim_log(pMac, LOGP,
+			lim_log(pMac, LOGE,
 				FL
 					("could not retrieve AssocFailureTimeout value"));
 		}
@@ -842,7 +842,7 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId)
 				    val, 0) != TX_SUCCESS) {
 			/* Could not change Association failure timer. */
 			/* Log error */
-			lim_log(pMac, LOGP,
+			lim_log(pMac, LOGE,
 				FL("unable to change Assoc failure timer"));
 		}
 
@@ -854,7 +854,7 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId)
 		    TX_SUCCESS) {
 			/* Could not deactivate Heartbeat timer. */
 			/* Log error */
-			lim_log(pMac, LOGP,
+			lim_log(pMac, LOGE,
 				FL("unable to deactivate probeAfterHBTimer"));
 		} else {
 			lim_log(pMac, LOGD,
@@ -867,7 +867,7 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId)
 			 * Could not get PROBE_AFTER_HB_FAILURE
 			 * value from CFG. Log error.
 			 */
-			lim_log(pMac, LOGP,
+			lim_log(pMac, LOGE,
 				FL
 					("could not retrieve PROBE_AFTER_HB_FAIL_TIMEOUT value"));
 		}
@@ -878,7 +878,7 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId)
 				    val, 0) != TX_SUCCESS) {
 			/* Could not change HeartBeat timer. */
 			/* Log error */
-			lim_log(pMac, LOGP,
+			lim_log(pMac, LOGE,
 				FL("unable to change ProbeAfterHBTimer"));
 		} else {
 			lim_log(pMac, LOGD,
@@ -899,7 +899,7 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId)
 			** Could not deactivate Join Failure
 			** timer. Log error.
 			**/
-			lim_log(pMac, LOGP,
+			lim_log(pMac, LOGE,
 				FL("Unable to deactivate Remain on Chn timer"));
 			return;
 		}
@@ -912,7 +912,7 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId)
 			 * Could not change Join Failure
 			 * timer. Log error.
 			 */
-			lim_log(pMac, LOGP, FL("Unable to change timer"));
+			lim_log(pMac, LOGE, FL("Unable to change timer"));
 			return;
 		}
 		break;
@@ -925,7 +925,7 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId)
 			** Could not deactivate Active to passive channel timer.
 			** Log error.
 			**/
-			lim_log(pMac, LOGP, FL("Unable to Deactivate "
+			lim_log(pMac, LOGE, FL("Unable to Deactivate "
 					       "Active to passive channel timer"));
 			return;
 		}
@@ -938,7 +938,7 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId)
 			 * Could not change timer to check scan type for passive channel.
 			 * timer. Log error.
 			 */
-			lim_log(pMac, LOGP, FL("Unable to change timer"));
+			lim_log(pMac, LOGE, FL("Unable to change timer"));
 			return;
 		}
 		break;
@@ -950,7 +950,7 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId)
 			** Could not deactivate Join Failure
 			** timer. Log error.
 			**/
-			lim_log(pMac, LOGP,
+			lim_log(pMac, LOGE,
 				FL("Unable to deactivate Disassoc ack timer"));
 			return;
 		}
@@ -962,7 +962,7 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId)
 			 * Could not change Join Failure
 			 * timer. Log error.
 			 */
-			lim_log(pMac, LOGP, FL("Unable to change timer"));
+			lim_log(pMac, LOGE, FL("Unable to change timer"));
 			return;
 		}
 		break;
@@ -974,7 +974,7 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId)
 			** Could not deactivate Join Failure
 			** timer. Log error.
 			**/
-			lim_log(pMac, LOGP,
+			lim_log(pMac, LOGE,
 				FL("Unable to deactivate Deauth ack timer"));
 			return;
 		}
@@ -986,7 +986,7 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId)
 			 * Could not change Join Failure
 			 * timer. Log error.
 			 */
-			lim_log(pMac, LOGP, FL("Unable to change timer"));
+			lim_log(pMac, LOGE, FL("Unable to change timer"));
 			return;
 		}
 		break;
@@ -999,7 +999,7 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId)
 			** Could not deactivate SingleShot NOA Insert
 			** timer. Log error.
 			**/
-			lim_log(pMac, LOGP,
+			lim_log(pMac, LOGE,
 				FL
 					("Unable to deactivate SingleShot NOA Insert timer"));
 			return;
@@ -1013,7 +1013,7 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId)
 			 * Could not change Single Shot NOA Insert
 			 * timer. Log error.
 			 */
-			lim_log(pMac, LOGP, FL("Unable to change timer"));
+			lim_log(pMac, LOGE, FL("Unable to change timer"));
 			return;
 		}
 		break;
@@ -1058,7 +1058,7 @@ lim_deactivate_and_change_per_sta_id_timer(tpAniSirGlobal pMac, uint32_t timerId
 		if (tx_timer_deactivate
 			    (&pMac->lim.limTimers.gpLimCnfWaitTimer[staId])
 		    != TX_SUCCESS) {
-			lim_log(pMac, LOGP,
+			lim_log(pMac, LOGE,
 				FL("unable to deactivate CNF wait timer"));
 
 		}
@@ -1070,7 +1070,7 @@ lim_deactivate_and_change_per_sta_id_timer(tpAniSirGlobal pMac, uint32_t timerId
 			 * Could not get cnf timeout value
 			 * from CFG. Log error.
 			 */
-			lim_log(pMac, LOGP,
+			lim_log(pMac, LOGE,
 				FL("could not retrieve cnf timeout value"));
 		}
 		val = SYS_MS_TO_TICKS(val);
@@ -1080,7 +1080,7 @@ lim_deactivate_and_change_per_sta_id_timer(tpAniSirGlobal pMac, uint32_t timerId
 			    val) != TX_SUCCESS) {
 			/* Could not change cnf timer. */
 			/* Log error */
-			lim_log(pMac, LOGP,
+			lim_log(pMac, LOGE,
 				FL("unable to change cnf wait timer"));
 		}
 
@@ -1097,7 +1097,7 @@ lim_deactivate_and_change_per_sta_id_timer(tpAniSirGlobal pMac, uint32_t timerId
 							 staId);
 
 		if (pAuthNode == NULL) {
-			lim_log(pMac, LOGP,
+			lim_log(pMac, LOGE,
 				FL("Invalid Pre Auth Index passed :%d"),
 				staId);
 			break;
@@ -1107,7 +1107,7 @@ lim_deactivate_and_change_per_sta_id_timer(tpAniSirGlobal pMac, uint32_t timerId
 		    TX_SUCCESS) {
 			/* Could not deactivate auth response timer. */
 			/* Log error */
-			lim_log(pMac, LOGP,
+			lim_log(pMac, LOGE,
 				FL
 					("unable to deactivate auth response timer"));
 		}
@@ -1120,7 +1120,7 @@ lim_deactivate_and_change_per_sta_id_timer(tpAniSirGlobal pMac, uint32_t timerId
 			 * Could not get auth rsp timeout value
 			 * from CFG. Log error.
 			 */
-			lim_log(pMac, LOGP,
+			lim_log(pMac, LOGE,
 				FL
 					("could not retrieve auth response timeout value"));
 		}
@@ -1131,7 +1131,7 @@ lim_deactivate_and_change_per_sta_id_timer(tpAniSirGlobal pMac, uint32_t timerId
 		    TX_SUCCESS) {
 			/* Could not change auth rsp timer. */
 			/* Log error */
-			lim_log(pMac, LOGP,
+			lim_log(pMac, LOGE,
 				FL("unable to change auth rsp timer"));
 		}
 	}
@@ -1171,7 +1171,7 @@ void lim_activate_cnf_timer(tpAniSirGlobal pMac, uint16_t staId,
 		psessionEntry->peSessionId;
 	if (tx_timer_activate(&pMac->lim.limTimers.gpLimCnfWaitTimer[staId])
 	    != TX_SUCCESS) {
-		lim_log(pMac, LOGP, FL("could not activate cnf wait timer"));
+		lim_log(pMac, LOGE, FL("could not activate cnf wait timer"));
 	}
 }
 
@@ -1200,7 +1200,7 @@ void lim_activate_auth_rsp_timer(tpAniSirGlobal pMac, tLimPreAuthNode *pAuthNode
 	if (tx_timer_activate(&pAuthNode->timer) != TX_SUCCESS) {
 		/* / Could not activate auth rsp timer. */
 		/* Log error */
-		lim_log(pMac, LOGP, FL("could not activate auth rsp timer"));
+		lim_log(pMac, LOGE, FL("could not activate auth rsp timer"));
 	}
 }
 
@@ -1244,9 +1244,8 @@ void lim_channel_switch_timer_handler(void *pMacGlobal, uint32_t param)
 	tSirMsgQ msg;
 	tpAniSirGlobal pMac = (tpAniSirGlobal) pMacGlobal;
 
-	PELOG1(lim_log(pMac, LOG1,
-		       FL("ChannelSwitch Timer expired.  Posting msg to LIM "));
-	       )
+	lim_log(pMac, LOGD,
+		FL("ChannelSwitch Timer expired.  Posting msg to LIM "));
 
 	msg.type = SIR_LIM_CHANNEL_SWITCH_TIMEOUT;
 	msg.bodyval = (uint32_t) param;
@@ -1264,7 +1263,7 @@ void lim_quiet_timer_handler(void *pMacGlobal, uint32_t param)
 	msg.bodyval = (uint32_t) param;
 	msg.bodyptr = NULL;
 
-	PELOG1(lim_log(pMac, LOG1, FL("Post SIR_LIM_QUIET_TIMEOUT msg. "));)
+	lim_log(pMac, LOGD, FL("Post SIR_LIM_QUIET_TIMEOUT msg. "));
 	lim_post_msg_api(pMac, &msg);
 }
 
@@ -1276,7 +1275,7 @@ void lim_quiet_bss_timer_handler(void *pMacGlobal, uint32_t param)
 	msg.type = SIR_LIM_QUIET_BSS_TIMEOUT;
 	msg.bodyval = (uint32_t) param;
 	msg.bodyptr = NULL;
-	PELOG1(lim_log(pMac, LOG1, FL("Post SIR_LIM_QUIET_BSS_TIMEOUT msg. "));)
+	lim_log(pMac, LOGD, FL("Post SIR_LIM_QUIET_BSS_TIMEOUT msg. "));
 	lim_post_msg_api(pMac, &msg);
 }