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

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

Change-Id: I61c23148b78a2a6386d373f6a5e21cf59c942577
CRs-Fixed: 1093093

core/mac/src/pe/lim/lim_sme_req_utils.c

@@ -73,12 +73,11 @@ lim_is_rsn_ie_valid_in_sme_req_message(tpAniSirGlobal mac_ctx, tpSirRSNie rsn_ie
 
 	if (wlan_cfg_get_int(mac_ctx, WNI_CFG_PRIVACY_ENABLED,
 			     &privacy) != eSIR_SUCCESS)
-		lim_log(mac_ctx, LOGP, FL("Unable to retrieve POI from CFG"));
+		pe_warn("Unable to retrieve POI from CFG");
 
 	if (wlan_cfg_get_int(mac_ctx, WNI_CFG_RSN_ENABLED, &val)
 		!= eSIR_SUCCESS)
-		lim_log(mac_ctx, LOGW,
-			FL("Unable to retrieve RSN_ENABLED from CFG"));
+		pe_warn("Unable to retrieve RSN_ENABLED from CFG");
 
 	if (rsn_ie->length && (!privacy || !val)) {
 		/* Privacy & RSN not enabled in CFG.
@@ -86,8 +85,7 @@ lim_is_rsn_ie_valid_in_sme_req_message(tpAniSirGlobal mac_ctx, tpSirRSNie rsn_ie
 		 * allow BSS creation/join with no Privacy capability
 		 * yet advertising WPA IE
 		 */
-		lim_log(mac_ctx, LOGD,
-			FL("RSN ie len %d PRIVACY %d RSN %d"),
+		pe_debug("RSN ie len: %d PRIVACY: %d RSN: %d",
 			       rsn_ie->length, privacy, val);
 	}
 
@@ -99,7 +97,7 @@ lim_is_rsn_ie_valid_in_sme_req_message(tpAniSirGlobal mac_ctx, tpSirRSNie rsn_ie
 	    && (rsn_ie->rsnIEdata[0] != DOT11F_EID_WAPI)
 #endif
 	    && (rsn_ie->rsnIEdata[0] != DOT11F_EID_WPA)) {
-		lim_log(mac_ctx, LOGE, FL("RSN/WPA/WAPI EID %d not [%d || %d]"),
+		pe_err("RSN/WPA/WAPI EID: %d not [%d || %d]",
 			rsn_ie->rsnIEdata[0], DOT11F_EID_RSN,
 			DOT11F_EID_WPA);
 		return false;
@@ -115,8 +113,7 @@ lim_is_rsn_ie_valid_in_sme_req_message(tpAniSirGlobal mac_ctx, tpSirRSNie rsn_ie
 			    DOT11F_IE_RSN_MAX_LEN)
 			    || (rsn_ie->rsnIEdata[start + 1] <
 				DOT11F_IE_RSN_MIN_LEN)) {
-				lim_log(mac_ctx, LOGE,
-					FL("RSN IE len %d not [%d,%d]"),
+				pe_err("RSN IE len: %d not [%d,%d]",
 					rsn_ie->rsnIEdata[start + 1],
 					DOT11F_IE_RSN_MIN_LEN,
 					DOT11F_IE_RSN_MAX_LEN);
@@ -137,8 +134,7 @@ lim_is_rsn_ie_valid_in_sme_req_message(tpAniSirGlobal mac_ctx, tpSirRSNie rsn_ie
 			    || (rsn_ie->rsnIEdata[start + 1] >
 				DOT11F_IE_WPA_MAX_LEN)
 			    || (SIR_MAC_WPA_OUI != val)) {
-				lim_log(mac_ctx, LOGE,
-					FL("WPA IE len %d not [%d,%d] OR data 0x%x not 0x%x"),
+				pe_err("WPA IE len: %d not [%d,%d] OR data 0x%x not 0x%x",
 					rsn_ie->rsnIEdata[start + 1],
 					DOT11F_IE_WPA_MIN_LEN,
 					DOT11F_IE_WPA_MAX_LEN,
@@ -152,8 +148,7 @@ lim_is_rsn_ie_valid_in_sme_req_message(tpAniSirGlobal mac_ctx, tpSirRSNie rsn_ie
 			    DOT11F_IE_WAPI_MAX_LEN)
 			    || (rsn_ie->rsnIEdata[start + 1] <
 				DOT11F_IE_WAPI_MIN_LEN)) {
-				lim_log(mac_ctx, LOGE,
-					FL("WAPI IE len %d not [%d,%d]"),
+				pe_err("WAPI IE len: %d not [%d,%d]",
 					rsn_ie->rsnIEdata[start + 1],
 					DOT11F_IE_WAPI_MIN_LEN,
 					DOT11F_IE_WAPI_MAX_LEN);
@@ -206,9 +201,7 @@ lim_is_addie_valid_in_sme_req_message(tpAniSirGlobal pMac, tpSirAddie pAddie)
 		elem_len = ptr[1];
 		left -= 2;
 		if (elem_len > left) {
-			lim_log(pMac, LOGE,
-				FL
-					("****Invalid Add IEs eid = %d elem_len=%d left=%d*****"),
+			pe_err("Invalid Add IEs eid: %d elem_len: %d left: %d",
 				elem_id, elem_len, left);
 			return false;
 		}
@@ -244,12 +237,11 @@ lim_set_rs_nie_wp_aiefrom_sme_start_bss_req_message(tpAniSirGlobal mac_ctx,
 
 	if (wlan_cfg_get_int(mac_ctx, WNI_CFG_PRIVACY_ENABLED,
 			     &privacy) != eSIR_SUCCESS)
-		lim_log(mac_ctx, LOGW, FL("Unable to retrieve POI from CFG"));
+		pe_warn("Unable to retrieve POI from CFG");
 
 	if (wlan_cfg_get_int(mac_ctx, WNI_CFG_RSN_ENABLED,
 			     &val) != eSIR_SUCCESS)
-		lim_log(mac_ctx, LOGW,
-			FL("Unable to retrieve RSN_ENABLED from CFG"));
+		pe_warn("Unable to retrieve RSN_ENABLED from CFG");
 
 	if (rsn_ie->length && (!privacy || !val)) {
 		/*
@@ -258,8 +250,7 @@ lim_set_rs_nie_wp_aiefrom_sme_start_bss_req_message(tpAniSirGlobal mac_ctx,
 		 * allow BSS creation/join with no Privacy capability
 		 * yet advertising WPA IE
 		 */
-		lim_log(mac_ctx, LOGD,
-			FL("RSN ie len %d but PRIVACY %d RSN %d"),
+		pe_debug("RSN ie len: %d but PRIVACY: %d RSN: %d",
 			rsn_ie->length, privacy, val);
 	}
 
@@ -268,7 +259,7 @@ lim_set_rs_nie_wp_aiefrom_sme_start_bss_req_message(tpAniSirGlobal mac_ctx,
 
 	if ((rsn_ie->rsnIEdata[0] != SIR_MAC_RSN_EID) &&
 	    (rsn_ie->rsnIEdata[0] != SIR_MAC_WPA_EID)) {
-		lim_log(mac_ctx, LOGE, FL("RSN/WPA EID %d not [%d || %d]"),
+		pe_err("RSN/WPA EID: %d not [%d || %d]",
 			rsn_ie->rsnIEdata[0], SIR_MAC_RSN_EID,
 			SIR_MAC_WPA_EID);
 		return false;
@@ -276,7 +267,7 @@ lim_set_rs_nie_wp_aiefrom_sme_start_bss_req_message(tpAniSirGlobal mac_ctx,
 	/* Check validity of RSN IE */
 	if ((rsn_ie->rsnIEdata[0] == SIR_MAC_RSN_EID) &&
 	    (rsn_ie->rsnIEdata[1] < SIR_MAC_RSN_IE_MIN_LENGTH)) {
-		lim_log(mac_ctx, LOGE, FL("RSN IE len %d not [%d,%d]"),
+		pe_err("RSN IE len: %d not [%d,%d]",
 			rsn_ie->rsnIEdata[1], SIR_MAC_RSN_IE_MIN_LENGTH,
 			SIR_MAC_RSN_IE_MAX_LENGTH);
 		return false;
@@ -284,23 +275,21 @@ lim_set_rs_nie_wp_aiefrom_sme_start_bss_req_message(tpAniSirGlobal mac_ctx,
 
 	if (rsn_ie->length > rsn_ie->rsnIEdata[1] + 2) {
 		if (rsn_ie->rsnIEdata[0] != SIR_MAC_RSN_EID) {
-			lim_log(mac_ctx, LOGE,
-				FL("First byte[%d] in rsnIEdata isn't RSN_EID"),
+			pe_err("First byte: %d in rsnIEdata isn't RSN_EID",
 				rsn_ie->rsnIEdata[1]);
 			return false;
 		}
-		lim_log(mac_ctx, LOGD,
-			FL("WPA IE is present along with WPA2 IE"));
+		pe_debug("WPA IE is present along with WPA2 IE");
 		wpa_idx = 2 + rsn_ie->rsnIEdata[1];
 	} else if ((rsn_ie->length == rsn_ie->rsnIEdata[1] + 2) &&
 		   (rsn_ie->rsnIEdata[0] == SIR_MAC_RSN_EID)) {
-		lim_log(mac_ctx, LOGD, FL("Only RSN IE is present"));
+		pe_debug("Only RSN IE is present");
 		dot11f_unpack_ie_rsn(mac_ctx, &rsn_ie->rsnIEdata[2],
 				     (uint8_t) rsn_ie->length,
 				     &session->gStartBssRSNIe, false);
 	} else if ((rsn_ie->length == rsn_ie->rsnIEdata[1] + 2)
 		   && (rsn_ie->rsnIEdata[0] == SIR_MAC_WPA_EID)) {
-		lim_log(mac_ctx, LOGD, FL("Only WPA IE is present"));
+		pe_debug("Only WPA IE is present");
 		dot11f_unpack_ie_wpa(mac_ctx, &rsn_ie->rsnIEdata[6],
 				     (uint8_t) rsn_ie->length - 4,
 				     &session->gStartBssWPAIe, false);
@@ -313,8 +302,7 @@ lim_set_rs_nie_wp_aiefrom_sme_start_bss_req_message(tpAniSirGlobal mac_ctx,
 	if ((rsn_ie->rsnIEdata[wpa_idx] == SIR_MAC_WPA_EID)
 	    && ((rsn_ie->rsnIEdata[wpa_idx + 1] < SIR_MAC_WPA_IE_MIN_LENGTH)
 	     || (SIR_MAC_WPA_OUI != val))) {
-		lim_log(mac_ctx, LOGE,
-			FL("WPA IE len %d not [%d,%d] OR data 0x%x not 0x%x"),
+		pe_err("WPA IE len: %d not [%d,%d] OR data 0x%x not 0x%x",
 			rsn_ie->rsnIEdata[1],
 			SIR_MAC_RSN_IE_MIN_LENGTH,
 			SIR_MAC_RSN_IE_MAX_LENGTH, val,
@@ -386,8 +374,7 @@ lim_is_sme_start_bss_req_valid(tpAniSirGlobal mac_ctx,
 	uint8_t i = 0;
 	tSirMacRateSet *opr_rates = &start_bss_req->operationalRateSet;
 
-	lim_log(mac_ctx, LOGD,
-	       FL("Parsed START_BSS_REQ fields are bssType=%s (%d), channelId=%d, SSID len=%d, rsnIE len=%d, nwType=%d, rateset len=%d"),
+	pe_debug("Parsed START_BSS_REQ fields are bssType: %s (%d) channelId: %d SSID len: %d rsnIE len: %d nwType: %d rateset len: %d",
 	       lim_bss_type_to_string(start_bss_req->bssType),
 	       start_bss_req->bssType, start_bss_req->channelId,
 	       start_bss_req->ssId.length, start_bss_req->rsnIE.length,
@@ -399,8 +386,7 @@ lim_is_sme_start_bss_req_valid(tpAniSirGlobal mac_ctx,
 		 * Should not have received start BSS req with bssType
 		 * Infrastructure on STA.
 		 */
-		lim_log(mac_ctx, LOGE,
-			FL("Invalid bssType %d in eWNI_SME_START_BSS_REQ"),
+		pe_warn("Invalid bssType: %d in eWNI_SME_START_BSS_REQ",
 			start_bss_req->bssType);
 		return false;
 		break;
@@ -415,8 +401,7 @@ lim_is_sme_start_bss_req_valid(tpAniSirGlobal mac_ctx,
 		 * Should not have received start BSS req with bssType
 		 * other than Infrastructure/IBSS.
 		 */
-		lim_log(mac_ctx, LOGW,
-			FL("Invalid bssType %d in eWNI_SME_START_BSS_REQ"),
+		pe_warn("Invalid bssType: %d in eWNI_SME_START_BSS_REQ",
 			start_bss_req->bssType);
 		return false;
 	}
@@ -424,8 +409,7 @@ lim_is_sme_start_bss_req_valid(tpAniSirGlobal mac_ctx,
 	if (start_bss_req->bssType == eSIR_IBSS_MODE
 	    && (!start_bss_req->ssId.length
 		|| start_bss_req->ssId.length > SIR_MAC_MAX_SSID_LENGTH)) {
-		lim_log(mac_ctx, LOGW,
-			FL("Invalid SSID length in eWNI_SME_START_BSS_REQ"));
+		pe_warn("Invalid SSID length in eWNI_SME_START_BSS_REQ");
 		return false;
 	}
 
@@ -443,8 +427,7 @@ lim_is_sme_start_bss_req_valid(tpAniSirGlobal mac_ctx,
 			if (sirIsArate(opr_rates->rate[i] & 0x7F))
 				continue;
 
-			lim_log(mac_ctx, LOGW,
-				FL("Invalid operational 11A rates"));
+			pe_warn("Invalid operational 11A rates");
 			QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE,
 					   QDF_TRACE_LEVEL_WARN,
 					   opr_rates->rate,
@@ -459,8 +442,7 @@ lim_is_sme_start_bss_req_valid(tpAniSirGlobal mac_ctx,
 			if (sirIsGrate(opr_rates->rate[i] & 0x7F))
 				continue;
 
-			lim_log(mac_ctx, LOGW,
-				FL("Invalid operational 11G rates"));
+			pe_warn("Invalid operational 11G rates");
 			QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE,
 					   QDF_TRACE_LEVEL_WARN,
 					   opr_rates->rate,
@@ -474,8 +456,7 @@ lim_is_sme_start_bss_req_valid(tpAniSirGlobal mac_ctx,
 		if (sirIsBrate(opr_rates->rate[i] & 0x7F))
 			continue;
 
-		lim_log(mac_ctx, LOGW,
-			FL("Invalid operational 11B rates"));
+		pe_warn("Invalid operational 11B rates");
 		QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE,
 				   QDF_TRACE_LEVEL_WARN,
 				   opr_rates->rate,
@@ -510,24 +491,19 @@ uint8_t lim_is_sme_join_req_valid(tpAniSirGlobal pMac, tpSirSmeJoinReq pJoinReq)
 	uint8_t valid = true;
 
 	if (!lim_is_rsn_ie_valid_in_sme_req_message(pMac, &pJoinReq->rsnIE)) {
-		lim_log(pMac, LOGE,
-			FL("received SME_JOIN_REQ with invalid RSNIE"));
+		pe_err("received SME_JOIN_REQ with invalid RSNIE");
 		valid = false;
 		goto end;
 	}
 
 	if (!lim_is_addie_valid_in_sme_req_message(pMac, &pJoinReq->addIEScan)) {
-		lim_log(pMac, LOGE,
-			FL
-				("received SME_JOIN_REQ with invalid additional IE for scan"));
+		pe_err("received SME_JOIN_REQ with invalid additional IE for scan");
 		valid = false;
 		goto end;
 	}
 
 	if (!lim_is_addie_valid_in_sme_req_message(pMac, &pJoinReq->addIEAssoc)) {
-		lim_log(pMac, LOGE,
-			FL
-				("received SME_JOIN_REQ with invalid additional IE for assoc"));
+		pe_err("received SME_JOIN_REQ with invalid additional IE for assoc");
 		valid = false;
 		goto end;
 	}
@@ -535,8 +511,7 @@ uint8_t lim_is_sme_join_req_valid(tpAniSirGlobal pMac, tpSirSmeJoinReq pJoinReq)
 	if (!lim_is_bss_descr_valid_in_sme_req_message(pMac, &pJoinReq->bssDescription)) {
 		/* / Received eWNI_SME_JOIN_REQ with invalid BSS Info */
 		/* Log the event */
-		lim_log(pMac, LOGE,
-			FL("received SME_JOIN_REQ with invalid bssInfo"));
+		pe_err("received SME_JOIN_REQ with invalid bssInfo");
 
 		valid = false;
 		goto end;
@@ -550,9 +525,7 @@ uint8_t lim_is_sme_join_req_valid(tpAniSirGlobal pMac, tpSirSmeJoinReq pJoinReq)
 			    (uint8_t *) pJoinReq->bssDescription.bssId,
 			    (uint8_t) (sizeof(tSirMacAddr)))) {
 		/* Log the event */
-		lim_log(pMac, LOGE,
-			FL
-				("received SME_JOIN_REQ with Self Mac and BSSID Same"));
+		pe_err("received SME_JOIN_REQ with Self Mac and BSSID Same");
 
 		valid = false;
 		goto end;
@@ -684,40 +657,35 @@ uint8_t lim_is_sme_scan_req_valid(tpAniSirGlobal pMac, tpSirSmeScanReq pScanReq)
 
 	if (pScanReq->numSsid > SIR_SCAN_MAX_NUM_SSID) {
 		valid = false;
-		lim_log(pMac, LOGE,
-			FL("Number of SSIDs > SIR_SCAN_MAX_NUM_SSID"));
+		pe_err("Number of SSIDs > SIR_SCAN_MAX_NUM_SSID");
 		goto end;
 	}
 
 	for (i = 0; i < pScanReq->numSsid; i++) {
 		if (pScanReq->ssId[i].length > SIR_MAC_MAX_SSID_LENGTH) {
-			lim_log(pMac, LOGE,
-				FL
-					("Requested SSID length > SIR_MAC_MAX_SSID_LENGTH"));
+			pe_err("Requested SSID length > SIR_MAC_MAX_SSID_LENGTH");
 			valid = false;
 			goto end;
 		}
 	}
 	if ((pScanReq->bssType < 0) || (pScanReq->bssType > eSIR_AUTO_MODE)) {
-		lim_log(pMac, LOGE, FL("Invalid BSS Type"));
+		pe_err("Invalid BSS Type");
 		valid = false;
 	}
 	if (qdf_is_macaddr_group(&pScanReq->bssId) &&
 		!qdf_is_macaddr_broadcast(&pScanReq->bssId)) {
 		valid = false;
-		lim_log(pMac, LOGE,
-			FL("BSSID is group addr and is not Broadcast Addr"));
+		pe_err("BSSID is group addr and is not Broadcast Addr");
 	}
 	if (!
 	    (pScanReq->scanType == eSIR_PASSIVE_SCAN
 	     || pScanReq->scanType == eSIR_ACTIVE_SCAN)) {
 		valid = false;
-		lim_log(pMac, LOGE, FL("Invalid Scan Type"));
+		pe_err("Invalid Scan Type");
 	}
 	if (pScanReq->channelList.numChannels > SIR_MAX_NUM_CHANNELS) {
 		valid = false;
-		lim_log(pMac, LOGE,
-			FL("Number of Channels > SIR_MAX_NUM_CHANNELS"));
+		pe_err("Number of Channels > SIR_MAX_NUM_CHANNELS");
 	}
 
 	/*
@@ -726,8 +694,7 @@ uint8_t lim_is_sme_scan_req_valid(tpAniSirGlobal pMac, tpSirSmeScanReq pScanReq)
 	if (valid) {
 		if ((pScanReq->scanType == eSIR_ACTIVE_SCAN) &&
 		    (pScanReq->maxChannelTime < pScanReq->minChannelTime)) {
-			lim_log(pMac, LOGE,
-				FL("Max Channel Time < Min Channel Time"));
+			pe_err("Max Channel Time < Min Channel Time");
 			valid = false;
 			goto end;
 		}
@@ -775,9 +742,7 @@ lim_is_sme_set_context_req_valid(tpAniSirGlobal pMac,
 		 * No keys present in case of TKIP or CCMP
 		 * Log error.
 		 */
-		lim_log(pMac, LOGW,
-			FL
-				("No keys present in SME_SETCONTEXT_REQ for edType=%d"),
+		pe_warn("No keys present in SME_SETCONTEXT_REQ for edType: %d",
 			pSetContextReq->keyMaterial.edType);
 
 		valid = false;
@@ -790,8 +755,7 @@ lim_is_sme_set_context_req_valid(tpAniSirGlobal pMac,
 		 * Keys present in case of no ED policy
 		 * Log error.
 		 */
-		lim_log(pMac, LOGW,
-			FL("Keys present in SME_SETCONTEXT_REQ for edType=%d"),
+		pe_warn("Keys present in SME_SETCONTEXT_REQ for edType: %d",
 			pSetContextReq->keyMaterial.edType);
 
 		valid = false;
@@ -803,8 +767,7 @@ lim_is_sme_set_context_req_valid(tpAniSirGlobal pMac,
 		 * Invalid edType in the message
 		 * Log error.
 		 */
-		lim_log(pMac, LOGW,
-			FL("Invalid edType=%d in SME_SETCONTEXT_REQ"),
+		pe_warn("Invalid edType: %d in SME_SETCONTEXT_REQ",
 			pSetContextReq->keyMaterial.edType);
 
 		valid = false;
@@ -814,8 +777,7 @@ lim_is_sme_set_context_req_valid(tpAniSirGlobal pMac,
 
 		if (wlan_cfg_get_int(pMac, WNI_CFG_PRIVACY_ENABLED,
 				     &poi) != eSIR_SUCCESS)
-			lim_log(pMac, LOGW,
-				FL("Unable to retrieve POI from CFG"));
+			pe_warn("Unable to retrieve POI from CFG");
 
 		if (!poi) {
 			/**
@@ -824,8 +786,7 @@ lim_is_sme_set_context_req_valid(tpAniSirGlobal pMac,
 			 * allow BSS creation/join with no Privacy capability
 			 * yet advertising WPA IE
 			 */
-			lim_log(pMac, LOGD,
-				FL("Privacy is not enabled, yet non-None EDtype=%d in SME_SETCONTEXT_REQ"),
+			pe_debug("Privacy is not enabled, yet non-None EDtype: %d in SME_SETCONTEXT_REQ",
 				       pSetContextReq->keyMaterial.edType);
 		}
 	}
@@ -847,9 +808,7 @@ lim_is_sme_set_context_req_valid(tpAniSirGlobal pMac,
 			 * Invalid key length for a given ED type
 			 * Log error.
 			 */
-			lim_log(pMac, LOGW,
-				FL
-					("Invalid keyLength =%d for edType=%d in SME_SETCONTEXT_REQ"),
+			pe_warn("Invalid keyLength: %d for edType: %d in SME_SETCONTEXT_REQ",
 				pKey->keyLength,
 				pSetContextReq->keyMaterial.edType);