qcacld-3.0: Change LOG1/LOG2 logs to appropriate log levels

LOGD log level should be used for all INFO messages
in sme layer.

Change LOG1/LOG2 logs to appropriate log levels

Change-Id: I9a0dacc7bb2feea1370d33f536a5cf715f1a1f63
CRs-Fixed: 1093093

core/sme/src/csr/csr_api_scan.c

@@ -322,7 +322,7 @@ csr_scan_2g_only_request(tpAniSirGlobal mac_ctx,
 	if (eCSR_SCAN_REQUEST_FULL_SCAN != scan_req->requestType)
 		return QDF_STATUS_SUCCESS;
 
-	sms_log(mac_ctx, LOG1,
+	sms_log(mac_ctx, LOGD,
 		FL("Scanning only 2G Channels during first scan"));
 
 	/* Contsruct valid Supported 2.4 GHz Channel List */
@@ -468,7 +468,7 @@ csr_issue_11d_scan(tpAniSirGlobal mac_ctx, tSmeCmd *scan_cmd,
 	}
 	if (mac_ctx->roam.configParam.nInitialDwellTime) {
 		tmp_rq.maxChnTime = mac_ctx->roam.configParam.nInitialDwellTime;
-		sms_log(mac_ctx, LOG1, FL("11d scan, updating dwell time for first scan %u"),
+		sms_log(mac_ctx, LOGD, FL("11d scan, updating dwell time for first scan %u"),
 			tmp_rq.maxChnTime);
 	}
 
@@ -523,7 +523,7 @@ QDF_STATUS csr_scan_request(tpAniSirGlobal pMac, uint16_t sessionId,
 	    && scan_req->SSIDs.numOfSSIDs
 	    && (NULL != scan_req->SSIDs.SSIDList)
 	    && (scan_req->SSIDs.SSIDList->SSID.length > DIRECT_SSID_LEN)) {
-		sms_log(pMac, LOG1, FL("P2P: Increasing the min and max Dwell time to %d for specific SSID scan %.*s"),
+		sms_log(pMac, LOGD, FL("P2P: Increasing the min and max Dwell time to %d for specific SSID scan %.*s"),
 			MAX_CHN_TIME_TO_FIND_GO,
 			scan_req->SSIDs.SSIDList->SSID.length,
 			scan_req->SSIDs.SSIDList->SSID.ssId);
@@ -556,7 +556,7 @@ QDF_STATUS csr_scan_request(tpAniSirGlobal pMac, uint16_t sessionId,
 	if (scan_req->minChnTime == 0 && scan_req->maxChnTime == 0) {
 		/* The caller doesn't set the time correctly. Set it here */
 		csr_set_default_scan_timing(pMac, scan_req->scanType, scan_req);
-		sms_log(pMac, LOG1,
+		sms_log(pMac, LOGD,
 			FL("Setting default min %d and max %d ChnTime"),
 			scan_req->minChnTime, scan_req->maxChnTime);
 	}
@@ -607,7 +607,7 @@ QDF_STATUS csr_scan_request(tpAniSirGlobal pMac, uint16_t sessionId,
 	if (cfg_prm->nInitialDwellTime) {
 		scan_req->maxChnTime = cfg_prm->nInitialDwellTime;
 		cfg_prm->nInitialDwellTime = 0;
-		sms_log(pMac, LOG1, FL("updating dwell time for first scan %u"),
+		sms_log(pMac, LOGD, FL("updating dwell time for first scan %u"),
 			scan_req->maxChnTime);
 	}
 	scan_req->scan_adaptive_dwell_mode = cfg_prm->scan_adaptive_dwell_mode;
@@ -633,7 +633,7 @@ QDF_STATUS csr_scan_request(tpAniSirGlobal pMac, uint16_t sessionId,
 	status = qdf_mc_timer_init(&scan_cmd->u.scanCmd.csr_scan_timer,
 				QDF_TIMER_TYPE_SW,
 				csr_scan_active_list_timeout_handle, scan_cmd);
-	sms_log(pMac, LOG1,
+	sms_log(pMac, LOGD,
 		FL("SId=%d scanId=%d Scan reason=%u numSSIDs=%d numChan=%d P2P search=%d minCT=%d maxCT=%d uIEFieldLen=%d BSSID: " MAC_ADDRESS_STR),
 		sessionId, scan_cmd->u.scanCmd.scanID,
 		scan_cmd->u.scanCmd.reason, pTempScanReq->SSIDs.numOfSSIDs,
@@ -678,7 +678,7 @@ static QDF_STATUS csr_issue_roam_after_lostlink_scan(tpAniSirGlobal pMac,
 		return QDF_STATUS_E_FAILURE;
 	}
 
-	sms_log(pMac, LOG1, FL("Entry"));
+	sms_log(pMac, LOGD, FL("Entry"));
 	if (pSession->fCancelRoaming) {
 		sms_log(pMac, LOGW, FL("lost link roaming canceled"));
 		status = QDF_STATUS_SUCCESS;
@@ -1633,7 +1633,7 @@ static int csr_get_altered_rssi(tpAniSirGlobal mac_ctx, int rssi,
 			modified_rssi -= CSR_MAX(roam_params->max_drop_rssi_5g,
 						penalty_factor);
 		}
-		sms_log(mac_ctx, LOG2,
+		sms_log(mac_ctx, LOGD,
 			FL("5G BSSID"MAC_ADDRESS_STR" AR=%d, MR=%d, ch=%d"),
 			MAC_ADDR_ARRAY(local_bssid.bytes),
 			rssi, modified_rssi, channel_id);
@@ -1651,7 +1651,7 @@ static int csr_get_altered_rssi(tpAniSirGlobal mac_ctx, int rssi,
 			if (!qdf_is_macaddr_equal(&fav_bssid, bssid))
 				continue;
 			modified_rssi += roam_params->bssid_favored_factor[i];
-			sms_log(mac_ctx, LOG2,
+			sms_log(mac_ctx, LOGD,
 				FL("Pref"MAC_ADDRESS_STR" AR=%d, MR=%d, ch=%d"),
 				MAC_ADDR_ARRAY(local_bssid.bytes),
 				rssi, modified_rssi, channel_id);
@@ -1836,7 +1836,7 @@ static void csr_scan_add_to_occupied_channels(tpAniSirGlobal pMac,
 					       num_occupied_ch, ch);
 	if (QDF_IS_STATUS_SUCCESS(status)) {
 		occupied_ch->numChannels++;
-		sms_log(pMac, LOG2,
+		sms_log(pMac, LOGD,
 			FL("Added channel %d to the list (count=%d)"),
 			ch, occupied_ch->numChannels);
 		if (occupied_ch->numChannels >
@@ -1911,10 +1911,10 @@ csr_parser_scan_result_for_5ghz_preference(tpAniSirGlobal pMac,
 			if (!pIes && (!QDF_IS_STATUS_SUCCESS(status)))
 				continue;
 
-			sms_log(pMac, LOG1, FL("SSID Matched"));
+			sms_log(pMac, LOGD, FL("SSID Matched"));
 			if (pFilter->bOSENAssociation) {
 				fMatch = true;
-				sms_log(pMac, LOG1, FL("Security Matched"));
+				sms_log(pMac, LOGD, FL("Security Matched"));
 				if ((pBssDesc->Result.pvIes == NULL) && pIes)
 					qdf_mem_free(pIes);
 				continue;
@@ -1939,13 +1939,13 @@ csr_parser_scan_result_for_5ghz_preference(tpAniSirGlobal pMac,
 			if ((pBssDesc->Result.pvIes == NULL) && pIes)
 				qdf_mem_free(pIes);
 			if (fMatch)
-				sms_log(pMac, LOG1, FL("Security Matched"));
+				sms_log(pMac, LOGD, FL("Security Matched"));
 		} /* for loop ends */
 
 		if (fMatch
 		    && (pBssDesc->Result.BssDescriptor.rssi >
 			pMac->scan.inScanResultBestAPRssi)) {
-			sms_log(pMac, LOG1,
+			sms_log(pMac, LOGD,
 				FL("Best AP Rssi changed from %d to %d"),
 				pMac->scan.inScanResultBestAPRssi,
 				pBssDesc->Result.BssDescriptor.rssi);
@@ -1987,7 +1987,7 @@ csr_prefer_5ghz(tpAniSirGlobal pMac, tCsrScanResultFilter *pFilter)
 		csr_parser_scan_result_for_5ghz_preference(pMac, pFilter);
 	if (-128 != pMac->scan.inScanResultBestAPRssi ||
 		CSR_IS_SELECT_5G_PREFERRED(pMac)) {
-		sms_log(pMac, LOG1, FL("Best AP Rssi is %d"),
+		sms_log(pMac, LOGD, FL("Best AP Rssi is %d"),
 			pMac->scan.inScanResultBestAPRssi);
 		/* Modify Rssi category based on best AP Rssi */
 		if (-128 != pMac->scan.inScanResultBestAPRssi)
@@ -2008,7 +2008,7 @@ csr_prefer_5ghz(tpAniSirGlobal pMac, tCsrScanResultFilter *pFilter)
 				&pBssDesc->Result.BssDescriptor.bssId,
 				pBssDesc->Result.BssDescriptor.channelId);
 
-			sms_log(pMac, LOG2, FL("BSSID("MAC_ADDRESS_STR") Rssi(%d) Chnl(%d) PrefVal(%u) SSID=%.*s"),
+			sms_log(pMac, LOGD, FL("BSSID("MAC_ADDRESS_STR") Rssi(%d) Chnl(%d) PrefVal(%u) SSID=%.*s"),
 				MAC_ADDR_ARRAY(
 					pBssDesc->Result.BssDescriptor.bssId),
 				pBssDesc->Result.BssDescriptor.rssi,
@@ -2216,7 +2216,7 @@ static QDF_STATUS csr_calc_pref_val_by_pcl(tpAniSirGlobal mac_ctx,
 		new_pref_val = csr_derive_prefer_value_from_rssi(mac_ctx,
 					temp_rssi);
 
-		sms_log(mac_ctx, LOG1,
+		sms_log(mac_ctx, LOGD,
 			FL("%pM: rssi:%d org pref=%d temp rssi:%d new pref=%d pref=%d updated pref=%d"),
 			bss_descr->Result.BssDescriptor.bssId,
 			bss_descr->Result.BssDescriptor.rssi,
@@ -2277,7 +2277,7 @@ csr_parse_scan_results(tpAniSirGlobal pMac,
 		status = csr_save_ies(pMac, pFilter, pBssDesc, &pNewIes,
 				      &fMatch, &uc, &mc, &auth);
 		if (!QDF_IS_STATUS_SUCCESS(status)) {
-			sms_log(pMac, LOG1, FL("save ies fail %d"),
+			sms_log(pMac, LOGD, FL("save ies fail %d"),
 				status);
 			break;
 		}
@@ -2290,7 +2290,7 @@ csr_parse_scan_results(tpAniSirGlobal pMac,
 					     pNewIes, pRetList, count, uc, mc,
 					     &auth);
 		if (!QDF_IS_STATUS_SUCCESS(status)) {
-			sms_log(pMac, LOG1, FL("save entry fail %d"),
+			sms_log(pMac, LOGD, FL("save entry fail %d"),
 				status);
 			break;
 		}
@@ -2323,7 +2323,7 @@ QDF_STATUS csr_scan_get_result(tpAniSirGlobal pMac,
 	csr_ll_open(pMac->hHdd, &pRetList->List);
 	pRetList->pCurEntry = NULL;
 	status = csr_parse_scan_results(pMac, pFilter, pRetList, &count);
-	sms_log(pMac, LOG1, FL("return %d BSS %d"),
+	sms_log(pMac, LOGD, FL("return %d BSS %d"),
 		csr_ll_count(&pRetList->List), status);
 	if (!QDF_IS_STATUS_SUCCESS(status) || (phResult == NULL)) {
 		/* Fail or No one wants the result. */
@@ -2430,7 +2430,7 @@ void csr_scan_flush_bss_entry(tpAniSirGlobal pMac,
 			pEntry = csr_ll_next(pList, pEntry, LL_ACCESS_NOLOCK);
 			csr_ll_remove_entry(pList, pFreeElem, LL_ACCESS_NOLOCK);
 			csr_free_scan_result_entry(pMac, pBssDesc);
-			sms_log(pMac, LOG1, FL("Removed BSS entry:%pM"),
+			sms_log(pMac, LOGD, FL("Removed BSS entry:%pM"),
 				pCsaOffloadInd->bssid.bytes);
 			continue;
 		}
@@ -2529,7 +2529,7 @@ QDF_STATUS csr_scan_filter_results(tpAniSirGlobal pMac)
 				csr_free_scan_result_entry(pMac, pBssDesc);
 			}
 		} else {
-			sms_log(pMac, LOG1, FL("%d is a Valid channel"),
+			sms_log(pMac, LOGD, FL("%d is a Valid channel"),
 				pBssDesc->Result.BssDescriptor.channelId);
 		}
 		pEntry = pTempEntry;
@@ -2553,7 +2553,7 @@ QDF_STATUS csr_scan_filter_results(tpAniSirGlobal pMac)
 				csr_free_scan_result_entry(pMac, pBssDesc);
 			}
 		} else {
-			sms_log(pMac, LOG1, FL("%d is a Valid channel"),
+			sms_log(pMac, LOGD, FL("%d is a Valid channel"),
 				pBssDesc->Result.BssDescriptor.channelId);
 		}
 		pEntry = pTempEntry;
@@ -2683,7 +2683,7 @@ QDF_STATUS csr_scanning_state_msg_processor(tpAniSirGlobal pMac,
 		return status;
 	}
 
-	sms_log(pMac, LOG1,
+	sms_log(pMac, LOGD,
 		FL("Scanning: ASSOC cnf can be given to upper layer"));
 	qdf_mem_set(&roamInfo, sizeof(tCsrRoamInfo), 0);
 	pRoamInfo = &roamInfo;
@@ -3079,7 +3079,7 @@ static void csr_purge_old_scan_results(tpAniSirGlobal mac_ctx)
 		/* Free the old BSS Entries */
 		if (csr_ll_remove_entry(&mac_ctx->scan.scanResultList,
 		    &oldest_bss->Link, LL_ACCESS_NOLOCK)) {
-			sms_log(mac_ctx, LOG1,
+			sms_log(mac_ctx, LOGD,
 				FL("Current time delta (%llu) of BSSID to be removed" MAC_ADDRESS_STR),
 				(curr_time -
 				oldest_bss->Result.BssDescriptor.received_time),
@@ -3108,7 +3108,7 @@ csr_remove_from_tmp_list(tpAniSirGlobal mac_ctx,
 	while ((entry = csr_ll_remove_tail(&mac_ctx->scan.tempScanResults,
 					   LL_ACCESS_LOCK)) != NULL) {
 		bss_dscp = GET_BASE_ADDR(entry, tCsrScanResult, Link);
-		sms_log(mac_ctx, LOG2,
+		sms_log(mac_ctx, LOGD,
 			FL("...Bssid= "MAC_ADDRESS_STR" chan= %d, rssi = -%d"),
 			MAC_ADDR_ARRAY(bss_dscp->Result.BssDescriptor.
 				       bssId),
@@ -3132,7 +3132,7 @@ csr_remove_from_tmp_list(tpAniSirGlobal mac_ctx,
 		 * LFR candidates came from FW
 		 */
 		if (CSR_SCAN_IS_OVER_BSS_LIMIT(mac_ctx)) {
-			sms_log(mac_ctx, LOG1, FL("BSS Limit reached"));
+			sms_log(mac_ctx, LOGD, FL("BSS Limit reached"));
 			csr_purge_old_scan_results(mac_ctx);
 		}
 		/* check for duplicate scan results */
@@ -4050,20 +4050,20 @@ static eCsrScanCompleteNextCommand csr_scan_get_next_command_state(
 		 *   set hw_mode fail -> csr_scan_handle_search_for_ssid_failure
 		 * failure: csr_scan_handle_search_for_ssid_failure
 		 */
-		sms_log(pMac, LOG1, FL("Resp for eCsrScanForSsid"));
+		sms_log(pMac, LOGD, FL("Resp for eCsrScanForSsid"));
 		channel = policy_mgr_search_and_check_for_session_conc(
 				pMac->psoc,
 				pCommand->sessionId,
 				pCommand->u.scanCmd.pToRoamProfile);
 		if ((!channel) || !fSuccess) {
 			NextCommand = eCsrNexteScanForSsidFailure;
-			sms_log(pMac, LOG1,
+			sms_log(pMac, LOGD,
 				FL("next ScanForSsidFailure %d %d"),
 				channel, fSuccess);
 		} else {
 			NextCommand = eCsrNextCheckAllowConc;
 			*chan = channel;
-			sms_log(pMac, LOG1, FL("next CheckAllowConc"));
+			sms_log(pMac, LOGD, FL("next CheckAllowConc"));
 		}
 		break;
 	default:
@@ -4474,7 +4474,7 @@ csr_handle_nxt_cmd(tpAniSirGlobal mac_ctx, tSmeCmd *pCommand,
 	switch (*nxt_cmd) {
 	case eCsrNext11dScan1Success:
 	case eCsrNext11dScan2Success:
-		sms_log(mac_ctx, LOG2,
+		sms_log(mac_ctx, LOGD,
 			FL("11dScan1/3 produced results. Reissue Active scan"));
 		/*
 		 * if we found country information, no need to continue scanning
@@ -4532,7 +4532,7 @@ csr_handle_nxt_cmd(tpAniSirGlobal mac_ctx, tSmeCmd *pCommand,
 		ret = policy_mgr_current_connections_update(mac_ctx->psoc,
 					pCommand->sessionId, chan,
 					SIR_UPDATE_REASON_HIDDEN_STA);
-		sms_log(mac_ctx, LOG1, FL("chan: %d session: %d status: %d"),
+		sms_log(mac_ctx, LOGD, FL("chan: %d session: %d status: %d"),
 					chan, pCommand->sessionId, ret);
 		if (mac_ctx->sme.saved_scan_cmd) {
 			qdf_mem_free(mac_ctx->sme.saved_scan_cmd);
@@ -4626,7 +4626,7 @@ QDF_STATUS csr_get_active_scan_entry(tpAniSirGlobal mac_ctx,
 		else if (cmd->command == eSmeCommandRemainOnChannel)
 			cmd_scan_id = cmd->u.remainChlCmd.scan_id;
 		if (cmd_scan_id == scan_id) {
-			sms_log(mac_ctx, LOG1, FL(" scanId Matched %d"),
+			sms_log(mac_ctx, LOGD, FL(" scanId Matched %d"),
 					scan_id);
 			*entry = localentry;
 			csr_scan_active_ll_unlock(mac_ctx);
@@ -4790,10 +4790,10 @@ bool csr_scan_complete(tpAniSirGlobal pMac, tSirSmeScanRsp *pScanRsp)
 		 */
 		if (pCommand->u.scanCmd.callback
 		    != pMac->scan.callback11dScanDone) {
-			sms_log(pMac, LOG1, FL("Filtering the scan results"));
+			sms_log(pMac, LOGD, FL("Filtering the scan results"));
 			csr_scan_filter_results(pMac);
 		} else {
-			sms_log(pMac, LOG1,
+			sms_log(pMac, LOGD,
 				FL("11d_scan_done, flushing the scan results"));
 		}
 	}
@@ -5135,7 +5135,7 @@ static bool csr_scan_process_scan_results(tpAniSirGlobal pMac, tSmeCmd *pCommand
 	bool fRet = false, fRemoveCommand = false;
 	QDF_STATUS status;
 
-	sms_log(pMac, LOG1, FL("scan reason = %d, response status code = %d"),
+	sms_log(pMac, LOGD, FL("scan reason = %d, response status code = %d"),
 		pCommand->u.scanCmd.reason, pScanRsp->statusCode);
 	fRemoveCommand = csr_scan_complete(pMac, pScanRsp);
 	fRet = true;
@@ -5244,7 +5244,7 @@ QDF_STATUS csr_scan_process_single_bssdescr(tpAniSirGlobal mac_ctx,
 					       eCSR_ROAM_RESULT_NONE);
 			qdf_mem_free(roam_info);
 		} else {
-			sms_log(mac_ctx, LOG1, "qdf_mem_malloc failed");
+			sms_log(mac_ctx, LOGE, "qdf_mem_malloc failed");
 		}
 
 		csr_scan_remove_dup_bss_description_from_interim_list
@@ -5290,7 +5290,7 @@ QDF_STATUS csr_scan_sme_scan_response(tpAniSirGlobal pMac,
 	if (!pEntry)
 		goto error_handling;
 
-	sms_log(pMac, LOG1, FL("Scan completion called:scan_id %d, entry = %p"),
+	sms_log(pMac, LOGD, FL("Scan completion called:scan_id %d, entry = %p"),
 		pScanRsp->scan_id, pEntry);
 
 	pCommand = GET_BASE_ADDR(pEntry, tSmeCmd, Link);
@@ -5330,7 +5330,7 @@ QDF_STATUS csr_scan_sme_scan_response(tpAniSirGlobal pMac,
 error_handling:
 #ifdef FEATURE_WLAN_SCAN_PNO
 	if (pMac->pnoOffload && pScanRsp->statusCode == eSIR_PNO_SCAN_SUCCESS) {
-		sms_log(pMac, LOG1, FL("PNO Scan completion called"));
+		sms_log(pMac, LOGD, FL("PNO Scan completion called"));
 		csr_save_scan_results(pMac, eCsrScanCandidateFound,
 				      pScanRsp->sessionId);
 		return QDF_STATUS_SUCCESS;
@@ -5517,12 +5517,12 @@ static QDF_STATUS csr_send_mb_scan_req(tpAniSirGlobal pMac, uint16_t sessionId,
 	pMsg = qdf_mem_malloc(msgLen);
 	if (NULL == pMsg) {
 		sms_log(pMac, LOGE, FL("memory allocation failed"));
-		sms_log(pMac, LOG1, FL("Failed: SId: %d FirstMatch = %d"
+		sms_log(pMac, LOGD, FL("Failed: SId: %d FirstMatch = %d"
 				       " UniqueResult = %d freshScan = %d hiddenSsid = %d"),
 			sessionId, pScanReqParam->bReturnAfter1stMatch,
 			pScanReqParam->fUniqueResult, pScanReqParam->freshScan,
 			pScanReqParam->hiddenSsid);
-		sms_log(pMac, LOG1,
+		sms_log(pMac, LOGD,
 			FL("scanType = %s (%u) BSSType = %s (%u) numOfSSIDs = %d"
 				" numOfChannels = %d requestType = %s (%d) p2pSearch = %d\n"),
 			sme_scan_type_to_string(pScanReq->scanType),
@@ -5675,7 +5675,7 @@ static QDF_STATUS csr_send_mb_scan_req(tpAniSirGlobal pMac, uint16_t sessionId,
 	pMsg->scan_id = pScanReq->scan_id;
 
 send_scan_req:
-	sms_log(pMac, LOG1,
+	sms_log(pMac, LOGD,
 		FL("scanId %d domainIdCurrent %d scanType %s (%d) bssType %s (%d) requestType %s (%d) numChannels %d"),
 		pMsg->scan_id, pMac->scan.domainIdCurrent,
 		sme_scan_type_to_string(pMsg->scanType), pMsg->scanType,
@@ -5684,7 +5684,7 @@ send_scan_req:
 		pScanReq->requestType, pMsg->channelList.numChannels);
 
 	for (i = 0; i < pMsg->channelList.numChannels; i++) {
-		sms_log(pMac, LOG2, FL("channelNumber[%d]= %d"), i,
+		sms_log(pMac, LOGD, FL("channelNumber[%d]= %d"), i,
 			pMsg->channelList.channelNumber[i]);
 	}
 
@@ -5911,7 +5911,7 @@ static void csr_scan_copy_request_valid_channels_only(tpAniSirGlobal mac_ctx,
 							ChannelList
 							[index])))
 			) {
-				sms_log(mac_ctx, LOG2,
+				sms_log(mac_ctx, LOGD,
 					FL(" reqType= %s (%d), numOfChannels=%d, ignoring DFS channel %d"),
 					sme_request_type_to_string(
 						src_req->requestType),
@@ -5983,7 +5983,7 @@ static bool csr_scan_filter_given_chnl_band(tpAniSirGlobal mac_ctx,
 	uint32_t valid_chnl_len = WNI_CFG_VALID_CHANNEL_LIST_LEN;
 
 	if (!channel) {
-		sms_log(mac_ctx, LOG1,
+		sms_log(mac_ctx, LOGD,
 			FL("Nothing to filter as no IBSS session"));
 		return true;
 	}
@@ -6186,7 +6186,7 @@ QDF_STATUS csr_scan_copy_request(tpAniSirGlobal mac_ctx,
 	 * SAP+STA concurrency
 	 */
 	if (policy_mgr_is_ibss_conn_exist(mac_ctx->psoc, &channel)) {
-		sms_log(mac_ctx, LOG1,
+		sms_log(mac_ctx, LOGD,
 			FL("Conc IBSS exist, channel list will be modified"));
 	} else if (policy_mgr_is_any_dfs_beaconing_session_present(
 			mac_ctx->psoc, &channel)) {
@@ -6203,7 +6203,7 @@ QDF_STATUS csr_scan_copy_request(tpAniSirGlobal mac_ctx,
 		    mac_ctx->psoc))
 			channel = 0;
 		else
-			sms_log(mac_ctx, LOG1,
+			sms_log(mac_ctx, LOGD,
 				FL("Conc DFS SAP/GO exist, channel list will be modified"));
 	}
 
@@ -6290,7 +6290,7 @@ void csr_scan_call_callback(tpAniSirGlobal pMac, tSmeCmd *pCommand,
 					     pCommand->u.scanCmd.scanID,
 					     scanStatus);
 	} else {
-		sms_log(pMac, LOG2, "%s:%d - Callback NULL!!!", __func__,
+		sms_log(pMac, LOGD, "%s:%d - Callback NULL!!!", __func__,
 			__LINE__);
 	}
 }
@@ -6492,7 +6492,7 @@ static void csr_purge_scan_result_by_age(void *pv)
 
 	csr_ll_lock(&mac_ctx->scan.scanResultList);
 	entry = csr_ll_peek_head(&mac_ctx->scan.scanResultList, LL_ACCESS_NOLOCK);
-	sms_log(mac_ctx, LOG1, FL(" Ageout time=%llu"), ageout_time);
+	sms_log(mac_ctx, LOGD, FL(" Ageout time=%llu"), ageout_time);
 	while (entry) {
 		tmp_entry = csr_ll_next(&mac_ctx->scan.scanResultList, entry,
 					LL_ACCESS_NOLOCK);
@@ -6767,7 +6767,7 @@ QDF_STATUS csr_scan_for_ssid(tpAniSirGlobal mac_ctx, uint32_t session_id,
 	uint8_t index = 0;
 	tpCsrNeighborRoamControlInfo neighbor_roaminfo =
 		&mac_ctx->roam.neighborRoamInfo[session_id];
-		tCsrSSIDs *ssids = NULL;
+	tCsrSSIDs *ssids = NULL;
 #else
 	struct scan_start_request *req;
 	struct wlan_objmgr_vdev *vdev;
@@ -6775,7 +6775,6 @@ QDF_STATUS csr_scan_for_ssid(tpAniSirGlobal mac_ctx, uint32_t session_id,
 	wlan_scan_id scan_id;
 	tCsrRoamSession *session = CSR_GET_SESSION(mac_ctx, session_id);
 #endif
-	sms_log(mac_ctx, LOG2, FL("called"));
 
 	if (!(mac_ctx->scan.fScanEnable) && (num_ssid != 1)) {
 		sms_log(mac_ctx, LOGE,
@@ -7365,7 +7364,7 @@ QDF_STATUS csr_remove_nonscan_cmd_from_pending_list(tpAniSirGlobal pMac,
 
 	while ((pEntry = csr_ll_remove_head(&localList, LL_ACCESS_NOLOCK))) {
 		pCommand = GET_BASE_ADDR(pEntry, tSmeCmd, Link);
-		sms_log(pMac, LOG1, FL("Sending abort for command ID %d"),
+		sms_log(pMac, LOGD, FL("Sending abort for command ID %d"),
 			(commandType == eSmeCommandScan) ? pCommand->u.
 			scanCmd.scanID : sessionId);
 		csr_release_command(pMac, pCommand);
@@ -7521,7 +7520,7 @@ static void csr_send_scan_abort(tpAniSirGlobal mac_ctx,
 	msg->msgLen = msg_len;
 	msg->sessionId = session_id;
 	msg->scan_id = scan_id;
-	sms_log(mac_ctx, LOG2,
+	sms_log(mac_ctx, LOGD,
 		FL("Abort scan sent to Firmware scan_id %d session %d"),
 		scan_id, session_id);
 	status = umac_send_mb_message_to_mac(msg);
@@ -7754,7 +7753,7 @@ QDF_STATUS csr_scan_save_preferred_network_found(tpAniSirGlobal pMac,
 		(unsigned int)pBssDescr->mdie[1],
 		(unsigned int)pBssDescr->mdie[2]);
 
-	sms_log(pMac, LOG2, FL("Bssid= "MAC_ADDRESS_STR" chan= %d, rssi = %d"),
+	sms_log(pMac, LOGD, FL("Bssid= "MAC_ADDRESS_STR" chan= %d, rssi = %d"),
 		MAC_ADDR_ARRAY(pBssDescr->bssId), pBssDescr->channelId,
 		pBssDescr->rssi);
 	/* IEs */
@@ -7817,7 +7816,7 @@ void csr_init_occupied_channels_list(tpAniSirGlobal pMac, uint8_t sessionId)
 		 * Ini file contains neighbor scan channel list, hence NO need
 		 * to build occupied channel list"
 		 */
-		sms_log(pMac, LOG1, FL("Ini contains neighbor scan ch list"));
+		sms_log(pMac, LOGD, FL("Ini contains neighbor scan ch list"));
 		return;
 	}
 
@@ -7826,7 +7825,7 @@ void csr_init_occupied_channels_list(tpAniSirGlobal pMac, uint8_t sessionId)
 		 * Do not flush occupied list since current roam profile matches
 		 * previous
 		 */
-		sms_log(pMac, LOG2, FL("Current roam profile matches prev"));
+		sms_log(pMac, LOGD, FL("Current roam profile matches prev"));
 		return;
 	}
 
@@ -7875,9 +7874,9 @@ QDF_STATUS csr_scan_create_entry_in_scan_cache(tpAniSirGlobal pMac,
 		status = QDF_STATUS_E_FAILURE;
 		return status;
 	}
-	sms_log(pMac, LOG2, FL("Current bssid::"MAC_ADDRESS_STR),
+	sms_log(pMac, LOGD, FL("Current bssid::"MAC_ADDRESS_STR),
 		MAC_ADDR_ARRAY(pSession->pConnectBssDesc->bssId));
-	sms_log(pMac, LOG2, FL("My bssid::"MAC_ADDRESS_STR" channel %d"),
+	sms_log(pMac, LOGD, FL("My bssid::"MAC_ADDRESS_STR" channel %d"),
 		MAC_ADDR_ARRAY(bssid.bytes), channel);
 
 	if (!QDF_IS_STATUS_SUCCESS(csr_get_parsed_bss_description_ies(
@@ -7999,7 +7998,7 @@ QDF_STATUS csr_scan_save_roam_offload_ap_to_scan_cache(tpAniSirGlobal pMac,
 		return QDF_STATUS_E_RESOURCES;
 	}
 
-	sms_log(pMac, LOG1, FL("LFR3:Add BSSID to scan cache" MAC_ADDRESS_STR),
+	sms_log(pMac, LOGD, FL("LFR3:Add BSSID to scan cache" MAC_ADDRESS_STR),
 		MAC_ADDR_ARRAY(scan_res_ptr->Result.BssDescriptor.bssId));
 	csr_scan_add_result(pMac, scan_res_ptr, ies_local_ptr, session_id);
 	if ((scan_res_ptr->Result.pvIes == NULL) && ies_local_ptr)

core/sme/src/csr/csr_host_scan_roam.c

@@ -214,7 +214,7 @@ void csr_neighbor_roam_process_scan_results(tpAniSirGlobal mac_ctx,
 				if (conc_channel &&
 				   (conc_channel !=
 				   scan_result->BssDescriptor.channelId)) {
-					sms_log(mac_ctx, LOG1, FL("MCC not supported so Ignore AP on channel %d"),
+					sms_log(mac_ctx, LOGD, FL("MCC not supported so Ignore AP on channel %d"),
 					  scan_result->BssDescriptor.channelId);
 					continue;
 				}
@@ -258,7 +258,7 @@ void csr_neighbor_roam_process_scan_results(tpAniSirGlobal mac_ctx,
 			qavail = descr->QBSSLoad_avail;
 			voadmitted = n_roam_info->isVOAdmitted;
 			if (voadmitted)
-				sms_log(mac_ctx, LOG1,
+				sms_log(mac_ctx, LOGD,
 					FL("New QBSS=%s,BWavail=0x%x,req=0x%x"),
 					((qpresent) ? "yes" : "no"), qavail,
 					n_roam_info->MinQBssLoadRequired);
@@ -469,7 +469,7 @@ QDF_STATUS csr_neighbor_roam_candidate_found_ind_hdlr(tpAniSirGlobal pMac,
 		&pMac->roam.neighborRoamInfo[sessionId];
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 
-	sms_log(pMac, LOG1, FL("Received indication from firmware"));
+	sms_log(pMac, LOGD, FL("Received indication from firmware"));
 
 	/* we must be in connected state, if not ignore it */
 	if ((eCSR_NEIGHBOR_ROAM_STATE_CONNECTED !=
@@ -518,7 +518,7 @@ void csr_neighbor_roam_free_roamable_bss_list(tpAniSirGlobal mac_ctx,
 {
 	tpCsrNeighborRoamBSSInfo result = NULL;
 
-	sms_log(mac_ctx, LOG2,
+	sms_log(mac_ctx, LOGD,
 		FL("Emptying the BSS list. Current count = %d"),
 		csr_ll_count(llist));
 
@@ -556,7 +556,7 @@ bool csr_neighbor_roam_remove_roamable_ap_list_entry(tpAniSirGlobal pMac,
 					   LL_ACCESS_LOCK);
 	}
 
-	sms_log(pMac, LOGE,
+	sms_log(pMac, LOGD,
 		FL("Remove neigh BSS node from fail list. Current count = %d"),
 		csr_ll_count(pList));
 
@@ -728,7 +728,7 @@ bool csr_neighbor_roam_get_handoff_ap_info(tpAniSirGlobal pMac,
 			pMac,
 			&ngbr_roam_info->FTRoamInfo.preAuthDoneList,
 			NULL);
-		sms_log(pMac, LOG1,
+		sms_log(pMac, LOGD,
 			FL("Number of Handoff candidates = %d"),
 			csr_ll_count(&
 				ngbr_roam_info->FTRoamInfo.preAuthDoneList));
@@ -740,7 +740,7 @@ bool csr_neighbor_roam_get_handoff_ap_info(tpAniSirGlobal pMac,
 			csr_neighbor_roam_next_roamable_ap(pMac,
 				&ngbr_roam_info->FTRoamInfo.preAuthDoneList,
 				NULL);
-		sms_log(pMac, LOG1,
+		sms_log(pMac, LOGD,
 			FL("Number of Handoff candidates = %d"),
 			csr_ll_count(&ngbr_roam_info->FTRoamInfo.
 			preAuthDoneList));
@@ -752,7 +752,7 @@ bool csr_neighbor_roam_get_handoff_ap_info(tpAniSirGlobal pMac,
 			csr_neighbor_roam_next_roamable_ap(pMac,
 			&ngbr_roam_info->FTRoamInfo.preAuthDoneList,
 			NULL);
-		sms_log(pMac, LOG1,
+		sms_log(pMac, LOGD,
 			FL("Number of Handoff candidates = %d"),
 			csr_ll_count(
 				&ngbr_roam_info->FTRoamInfo.preAuthDoneList));
@@ -761,7 +761,7 @@ bool csr_neighbor_roam_get_handoff_ap_info(tpAniSirGlobal pMac,
 			csr_neighbor_roam_next_roamable_ap(pMac,
 				&ngbr_roam_info->roamableAPList,
 				NULL);
-		sms_log(pMac, LOG1,
+		sms_log(pMac, LOGD,
 			FL("Number of Handoff candidates = %d"),
 			csr_ll_count(&ngbr_roam_info->roamableAPList));
 	}

core/sme/src/csr/csr_neighbor_roam.c

@@ -120,7 +120,7 @@ void csr_neighbor_roam_send_lfr_metric_event(
 
 	roam_info = qdf_mem_malloc(sizeof(tCsrRoamInfo));
 	if (NULL == roam_info) {
-		sms_log(mac_ctx, LOG1, FL("Memory allocation failed!"));
+		sms_log(mac_ctx, LOGE, FL("Memory allocation failed!"));
 	} else {
 		qdf_mem_copy((void *)roam_info->bssid,
 			     (void *)bssid, sizeof(*roam_info));
@@ -162,7 +162,7 @@ QDF_STATUS csr_neighbor_roam_update_fast_roaming_enabled(tpAniSirGlobal mac_ctx,
 		}
 	break;
 	case eCSR_NEIGHBOR_ROAM_STATE_INIT:
-		NEIGHBOR_ROAM_DEBUG(mac_ctx, LOG2,
+		NEIGHBOR_ROAM_DEBUG(mac_ctx, LOGD,
 				    FL
 				    ("Currently in INIT state, Nothing to do"));
 		break;
@@ -187,7 +187,7 @@ QDF_STATUS csr_neighbor_roam_update_config(tpAniSirGlobal mac_ctx,
 	uint8_t old_value;
 
 	if (NULL == pNeighborRoamInfo) {
-		sms_log(mac_ctx, LOG1, FL("Invalid Session ID %d"), session_id);
+		sms_log(mac_ctx, LOGE, FL("Invalid Session ID %d"), session_id);
 		return QDF_STATUS_E_FAILURE;
 	}
 	cfg_params = &pNeighborRoamInfo->cfgParams;
@@ -228,7 +228,7 @@ QDF_STATUS csr_neighbor_roam_update_config(tpAniSirGlobal mac_ctx,
 			pNeighborRoamInfo->currentRoamBeaconRssiWeight = value;
 			break;
 		default:
-			sms_log(mac_ctx, LOG2, FL("Unknown update cfg reason"));
+			sms_log(mac_ctx, LOGD, FL("Unknown update cfg reason"));
 			return QDF_STATUS_E_FAILURE;
 		}
 	} else {
@@ -237,11 +237,11 @@ QDF_STATUS csr_neighbor_roam_update_config(tpAniSirGlobal mac_ctx,
 		return QDF_STATUS_E_FAILURE;
 	}
 	if (state == eCSR_NEIGHBOR_ROAM_STATE_CONNECTED) {
-		sms_log(mac_ctx, LOG2, FL("CONNECTED, send update cfg cmd"));
+		sms_log(mac_ctx, LOGD, FL("CONNECTED, send update cfg cmd"));
 		csr_roam_offload_scan(mac_ctx, session_id,
 			ROAM_SCAN_OFFLOAD_UPDATE_CFG, reason);
 	}
-	sms_log(mac_ctx, LOG2, FL("LFR config for %s changed from %d to %d"),
+	sms_log(mac_ctx, LOGD, FL("LFR config for %s changed from %d to %d"),
 			lfr_get_config_item_string(reason), old_value, value);
 	return QDF_STATUS_SUCCESS;
 }
@@ -441,7 +441,7 @@ csr_neighbor_roam_prepare_scan_profile_filter(tpAniSirGlobal pMac,
 			(void *)pCurProfile->SSID.ssId,
 			pCurProfile->SSID.length);
 
-		NEIGHBOR_ROAM_DEBUG(pMac, LOG1,
+		NEIGHBOR_ROAM_DEBUG(pMac, LOGD,
 			FL("Filtering for SSID %.*s,length of SSID = %u"),
 			pScanFilter->SSIDs.SSIDList->SSID.length,
 			pScanFilter->SSIDs.SSIDList->SSID.ssId,
@@ -758,12 +758,7 @@ bool csr_neighbor_roam_is_new_connected_profile(tpAniSirGlobal pMac,
 		}
 	}
 
-	if (fNew) {
-		sms_log(pMac, LOG1,
-			FL("Prev roam profile did not match current"));
-	} else {
-		sms_log(pMac, LOG1, FL("Prev roam profile matches current"));
-	}
+	sms_log(pMac, LOGD, FL("roam profile match: %d"), !fNew);
 
 	return fNew;
 }
@@ -1105,7 +1100,7 @@ QDF_STATUS csr_neighbor_roam_indicate_connect(
 		return QDF_STATUS_E_FAILURE;
 	}
 
-	sms_log(pMac, LOG2,
+	sms_log(pMac, LOGD,
 		FL("Connect ind. received with session id %d in state %s"),
 		session_id, mac_trace_get_neighbour_roam_state(
 			ngbr_roam_info->neighborRoamState));
@@ -1572,12 +1567,12 @@ static QDF_STATUS csr_neighbor_roam_process_handoff_req(
 	 * proceed with the handoff instead of a redundant scan again.
 	 */
 	if (roam_ctrl_info->handoffReqInfo.src == CONNECT_CMD_USERSPACE) {
-		sms_log(mac_ctx, LOG1,
+		sms_log(mac_ctx, LOGD,
 			FL("Connect cmd with bssid within same ESS"));
 		status = csr_neighbor_roam_prepare_scan_profile_filter(mac_ctx,
 								&scan_filter,
 								session_id);
-		sms_log(mac_ctx, LOG1, FL("Filter creation status = %d"),
+		sms_log(mac_ctx, LOGD, FL("Filter creation status = %d"),
 			status);
 		status = csr_scan_get_result(mac_ctx, &scan_filter,
 					     &scan_result);
@@ -1586,7 +1581,7 @@ static QDF_STATUS csr_neighbor_roam_process_handoff_req(
 		roamable_ap_count = csr_ll_count(
 					&roam_ctrl_info->roamableAPList);
 		csr_free_scan_filter(mac_ctx, &scan_filter);
-		sms_log(mac_ctx, LOG1, FL("roam_now=%d, roamable_ap_count=%d"),
+		sms_log(mac_ctx, LOGD, FL("roam_now=%d, roamable_ap_count=%d"),
 			roam_now, roamable_ap_count);
 	}
 	if (roam_now && roamable_ap_count) {

core/sme/src/csr/csr_roam_preauth.c

@@ -276,10 +276,10 @@ QDF_STATUS csr_neighbor_roam_preauth_rsp_handler(tpAniSirGlobal mac_ctx,
 				mac_ctx, &neighbor_roam_info->roamableAPList,
 				NULL);
 	if ((eSIR_SUCCESS == lim_status) && (NULL != preauth_rsp_node)) {
-		sms_log(mac_ctx, LOG1,
+		sms_log(mac_ctx, LOGD,
 			FL("Preauth completed successfully after %d tries"),
 			neighbor_roam_info->FTRoamInfo.numPreAuthRetries);
-		sms_log(mac_ctx, LOG1,
+		sms_log(mac_ctx, LOGD,
 			FL("After Pre-Auth: BSSID " MAC_ADDRESS_STR ", Ch:%d"),
 			MAC_ADDR_ARRAY(
 				preauth_rsp_node->pBssDescription->bssId),
@@ -746,7 +746,7 @@ QDF_STATUS csr_neighbor_roam_issue_preauth_req(tpAniSirGlobal mac_ctx,
 				neighbor_bss_node->pBssDescription,
 				eCsrPerformPreauth, true);
 
-		sms_log(mac_ctx, LOG1,
+		sms_log(mac_ctx, LOGD,
 			FL("Before Pre-Auth: BSSID " MAC_ADDRESS_STR ", Ch:%d"),
 			MAC_ADDR_ARRAY(
 				neighbor_bss_node->pBssDescription->bssId),

core/sme/src/nan/nan_datapath_api.c

@@ -341,11 +341,7 @@ QDF_STATUS csr_roam_start_ndi(tpAniSirGlobal mac_ctx, uint32_t session,
 						NULL, &bss_cfg, NULL, false);
 	}
 
-	if (QDF_IS_STATUS_SUCCESS(status))
-		sms_log(mac_ctx, LOG1, FL("Profile config is valid"));
-	else
-		sms_log(mac_ctx, LOGE,
-			FL("Profile config is invalid. status = 0x%x"), status);
+	sms_log(mac_ctx, LOGD, FL("profile config validity: %d"), status);
 
 	return status;
 }
@@ -498,7 +494,7 @@ QDF_STATUS csr_process_ndp_initiator_request(tpAniSirGlobal mac_ctx,
 	qdf_mem_copy(&lim_msg->req, req, sizeof(struct ndp_initiator_req));
 
 	self_mac_addr = lim_msg->req.self_ndi_mac_addr.bytes;
-	sms_log(mac_ctx, LOG1, FL("selfMac = "MAC_ADDRESS_STR),
+	sms_log(mac_ctx, LOGD, FL("selfMac = "MAC_ADDRESS_STR),
 		MAC_ADDR_ARRAY(self_mac_addr));
 
 	status = umac_send_mb_message_to_mac(lim_msg);
@@ -551,7 +547,7 @@ QDF_STATUS csr_process_ndp_responder_request(tpAniSirGlobal mac_ctx,
 	qdf_mem_copy(&lim_msg->req, &cmd->u.responder_req,
 			sizeof(struct ndp_responder_req));
 
-	sms_log(mac_ctx, LOG1,
+	sms_log(mac_ctx, LOGD,
 		FL("vdev_id %d ndp_rsp = %d Instance id %d"),
 		lim_msg->req.vdev_id,
 		lim_msg->req.ndp_rsp,

core/sme/src/qos/sme_qos.c

@@ -4195,7 +4195,7 @@ QDF_STATUS sme_qos_process_add_ts_rsp(tpAniSirGlobal pMac, void *pMsgBuf)
 	}
 	pACInfo = &pSession->ac_info[ac];
 	if (SME_QOS_HANDOFF == pACInfo->curr_state) {
-		sms_log(pMac, LOG1,
+		sms_log(pMac, LOGD,
 			FL
 				("ADDTS Response received for AC %d in HANDOFF State.. Dropping"),
 			ac);