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

10 files changed, 125 insertions, 136 deletions

diff --git a/core/sme/src/csr/csr_api_scan.c b/core/sme/src/csr/csr_api_scan.c
index 80565aa5c38f..59b345c4c2c1 100644
--- a/core/sme/src/csr/csr_api_scan.c
+++ b/core/sme/src/csr/csr_api_scan.c
@@ -311,7 +311,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 */
@@ -457,7 +457,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);
 	}
 
@@ -512,7 +512,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);
@@ -545,7 +545,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);
 	}
@@ -596,7 +596,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;
@@ -622,7 +622,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,
@@ -667,7 +667,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;
@@ -1458,7 +1458,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);
@@ -1476,7 +1476,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);
@@ -1659,7 +1659,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 >
@@ -1737,10 +1737,10 @@ csr_parser_scan_result_for_5ghz_preference(tpAniSirGlobal pMac,
 					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;
@@ -1765,13 +1765,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);
@@ -1813,7 +1813,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)
@@ -1834,7 +1834,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,
@@ -2042,7 +2042,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,
@@ -2103,7 +2103,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;
 		}
@@ -2116,7 +2116,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;
 		}
@@ -2149,7 +2149,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. */
@@ -2254,7 +2254,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;
 		}
@@ -2353,7 +2353,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;
@@ -2377,7 +2377,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;
@@ -2507,7 +2507,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;
@@ -2902,7 +2902,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),
@@ -2931,7 +2931,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),
@@ -2957,7 +2957,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 */
@@ -3834,19 +3834,19 @@ 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 = cds_search_and_check_for_session_conc(
 				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:
@@ -4088,7 +4088,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
@@ -4146,7 +4146,7 @@ csr_handle_nxt_cmd(tpAniSirGlobal mac_ctx, tSmeCmd *pCommand,
 		ret = cds_current_connections_update(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);
 		saved_scan_cmd = (tSmeCmd *)mac_ctx->sme.saved_scan_cmd;
 		if (saved_scan_cmd) {
@@ -4244,7 +4244,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_ll_unlock(&mac_ctx->sme.smeScanCmdActiveList);
@@ -4306,10 +4306,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"));
 		}
 	}
@@ -4650,7 +4650,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;
@@ -4759,7 +4759,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
 			(mac_ctx, bssdescr, ies);
@@ -4802,7 +4802,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);
@@ -4841,7 +4841,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;
@@ -5071,12 +5071,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),
@@ -5238,7 +5238,7 @@ static QDF_STATUS csr_send_mb_scan_req(tpAniSirGlobal pMac, uint16_t sessionId,
 	}
 
 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,
@@ -5247,7 +5247,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]);
 	}
 
@@ -5475,7 +5475,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),
@@ -5547,7 +5547,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;
 	}
