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

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

Change-Id: If52ade6e8b228edc29b64ad32c2659655f8073c3
CRs-Fixed: 1093093

1 files changed, 31 insertions, 47 deletions

diff --git a/core/mac/src/pe/lim/lim_ft.c b/core/mac/src/pe/lim/lim_ft.c
index 4147b15b8739..527c96d58370 100644
--- a/core/mac/src/pe/lim/lim_ft.c
+++ b/core/mac/src/pe/lim/lim_ft.c
@@ -80,18 +80,18 @@ void lim_ft_cleanup_all_ft_sessions(tpAniSirGlobal pMac)
 void lim_ft_cleanup(tpAniSirGlobal pMac, tpPESession psessionEntry)
 {
 	if (NULL == psessionEntry) {
-		lim_log(pMac, LOGE, FL("psessionEntry is NULL"));
+		pe_err("psessionEntry is NULL");
 		return;
 	}
 
 	/* Nothing to be done if the session is not in STA mode */
 	if (!LIM_IS_STA_ROLE(psessionEntry)) {
-		lim_log(pMac, LOGE, FL("psessionEntry is not in STA mode"));
+		pe_err("psessionEntry is not in STA mode");
 		return;
 	}
 
 	if (NULL != psessionEntry->ftPEContext.pFTPreAuthReq) {
-		lim_log(pMac, LOGD, FL("Freeing pFTPreAuthReq= %p"),
+		pe_debug("Freeing pFTPreAuthReq: %p",
 			       psessionEntry->ftPEContext.pFTPreAuthReq);
 		if (NULL !=
 		    psessionEntry->ftPEContext.pFTPreAuthReq->
@@ -138,22 +138,20 @@ void lim_ft_prepare_add_bss_req(tpAniSirGlobal pMac,
 
 	/* Nothing to be done if the session is not in STA mode */
 	if (!LIM_IS_STA_ROLE(pftSessionEntry)) {
-		lim_log(pMac, LOGE, FL("psessionEntry is not in STA mode"));
+		pe_err("psessionEntry is not in STA mode");
 		return;
 	}
 
 	pBeaconStruct = qdf_mem_malloc(sizeof(tSchBeaconStruct));
 	if (NULL == pBeaconStruct) {
-		lim_log(pMac, LOGE,
-			FL("Unable to allocate memory for creating ADD_BSS"));
+		pe_err("Unable to allocate memory for creating ADD_BSS");
 		return;
 	}
 	/* Package SIR_HAL_ADD_BSS_REQ message parameters */
 	pAddBssParams = qdf_mem_malloc(sizeof(tAddBssParams));
 	if (NULL == pAddBssParams) {
 		qdf_mem_free(pBeaconStruct);
-		lim_log(pMac, LOGE,
-			FL("Unable to allocate memory for creating ADD_BSS"));
+		pe_err("Unable to allocate memory for creating ADD_BSS");
 		return;
 	}
 
@@ -322,7 +320,7 @@ void lim_ft_prepare_add_bss_req(tpAniSirGlobal pMac,
 		pAddBssParams->vhtCapable = 0;
 	}
 
-	lim_log(pMac, LOGD, FL("SIR_HAL_ADD_BSS_REQ with channel = %d..."),
+	pe_debug("SIR_HAL_ADD_BSS_REQ with channel: %d",
 		pAddBssParams->currentOperChannel);
 
 	/* Populate the STA-related parameters here */
@@ -467,7 +465,7 @@ void lim_ft_prepare_add_bss_req(tpAniSirGlobal pMac,
 
 	pftSessionEntry->ftPEContext.pAddBssReq = pAddBssParams;
 
-	lim_log(pMac, LOGD, FL("Saving SIR_HAL_ADD_BSS_REQ for pre-auth ap."));
+	pe_debug("Saving SIR_HAL_ADD_BSS_REQ for pre-auth ap");
 
 	qdf_mem_free(pBeaconStruct);
 	return;
@@ -494,8 +492,7 @@ void lim_fill_ft_session(tpAniSirGlobal pMac,
 
 	pBeaconStruct = qdf_mem_malloc(sizeof(tSchBeaconStruct));
 	if (NULL == pBeaconStruct) {
-		lim_log(pMac, LOGE,
-			FL("No memory for creating lim_fill_ft_session"));
+		pe_err("No memory for creating lim_fill_ft_session");
 		return;
 	}
 
@@ -532,7 +529,7 @@ void lim_fill_ft_session(tpAniSirGlobal pMac,
 		     pftSessionEntry->ssId.length);
 
 	wlan_cfg_get_int(pMac, WNI_CFG_DOT11_MODE, &selfDot11Mode);
-	lim_log(pMac, LOGD, FL("selfDot11Mode %d"), selfDot11Mode);
+	pe_debug("selfDot11Mode: %d", selfDot11Mode);
 	pftSessionEntry->dot11mode = selfDot11Mode;
 	pftSessionEntry->vhtCapability =
 		(IS_DOT11_MODE_VHT(pftSessionEntry->dot11mode)
@@ -586,7 +583,7 @@ void lim_fill_ft_session(tpAniSirGlobal pMac,
 				pftSessionEntry->ch_center_freq_seg0 =
 					pbssDescription->channelId - 2;
 			else
-				lim_log(pMac, LOGE, FL("Invalid sec ch offset"));
+				pe_warn("Invalid sec ch offset");
 		}
 	} else {
 		pftSessionEntry->ch_width = CH_WIDTH_20MHZ;
@@ -613,7 +610,7 @@ void lim_fill_ft_session(tpAniSirGlobal pMac,
 		pftSessionEntry->limSystemRole = eLIM_STA_ROLE;
 	} else {
 		/* Throw an error & return & make sure to delete the session */
-		lim_log(pMac, LOGE, FL("Invalid bss type"));
+		pe_warn("Invalid bss type");
 	}
 
 	pftSessionEntry->limCurrentBssCaps = pbssDescription->capabilityInfo;
@@ -658,8 +655,7 @@ void lim_fill_ft_session(tpAniSirGlobal pMac,
 	pftSessionEntry->maxTxPower = QDF_MIN(regMax, (localPowerConstraint));
 #endif
 
-	lim_log(pMac, LOGD,
-		FL("Reg max=%d, local pwr=%d, ini tx pwr=%d, max tx pwr = %d"),
+	pe_debug("Reg max: %d local pwr: %d, ini tx pwr: %d max tx pwr: %d",
 		regMax, localPowerConstraint,
 		pMac->roam.configParam.nTxPowerCap,
 		pftSessionEntry->maxTxPower);
@@ -689,13 +685,11 @@ void lim_fill_ft_session(tpAniSirGlobal pMac,
 	 * self and peer rates
 	 */
 	pftSessionEntry->supported_nss_1x1 = true;
-	lim_log(pMac, LOGD,
-		FL("FT enable smps: %d mode: %d supported nss 1x1: %d"),
+	pe_debug("FT enable smps: %d mode: %d supported nss 1x1: %d",
 		pftSessionEntry->enableHtSmps,
 		pftSessionEntry->htSmpsvalue,
 		pftSessionEntry->supported_nss_1x1);
 
-
 	qdf_mem_free(pBeaconStruct);
 }
 #endif
@@ -723,8 +717,7 @@ bool lim_process_ft_update_key(tpAniSirGlobal pMac, uint32_t *pMsgBuf)
 	psessionEntry = pe_find_session_by_bssid(pMac, pKeyInfo->bssid.bytes,
 						 &sessionId);
 	if (NULL == psessionEntry) {
-		lim_log(pMac, LOGE,
-			"%s: Unable to find session for the following bssid",
+		pe_err("%s: Unable to find session for the following bssid",
 			       __func__);
 		lim_print_mac_addr(pMac, pKeyInfo->bssid.bytes, LOGE);
 		return false;
@@ -732,7 +725,7 @@ bool lim_process_ft_update_key(tpAniSirGlobal pMac, uint32_t *pMsgBuf)
 
 	/* Nothing to be done if the session is not in STA mode */
 	if (!LIM_IS_STA_ROLE(psessionEntry)) {
-		lim_log(pMac, LOGE, FL("psessionEntry is not in STA mode"));
+		pe_err("psessionEntry is not in STA mode");
 		return false;
 	}
 
@@ -756,10 +749,8 @@ bool lim_process_ft_update_key(tpAniSirGlobal pMac, uint32_t *pMsgBuf)
 		psessionEntry->ftPEContext.PreAuthKeyInfo.
 		extSetStaKeyParamValid = true;
 
-		lim_log(pMac, LOGE, FL("pAddBssReq is NULL"));
-
 		if (psessionEntry->ftPEContext.pAddStaReq == NULL) {
-			lim_log(pMac, LOGE, FL("pAddStaReq is NULL"));
+			pe_err("pAddStaReq is NULL");
 			lim_send_set_sta_key_req(pMac, pMlmSetKeysReq, 0, 0,
 						 psessionEntry, false);
 			psessionEntry->ftPEContext.PreAuthKeyInfo.
@@ -777,19 +768,17 @@ bool lim_process_ft_update_key(tpAniSirGlobal pMac, uint32_t *pMsgBuf)
 			     sizeof(tSirKeys));
 		if (eSIR_SUCCESS !=
 		    wlan_cfg_get_int(pMac, WNI_CFG_SINGLE_TID_RC, &val)) {
-			lim_log(pMac, LOGE,
-				FL("Unable to read WNI_CFG_SINGLE_TID_RC"));
+			pe_warn("Unable to read WNI_CFG_SINGLE_TID_RC");
 		}
 
 		pAddBssParams->extSetStaKeyParam.singleTidRc = val;
-		lim_log(pMac, LOGD, FL("Key valid %d keyLength %d"),
+		pe_debug("Key valid: %d keyLength: %d",
 			pAddBssParams->extSetStaKeyParamValid,
 			pAddBssParams->extSetStaKeyParam.key[0].keyLength);
 
 		pAddBssParams->extSetStaKeyParam.staIdx = 0;
 
-		lim_log(pMac, LOGD,
-			FL("BSSID = " MAC_ADDRESS_STR),
+		pe_debug("BSSID: " MAC_ADDRESS_STR,
 			       MAC_ADDR_ARRAY(pKeyInfo->bssid.bytes));
 
 		qdf_copy_macaddr(&pAddBssParams->extSetStaKeyParam.peer_macaddr,
@@ -811,8 +800,7 @@ lim_ft_send_aggr_qos_rsp(tpAniSirGlobal pMac, uint8_t rspReqd,
 	}
 	rsp = qdf_mem_malloc(sizeof(tSirAggrQosRsp));
 	if (NULL == rsp) {
-		lim_log(pMac, LOGE,
-			FL("AllocateMemory failed for tSirAggrQosRsp"));
+		pe_err("AllocateMemory failed for tSirAggrQosRsp");
 		return;
 	}
 	rsp->messageType = eWNI_SME_FT_AGGR_QOS_RSP;
@@ -839,25 +827,24 @@ void lim_process_ft_aggr_qo_s_rsp(tpAniSirGlobal pMac, tpSirMsgQ limMsg)
 	uint8_t rspReqd = 1;
 	tpPESession psessionEntry = NULL;
 	int i = 0;
-	lim_log(pMac, LOGD, FL(" Received AGGR_QOS_RSP from HAL"));
+	pe_debug(" Received AGGR_QOS_RSP from HAL");
 	SET_LIM_PROCESS_DEFD_MESGS(pMac, true);
 	pAggrQosRspMsg = (tpAggrAddTsParams) (limMsg->bodyptr);
 	if (NULL == pAggrQosRspMsg) {
-		lim_log(pMac, LOGE, FL("NULL pAggrQosRspMsg"));
+		pe_err("NULL pAggrQosRspMsg");
 		return;
 	}
 	psessionEntry =
 		pe_find_session_by_session_id(pMac, pAggrQosRspMsg->sessionId);
 	if (NULL == psessionEntry) {
-		lim_log(pMac, LOGE,
-			FL("Cant find session entry for %s"), __func__);
+		pe_err("Cant find session entry for %s", __func__);
 		if (pAggrQosRspMsg != NULL) {
 			qdf_mem_free(pAggrQosRspMsg);
 		}
 		return;
 	}
 	if (!LIM_IS_STA_ROLE(psessionEntry)) {
-		lim_log(pMac, LOGE, FL("psessionEntry is not in STA mode"));
+		pe_err("psessionEntry is not in STA mode");
 		return;
 	}
 	for (i = 0; i < HAL_QOS_NUM_AC_MAX; i++) {
@@ -907,7 +894,7 @@ tSirRetStatus lim_process_ft_aggr_qos_req(tpAniSirGlobal pMac, uint32_t *pMsgBuf
 
 	pAggrAddTsParam = qdf_mem_malloc(sizeof(tAggrAddTsParams));
 	if (NULL == pAggrAddTsParam) {
-		lim_log(pMac, LOGE, FL("AllocateMemory() failed"));
+		pe_err("AllocateMemory() failed");
 		return eSIR_MEM_ALLOC_FAILED;
 	}
 
@@ -915,8 +902,7 @@ tSirRetStatus lim_process_ft_aggr_qos_req(tpAniSirGlobal pMac, uint32_t *pMsgBuf
 						 &sessionId);
 
 	if (psessionEntry == NULL) {
-		lim_log(pMac, LOGE,
-			FL("psession Entry Null for sessionId = %d"),
+		pe_err("psession Entry Null for sessionId: %d",
 			       aggrQosReq->sessionId);
 		qdf_mem_free(pAggrAddTsParam);
 		return eSIR_FAILURE;
@@ -924,7 +910,7 @@ tSirRetStatus lim_process_ft_aggr_qos_req(tpAniSirGlobal pMac, uint32_t *pMsgBuf
 
 	/* Nothing to be done if the session is not in STA mode */
 	if (!LIM_IS_STA_ROLE(psessionEntry)) {
-		lim_log(pMac, LOGE, FL("psessionEntry is not in STA mode"));
+		pe_err("psessionEntry is not in STA mode");
 		qdf_mem_free(pAggrAddTsParam);
 		return eSIR_FAILURE;
 	}
@@ -932,8 +918,7 @@ tSirRetStatus lim_process_ft_aggr_qos_req(tpAniSirGlobal pMac, uint32_t *pMsgBuf
 	pSta = dph_lookup_hash_entry(pMac, aggrQosReq->bssid.bytes, &aid,
 				     &psessionEntry->dph.dphHashTable);
 	if (pSta == NULL) {
-		lim_log(pMac, LOGE,
-			FL("Station context not found - ignoring AddTsRsp"));
+		pe_err("Station context not found - ignoring AddTsRsp");
 		qdf_mem_free(pAggrAddTsParam);
 		return eSIR_FAILURE;
 	}
@@ -1011,8 +996,7 @@ tSirRetStatus lim_process_ft_aggr_qos_req(tpAniSirGlobal pMac, uint32_t *pMsgBuf
 			if (eSIR_SUCCESS !=
 			    lim_tspec_add(pMac, pSta->staAddr, pSta->assocId,
 					  pTspec, 0, &tspecInfo)) {
-				lim_log(pMac, LOGE,
-					FL("Adding entry in lim Tspec Table failed "));
+				pe_err("Adding entry in lim Tspec Table failed");
 				pMac->lim.gLimAddtsSent = false;
 				qdf_mem_free(pAggrAddTsParam);
 				return eSIR_FAILURE;
@@ -1040,7 +1024,7 @@ tSirRetStatus lim_process_ft_aggr_qos_req(tpAniSirGlobal pMac, uint32_t *pMsgBuf
 	MTRACE(mac_trace_msg_tx(pMac, psessionEntry->peSessionId, msg.type));
 
 	if (eSIR_SUCCESS != wma_post_ctrl_msg(pMac, &msg)) {
-			lim_log(pMac, LOGW, FL("wma_post_ctrl_msg() failed"));
+			pe_warn("wma_post_ctrl_msg() failed");
 			SET_LIM_PROCESS_DEFD_MESGS(pMac, true);
 			qdf_mem_free(pAggrAddTsParam);
 			return eSIR_FAILURE;