@@ -5750,7 +5750,7 @@ QDF_STATUS csr_scan_copy_request(tpAniSirGlobal mac_ctx,
 	 * SAP+STA concurrency
 	 */
 	if (cds_is_ibss_conn_exist(&channel)) {
-		sms_log(mac_ctx, LOG1,
+		sms_log(mac_ctx, LOGD,
 			FL("Conc IBSS exist, channel list will be modified"));
 	} else if (cds_is_any_dfs_beaconing_session_present(&channel)) {
 		/*
@@ -5765,7 +5765,7 @@ QDF_STATUS csr_scan_copy_request(tpAniSirGlobal mac_ctx,
 		    wma_get_single_mac_scan_with_dfs_config())
 			channel = 0;
 		else
-			sms_log(mac_ctx, LOG1,
+			sms_log(mac_ctx, LOGD,
 				FL("Conc DFS SAP/GO exist, channel list will be modified"));
 	}
 
@@ -5852,7 +5852,7 @@ void csr_scan_call_callback(tpAniSirGlobal pMac, tSmeCmd *pCommand,
 		if (pCommand->u.scanCmd.abort_scan_indication) {
 			if ((pCommand->u.scanCmd.reason != eCsrScanForSsid) ||
 			   (scanStatus != eCSR_SCAN_SUCCESS)) {
-				sms_log(pMac, LOG1,
+				sms_log(pMac, LOGD,
 				       FL("scanDone due to abort"));
 				scanStatus = eCSR_SCAN_ABORT;
 			}
@@ -5862,7 +5862,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__);
 	}
 }
@@ -6063,7 +6063,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);
@@ -6150,7 +6150,7 @@ void csr_release_scan_command(tpAniSirGlobal pMac, tSmeCmd *pCommand,
 	tDblLinkList *cmd_list = NULL;
 
 	csr_scan_call_callback(pMac, pCommand, scanStatus);
-	sms_log(pMac, LOG1, FL("Remove Scan command reason = %d, scan_id %d"),
+	sms_log(pMac, LOGD, FL("Remove Scan command reason = %d, scan_id %d"),
 		reason, pCommand->u.scanCmd.scanID);
 	cmd_list = &pMac->sme.smeScanCmdActiveList;
 	status = csr_ll_remove_entry(cmd_list, &pCommand->Link, LL_ACCESS_LOCK);
@@ -6398,7 +6398,7 @@ QDF_STATUS csr_scan_for_ssid(tpAniSirGlobal mac_ctx, uint32_t session_id,
 	tCsrSSIDs *ssids = NULL;
 	struct csr_scan_for_ssid_context *context;
 
-	sms_log(mac_ctx, LOG2, FL("called"));
+	sms_log(mac_ctx, LOGD, FL("called"));
 
 	if (!(mac_ctx->scan.fScanEnable) && (num_ssid != 1)) {
 		sms_log(mac_ctx, LOGE,
@@ -6910,7 +6910,7 @@ QDF_STATUS csr_remove_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_abort_command(pMac, pCommand, false);
@@ -7010,7 +7010,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 = cds_send_mb_message_to_mac(msg);
@@ -7220,7 +7220,7 @@ QDF_STATUS csr_scan_save_preferred_network_found(tpAniSirGlobal pMac,
 	qdf_mem_copy((uint8_t *) &pBssDescr->bssId,
 		     (uint8_t *) macHeader->bssId, sizeof(tSirMacAddr));
 	pBssDescr->received_time = (uint64_t)qdf_mc_timer_get_system_time();
-	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 */
@@ -7285,7 +7285,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;
 	}
 
@@ -7294,7 +7294,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;
 	}
 
@@ -7342,9 +7342,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(
@@ -7466,7 +7466,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)
diff --git a/core/sme/src/csr/csr_cmd_process.c b/core/sme/src/csr/csr_cmd_process.c
index 436593606097..1b6378db8de7 100644
--- a/core/sme/src/csr/csr_cmd_process.c
+++ b/core/sme/src/csr/csr_cmd_process.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.
  *
@@ -59,7 +59,7 @@ QDF_STATUS csr_msg_processor(tpAniSirGlobal mac_ctx, void *msg_buf)
 	uint8_t session_id = sme_rsp->sessionId;
 	eCsrRoamState cur_state = mac_ctx->roam.curState[session_id];
 
-	sms_log(mac_ctx, LOG2,
+	sms_log(mac_ctx, LOGD,
 		FL("msg %d[0x%04X] recvd in curstate %s & substate %s id(%d)"),
 		sme_rsp->messageType, sme_rsp->messageType,
 		mac_trace_getcsr_roam_state(cur_state),
diff --git a/core/sme/src/csr/csr_host_scan_roam.c b/core/sme/src/csr/csr_host_scan_roam.c
index cfe5cbc431d8..5bee63c8a015 100644
--- a/core/sme/src/csr/csr_host_scan_roam.c
+++ b/core/sme/src/csr/csr_host_scan_roam.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2017 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -215,7 +215,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;
 				}
@@ -259,7 +259,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);
@@ -470,7 +470,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 !=
@@ -519,7 +519,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));
 
@@ -557,7 +557,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));
 
@@ -729,7 +729,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));
@@ -741,7 +741,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));
@@ -753,7 +753,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));
@@ -762,7 +762,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));
 	}
diff --git a/core/sme/src/csr/csr_neighbor_roam.c b/core/sme/src/csr/csr_neighbor_roam.c
index bc4031c9eb46..0cf126192c6f 100644
--- a/core/sme/src/csr/csr_neighbor_roam.c
+++ b/core/sme/src/csr/csr_neighbor_roam.c
@@ -121,7 +121,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));
@@ -163,7 +163,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;
@@ -188,7 +188,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;
@@ -229,7 +229,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 {
@@ -238,11 +238,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;
 }
@@ -442,7 +442,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,
@@ -759,12 +759,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) {
diff --git a/core/sme/src/csr/csr_roam_preauth.c b/core/sme/src/csr/csr_roam_preauth.c
index 05da974b83da..ba992703d3d3 100644
--- a/core/sme/src/csr/csr_roam_preauth.c
+++ b/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),
diff --git a/core/sme/src/csr/csr_tdls_process.c b/core/sme/src/csr/csr_tdls_process.c
index 063f24c9019f..c56331f961dd 100644
--- a/core/sme/src/csr/csr_tdls_process.c
+++ b/core/sme/src/csr/csr_tdls_process.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2017 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -130,7 +130,7 @@ QDF_STATUS csr_tdls_send_mgmt_req(tHalHandle hHal, uint8_t sessionId,
 	tdlsSendMgmtCmd->u.tdlsCmd.size = sizeof(tTdlsSendMgmtCmdInfo);
 	sme_push_command(pMac, tdlsSendMgmtCmd, false);
 	status = QDF_STATUS_SUCCESS;
-	sms_log(pMac, LOG1,
+	sms_log(pMac, LOGD,
 		FL("Successfully posted eSmeCommandTdlsSendMgmt to SME"));
 	return status;
 }
@@ -204,7 +204,7 @@ QDF_STATUS csr_tdls_change_peer_sta(tHalHandle hHal, uint8_t sessionId,
 				sizeof(tTdlsAddStaCmdInfo);
 			sme_push_command(pMac, tdlsAddStaCmd, false);
 			status = QDF_STATUS_SUCCESS;
-			sms_log(pMac, LOG1,
+			sms_log(pMac, LOGD,
 			FL("Successfully posted eSmeCommandTdlsAddPeer to SME to modify peer "));
 		}
 	}
@@ -276,7 +276,7 @@ QDF_STATUS csr_tdls_send_link_establish_params(tHalHandle hHal,
 				sizeof(tTdlsLinkEstablishCmdInfo);
 			sme_push_command(pMac, tdlsLinkEstablishCmd, false);
 			status = QDF_STATUS_SUCCESS;
-			sms_log(pMac, LOG1,
+			sms_log(pMac, LOGD,
 			FL("Successfully posted eSmeCommandTdlsLinkEstablish to SME"));
 		}
 	}
@@ -315,7 +315,7 @@ QDF_STATUS csr_tdls_add_peer_sta(tHalHandle hHal, uint8_t sessionId,
 				sizeof(tTdlsAddStaCmdInfo);
 			sme_push_command(pMac, tdlsAddStaCmd, false);
 			status = QDF_STATUS_SUCCESS;
-			sms_log(pMac, LOG1,
+			sms_log(pMac, LOGD,
 			FL("Successfully posted eSmeCommandTdlsAddPeer to SME"));
 		}
 	}
@@ -353,7 +353,7 @@ QDF_STATUS csr_tdls_del_peer_sta(tHalHandle hHal, uint8_t sessionId,
 				sizeof(tTdlsDelStaCmdInfo);
 			sme_push_command(pMac, tdlsDelStaCmd, false);
 			status = QDF_STATUS_SUCCESS;
-			sms_log(pMac, LOG1,
+			sms_log(pMac, LOGD,
 			FL("Successfully posted eSmeCommandTdlsDelPeer to SME"));
 		}
 	}
@@ -434,7 +434,7 @@ static QDF_STATUS csr_tdls_process_send_mgmt(tpAniSirGlobal pMac, tSmeCmd *cmd)
 
 	}
 	/* Send the request to PE. */
-	sms_log(pMac, LOG1, FL("sending TDLS Mgmt Frame req to PE "));
+	sms_log(pMac, LOGD, FL("sending TDLS Mgmt Frame req to PE "));
 	status = tdls_send_message(pMac, eWNI_SME_TDLS_SEND_MGMT_REQ,
 				   (void *)tdlsSendMgmtReq,
 				   sizeof(tSirTdlsSendMgmtReq) +
@@ -563,7 +563,7 @@ static QDF_STATUS csr_tdls_process_del_sta(tpAniSirGlobal pMac, tSmeCmd *cmd)
 			 &tdlsDelStaCmdInfo->peermac);
 
 	/* Send the request to PE. */
-	sms_log(pMac, LOG1,
+	sms_log(pMac, LOGD,
 		"sending TDLS Del Sta " MAC_ADDRESS_STR " req to PE",
 		MAC_ADDR_ARRAY(tdlsDelStaCmdInfo->peermac.bytes));
 	status = tdls_send_message(pMac, eWNI_SME_TDLS_DEL_STA_REQ,
diff --git a/core/sme/src/nan/nan_datapath_api.c b/core/sme/src/nan/nan_datapath_api.c
index 9d09ab08c92c..cf5c1c8da9a3 100644
--- a/core/sme/src/nan/nan_datapath_api.c
+++ b/core/sme/src/nan/nan_datapath_api.c
@@ -339,11 +339,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;
 }
@@ -495,7 +491,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 = cds_send_mb_message_to_mac(lim_msg);
@@ -548,7 +544,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,
diff --git a/core/sme/src/p2p/p2p_api.c b/core/sme/src/p2p/p2p_api.c
index 60a7aff3d494..3ddf740518da 100644
--- a/core/sme/src/p2p/p2p_api.c
+++ b/core/sme/src/p2p/p2p_api.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2017 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -157,7 +157,7 @@ QDF_STATUS sme_remain_on_chn_ready(tHalHandle hHal, uint8_t *pMsg)
 		sms_log(pMac, LOGE, FL("No cmd found in active list."));
 		return status;
 	}
-	sms_log(pMac, LOG1,
+	sms_log(pMac, LOGD,
 		FL("Ready Ind %d %d"), rsp->session_id, rsp->scan_id);
 	pCommand = GET_BASE_ADDR(pEntry, tSmeCmd, Link);
 	if (eSmeCommandRemainOnChannel == pCommand->command) {
@@ -280,8 +280,6 @@ QDF_STATUS p2p_remain_on_channel(tHalHandle hHal, uint8_t sessionId,
 		status = csr_queue_sme_command(pMac, pRemainChlCmd, false);
 	} while (0);
 
-	sms_log(pMac, LOGW, "exiting function %s", __func__);
-
 	return status;
 }
 
diff --git a/core/sme/src/qos/sme_qos.c b/core/sme/src/qos/sme_qos.c
index 3ee47d21cc6f..5633e4d82158 100644
--- a/core/sme/src/qos/sme_qos.c
+++ b/core/sme/src/qos/sme_qos.c
@@ -4178,7 +4178,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);
diff --git a/core/sme/src/rrm/sme_rrm.c b/core/sme/src/rrm/sme_rrm.c
index 559f525aeb4e..44536b65d4e7 100644
--- a/core/sme/src/rrm/sme_rrm.c
+++ b/core/sme/src/rrm/sme_rrm.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.
  *
@@ -128,7 +128,7 @@ static void rrm_indicate_neighbor_report_result(tpAniSirGlobal pMac,
 	    qdf_mc_timer_get_current_state(&pMac->rrm.rrmSmeContext.
 					   neighborReqControlInfo.
 					   neighborRspWaitTimer)) {
-		sms_log(pMac, LOG1, FL("No entry in neighbor report cache"));
+		sms_log(pMac, LOGD, FL("No entry in neighbor report cache"));
 		qdf_mc_timer_stop(&pMac->rrm.rrmSmeContext.
 				  neighborReqControlInfo.neighborRspWaitTimer);
 	}
@@ -220,7 +220,7 @@ sme_rrm_send_beacon_report_xmit_ind(tpAniSirGlobal mac_ctx,
 			qdf_mem_copy(
 				&beacon_rep->pBssDescription[i]->ieFields[0],
 				bss_desc->ieFields, ie_len);
-			sms_log(mac_ctx, LOG1,
+			sms_log(mac_ctx, LOGD,
 				".RRM Result Bssid = " MAC_ADDRESS_STR
 				" chan= %d, rssi = -%d",
 				MAC_ADDR_ARRAY(
@@ -238,16 +238,16 @@ sme_rrm_send_beacon_report_xmit_ind(tpAniSirGlobal mac_ctx,
 		if (!result_arr || (cur_result == NULL)
 			|| (j >= bss_count)) {
 			cur_result = NULL;
-			sms_log(mac_ctx, LOG1,
+			sms_log(mac_ctx, LOGD,
 				"Reached to  max/last BSS in cur_result list");
 		} else {
 			cur_result = result_arr[j];
-			sms_log(mac_ctx, LOG1,
+			sms_log(mac_ctx, LOGD,
 				"Move to the next BSS set in cur_result list");
 		}
 		beacon_rep->fMeasureDone =
 			(cur_result) ? false : msrmnt_status;
-		sms_log(mac_ctx, LOG1,
+		sms_log(mac_ctx, LOGD,
 			"SME Sending BcnRepXmit to PE numBss %d i %d j %d",
 			beacon_rep->numBssDesc, i, j);
 		status = cds_send_mb_message_to_mac(beacon_rep);
@@ -320,7 +320,7 @@ static QDF_STATUS sme_ese_send_beacon_req_scan_results(
 		if (NULL != cur_meas_req)
 			bcn_report->measurementToken =
 				cur_meas_req->measurementToken;
-		sms_log(mac_ctx, LOG1, "Channel(%d) MeasToken(%d)", channel,
+		sms_log(mac_ctx, LOGD, "Channel(%d) MeasToken(%d)", channel,
 			bcn_report->measurementToken);
 
 		j = 0;
@@ -360,7 +360,7 @@ static QDF_STATUS sme_ese_send_beacon_req_scan_results(
 				continue;
 			bcn_report->bcnRepBssInfo[j].ieLen = out_ie_len;
 
-			sms_log(mac_ctx, LOG1, "Bssid(" MAC_ADDRESS_STR")"
+			sms_log(mac_ctx, LOGD, "Bssid(" MAC_ADDRESS_STR")"
 				"Channel=%d Rssi=%d",
 				MAC_ADDR_ARRAY(bss_desc->bssId),
 			bss_desc->channelId, (-1) * bss_desc->rssi);
@@ -385,7 +385,7 @@ static QDF_STATUS sme_ese_send_beacon_req_scan_results(
 		bcn_report->flag =
 			(msrmnt_status << 1) | ((cur_result) ? true : false);
 
-		sms_log(mac_ctx, LOG1, "SME Sending BcnRep to HDD numBss(%d)"
+		sms_log(mac_ctx, LOGD, "SME Sending BcnRep to HDD numBss(%d)"
 			" j(%d) bss_counter(%d) flag(%d)",
 			bcn_report->numBss, j, bss_counter,
 			bcn_report->flag);
@@ -465,7 +465,7 @@ static QDF_STATUS sme_rrm_send_scan_result(tpAniSirGlobal mac_ctx,
 	 */
 	if (QDF_STATUS_E_FAILURE == csr_roam_get_session_id_from_bssid(mac_ctx,
 			&rrm_ctx->sessionBssId, &session_id)) {
-		sms_log(mac_ctx, LOG1,
+		sms_log(mac_ctx, LOGD,
 			FL("BSSID mismatch, using current session_id"));
 		session_id = mac_ctx->roam.roamSession->sessionId;
 	}
@@ -475,7 +475,7 @@ static QDF_STATUS sme_rrm_send_scan_result(tpAniSirGlobal mac_ctx,
 	if (filter.SSIDs.SSIDList)
 		qdf_mem_free(filter.SSIDs.SSIDList);
 
-	sms_log(mac_ctx, LOG1, FL("RRM Measurement Done %d"), measurementdone);
+	sms_log(mac_ctx, LOGD, FL("RRM Measurement Done %d"), measurementdone);
 	if (NULL == result_handle) {
 		/*
 		 * no scan results
@@ -529,7 +529,7 @@ static QDF_STATUS sme_rrm_send_scan_result(tpAniSirGlobal mac_ctx,
 
 	while (scan_results) {
 		next_result = sme_scan_result_get_next(mac_ctx, result_handle);
-		sms_log(mac_ctx, LOG1, "Scan res timer:%lu, rrm scan timer:%llu",
+		sms_log(mac_ctx, LOGD, "Scan res timer:%lu, rrm scan timer:%llu",
 				scan_results->timer, rrm_scan_timer);
 		if (scan_results->timer >= rrm_scan_timer) {
 			roam_info->pBssDesc = &scan_results->BssDescriptor;
@@ -553,7 +553,7 @@ static QDF_STATUS sme_rrm_send_scan_result(tpAniSirGlobal mac_ctx,
 	 * The next level routine does a check for the measurementDone to
 	 * determine whether to send a report or not.
 	 */
-	sms_log(mac_ctx, LOG1, FL(" Number of BSS Desc with RRM Scan %d "),
+	sms_log(mac_ctx, LOGD, FL(" Number of BSS Desc with RRM Scan %d "),
 			counter);
 	if (counter || measurementdone) {
 #ifdef FEATURE_WLAN_ESE
@@ -617,7 +617,7 @@ static QDF_STATUS sme_rrm_scan_request_callback(tHalHandle halHandle,
 		interval =
 			time_tick % (pSmeRrmContext->randnIntvl - 10 + 1) + 10;
 
-		sms_log(pMac, LOG1, "Set timer for interval %d ", interval);
+		sms_log(pMac, LOGD, "Set timer for interval %d ", interval);
 		qdf_mc_timer_start(&pSmeRrmContext->IterMeasTimer, interval);
 
 	} else {
@@ -708,7 +708,7 @@ static QDF_STATUS sme_rrm_issue_scan_req(tpAniSirGlobal mac_ctx)
 		else
 			scan_req.maxChnTime = sme_rrm_ctx->duration[0];
 
-		sms_log(mac_ctx, LOG1, FL("Scan Type(%d) Max Dwell Time(%d)"),
+		sms_log(mac_ctx, LOGD, FL("Scan Type(%d) Max Dwell Time(%d)"),
 				scan_req.scanType, scan_req.maxChnTime);
 		/*
 		 * Use gPassive/gActiveMaxChannelTime if maxChanTime is less
@@ -723,7 +723,7 @@ static QDF_STATUS sme_rrm_issue_scan_req(tpAniSirGlobal mac_ctx)
 
 		if (scan_req.maxChnTime < max_chan_time) {
 			scan_req.maxChnTime = max_chan_time;
-			sms_log(mac_ctx, LOG1,
+			sms_log(mac_ctx, LOGD,
 				FL("Setting default max %d ChanTime"),
 				max_chan_time);
 		}
@@ -739,7 +739,7 @@ static QDF_STATUS sme_rrm_issue_scan_req(tpAniSirGlobal mac_ctx)
 		 * 1 second apart.
 		 */
 		current_time = (uint64_t)qdf_mc_timer_get_system_time();
-		sms_log(mac_ctx, LOG1, "prev scan triggered before %llu ms, totalchannels %d",
+		sms_log(mac_ctx, LOGD, "prev scan triggered before %llu ms, totalchannels %d",
 				current_time - rrm_scan_timer,
 				sme_rrm_ctx->channelList.numOfChannels);
 		if ((abs(current_time - rrm_scan_timer) > 1000) &&
@@ -758,7 +758,7 @@ static QDF_STATUS sme_rrm_issue_scan_req(tpAniSirGlobal mac_ctx)
 		scan_req.ChannelInfo.ChannelList =
 			&sme_rrm_ctx->channelList.ChannelList[
 				sme_rrm_ctx->currentIndex];
-		sms_log(mac_ctx, LOG1, FL("Duration %d On channel %d "),
+		sms_log(mac_ctx, LOGD, FL("Duration %d On channel %d "),
 			scan_req.maxChnTime,
 			sme_rrm_ctx->channelList.ChannelList[
 				sme_rrm_ctx->currentIndex]);
@@ -832,7 +832,7 @@ QDF_STATUS sme_rrm_process_beacon_report_req_ind(tpAniSirGlobal pMac, void *pMsg
 	uint32_t len = 0, i = 0;
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 
-	sms_log(pMac, LOG1, "Received Beacon report request ind Channel = %d",
+	sms_log(pMac, LOGD, "Received Beacon report request ind Channel = %d",
 		pBeaconReq->channelInfo.channelNum);
 	/* section 11.10.8.1 (IEEE Std 802.11k-2008) */
 	/* channel 0 and 255 has special meaning. */
@@ -916,7 +916,7 @@ QDF_STATUS sme_rrm_process_beacon_report_req_ind(tpAniSirGlobal pMac, void *pMsg
 		     (uint8_t *) &pBeaconReq->measurementDuration,
 		     SIR_ESE_MAX_MEAS_IE_REQS);
 
-	sms_log(pMac, LOG1,
+	sms_log(pMac, LOGD,
 		FL("token %d regClass %d randnIntvl %d msgSource %d"),
 		pSmeRrmContext->token, pSmeRrmContext->regClass,
 		pSmeRrmContext->randnIntvl, pSmeRrmContext->msgSource);
@@ -945,7 +945,7 @@ QDF_STATUS sme_rrm_neighbor_report_request(tpAniSirGlobal pMac, uint8_t sessionI
 	tpSirNeighborReportReqInd pMsg;
 	tCsrRoamSession *pSession;
 
-	sms_log(pMac, LOG1,
+	sms_log(pMac, LOGD,
 		FL("Request to send Neighbor report request received "));
 	if (!CSR_IS_SESSION_VALID(pMac, sessionId)) {
 		sms_log(pMac, LOGE, FL("Invalid session %d"), sessionId);
@@ -1212,7 +1212,7 @@ static QDF_STATUS sme_rrm_process_neighbor_report(tpAniSirGlobal pMac,
 			     &pNeighborRpt->sNeighborBssDescription[i],
 			     sizeof(tSirNeighborBssDescription));
 
-		sms_log(pMac, LOG1,
+		sms_log(pMac, LOGD,
 			"Received neighbor report with Neighbor BSSID: "
 			MAC_ADDRESS_STR,
 			MAC_ADDR_ARRAY(
@@ -1298,7 +1298,7 @@ QDF_STATUS sme_rrm_msg_processor(tpAniSirGlobal pMac, uint16_t msg_type,
 static void rrm_iter_meas_timer_handle(void *userData)
 {
 	tpAniSirGlobal pMac = (tpAniSirGlobal) userData;
-	sms_log(pMac, LOGE,
+	sms_log(pMac, LOGW,
 		"Randomization timer expired...send on next channel ");
 	/* Issue a scan req for next channel. */
 	sme_rrm_issue_scan_req(pMac);
@@ -1315,7 +1315,7 @@ static void rrm_iter_meas_timer_handle(void *userData)
 static void rrm_neighbor_rsp_timeout_handler(void *userData)
 {
 	tpAniSirGlobal pMac = (tpAniSirGlobal) userData;
-	sms_log(pMac, LOGE, "Neighbor Response timed out ");
+	sms_log(pMac, LOGW, "Neighbor Response timed out ");
 	rrm_indicate_neighbor_report_result(pMac, QDF_STATUS_E_FAILURE);
 	return;
 }