فهرست منبع

qcacld-3.0: Replace sms_log() with sme_* log levels in csr_host_scan_roam.c

Replace sms_log() with sme_* appropriate log levels in csr_host_scan_roam.c.

Change-Id: I3076cfadab4917ae14cd1d9d7277677bc711a272
CRs-Fixed: 2020798
Srinivas Girigowda 8 سال پیش
والد
کامیت
62178eca9b
1فایلهای تغییر یافته به همراه27 افزوده شده و 51 حذف شده
  1. 27 51
      core/sme/src/csr/csr_host_scan_roam.c

+ 27 - 51
core/sme/src/csr/csr_host_scan_roam.c

@@ -81,7 +81,7 @@ QDF_STATUS csr_roam_issue_reassociate_cmd(tpAniSirGlobal pMac,
 	if (pEntry) {
 		pCommand = GET_BASE_ADDR(pEntry, tSmeCmd, Link);
 		if (!pCommand) {
-			sms_log(pMac, LOGE, FL(" fail to get command buffer"));
+			sme_err("fail to get command buffer");
 			return QDF_STATUS_E_RESOURCES;
 		}
 		if (eSmeCommandRoam == pCommand->command) {
@@ -92,15 +92,13 @@ QDF_STATUS csr_roam_issue_reassociate_cmd(tpAniSirGlobal pMac,
 							    pEntry,
 							    LL_ACCESS_LOCK);
 			else
-				sms_log(pMac, LOGE,
-					FL(" Unexpected  roam cmd present"));
+				sme_err("Unexpected roam cmd present");
 			if (fRemoveCmd == false)
 				pCommand = NULL;
 		}
 	}
 	if (NULL == pCommand) {
-		sms_log(pMac, LOGE,
-			FL(" fail to get cmd buf based on prev roam command"));
+		sme_err("fail to get cmd buf based on prev roam command");
 		return QDF_STATUS_E_RESOURCES;
 	}
 	do {
@@ -115,8 +113,7 @@ QDF_STATUS csr_roam_issue_reassociate_cmd(tpAniSirGlobal pMac,
 		pCommand->u.roamCmd.roamReason = eCsrSmeIssuedFTReassoc;
 		status = csr_queue_sme_command(pMac, pCommand, fHighPriority);
 		if (!QDF_IS_STATUS_SUCCESS(status)) {
-			sms_log(pMac, LOGE,
-				FL("fail to send message status=%d"), status);
+			sme_err("fail to send message status: %d", status);
 			csr_release_command(pMac, pCommand);
 		}
 	} while (0);
@@ -214,7 +211,7 @@ void csr_neighbor_roam_process_scan_results(tpAniSirGlobal mac_ctx,
 				if (conc_channel &&
 				   (conc_channel !=
 				   scan_result->BssDescriptor.channelId)) {
-					sms_log(mac_ctx, LOGD, FL("MCC not supported so Ignore AP on channel %d"),
+					sme_debug("MCC not supported so Ignore AP on channel %d",
 					  scan_result->BssDescriptor.channelId);
 					continue;
 				}
@@ -239,8 +236,7 @@ void csr_neighbor_roam_process_scan_results(tpAniSirGlobal mac_ctx,
 			if ((n_roam_info->is11rAssoc) &&
 			    (!csr_neighbor_roam_is_preauth_candidate(mac_ctx,
 					sessionid, descr->bssId))) {
-				sms_log(mac_ctx, LOGE,
-					FL("BSSID in preauth faillist.Ignore"));
+				sme_err("BSSID in preauth fail list. Ignore");
 				continue;
 			}
 
@@ -249,8 +245,7 @@ void csr_neighbor_roam_process_scan_results(tpAniSirGlobal mac_ctx,
 			    (n_roam_info->isESEAssoc) &&
 			    !csr_neighbor_roam_is_preauth_candidate(mac_ctx,
 				sessionid, descr->bssId)) {
-				sms_log(mac_ctx, LOGE,
-					FL("BSSID in preauth faillist.Ignore"));
+				sme_err("BSSID in preauth faillist. Ignore");
 				continue;
 			}
 
@@ -258,8 +253,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, LOGD,
-					FL("New QBSS=%s,BWavail=0x%x,req=0x%x"),
+				sme_debug("New QBSS=%s,BWavail=0x%x,req=0x%x",
 					((qpresent) ? "yes" : "no"), qavail,
 					n_roam_info->MinQBssLoadRequired);
 			if (voadmitted && qpresent &&
@@ -287,8 +281,7 @@ void csr_neighbor_roam_process_scan_results(tpAniSirGlobal mac_ctx,
 			if (csr_roam_is_fast_roam_enabled(mac_ctx, sessionid) &&
 			    !csr_neighbor_roam_is_preauth_candidate(mac_ctx,
 				sessionid, descr->bssId)) {
-				sms_log(mac_ctx, LOGE,
-					FL("BSSID in preauth faillist Ignore"));
+				sme_err("BSSID in preauth faillist Ignore");
 				continue;
 			}
 
@@ -309,8 +302,7 @@ void csr_neighbor_roam_process_scan_results(tpAniSirGlobal mac_ctx,
 			bss_info =
 				qdf_mem_malloc(sizeof(tCsrNeighborRoamBSSInfo));
 			if (NULL == bss_info) {
-				sms_log(mac_ctx, LOGE,
-					FL("Memory alloc fail. Ignored cnd."));
+				sme_err("Memory alloc fail");
 				continue;
 			}
 			bss_info->pBssDescription =
@@ -320,8 +312,7 @@ void csr_neighbor_roam_process_scan_results(tpAniSirGlobal mac_ctx,
 				qdf_mem_copy(bss_info->pBssDescription, descr,
 					descr->length + sizeof(descr->length));
 			} else {
-				sms_log(mac_ctx, LOGE,
-					FL("Mem alloc failed. Ignore cand."));
+				sme_err("Memory alloc fail");
 				qdf_mem_free(bss_info);
 				continue;
 			}
@@ -377,7 +368,7 @@ void csr_neighbor_roam_trigger_handoff(tpAniSirGlobal mac_ctx,
 	if (csr_roam_is_fast_roam_enabled(mac_ctx, session_id))
 		csr_neighbor_roam_issue_preauth_req(mac_ctx, session_id);
 	else
-		sms_log(mac_ctx, LOGE, FL("Roaming is disabled"));
+		sme_err("Roaming is disabled");
 }
 
 /**
@@ -400,20 +391,16 @@ QDF_STATUS csr_neighbor_roam_process_scan_complete(tpAniSirGlobal pMac,
 	hstatus = csr_neighbor_roam_prepare_scan_profile_filter(pMac,
 								&scanFilter,
 								sessionId);
-	sms_log(pMac, LOGW,
-		FL("Prepare scan to find neighbor AP filter status  = %d"),
+	sme_debug("Prepare scan to find neighbor AP filter status: %d",
 		hstatus);
 	if (QDF_STATUS_SUCCESS != hstatus) {
-		sms_log(pMac, LOGE,
-			FL("Scan Filter prep fail for Assoc %d Bail out"),
+		sme_err("Scan Filter prep fail for Assoc %d Bail out",
 			tempVal);
 		return QDF_STATUS_E_FAILURE;
 	}
 	hstatus = csr_scan_get_result(pMac, &scanFilter, &scanResult);
 	if (hstatus != QDF_STATUS_SUCCESS) {
-		sms_log(pMac, LOGE,
-			FL("Get Scan Result status code %d"),
-			hstatus);
+		sme_err("Get Scan Result status code %d", hstatus);
 	}
 	/* Process the scan results and update roamable AP list */
 	csr_neighbor_roam_process_scan_results(pMac, sessionId, &scanResult);
@@ -469,14 +456,13 @@ QDF_STATUS csr_neighbor_roam_candidate_found_ind_hdlr(tpAniSirGlobal pMac,
 		&pMac->roam.neighborRoamInfo[sessionId];
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 
-	sms_log(pMac, LOGD, FL("Received indication from firmware"));
+	sme_debug("Received indication from firmware");
 
 	/* we must be in connected state, if not ignore it */
 	if ((eCSR_NEIGHBOR_ROAM_STATE_CONNECTED !=
 	     pNeighborRoamInfo->neighborRoamState)
 	    || (pNeighborRoamInfo->uOsRequestedHandoff)) {
-		sms_log(pMac, LOGE,
-			FL("Recvd in NotCONNECTED or OsReqHandoff. Ignore"));
+		sme_err("Recvd in NotCONNECTED or OsReqHandoff. Ignore");
 		status = QDF_STATUS_E_FAILURE;
 	} else {
 		/* Firmware indicated that roaming candidate is found. Beacons
@@ -494,8 +480,7 @@ QDF_STATUS csr_neighbor_roam_candidate_found_ind_hdlr(tpAniSirGlobal pMac,
 		status = csr_neighbor_roam_process_scan_complete(pMac,
 								 sessionId);
 		if (QDF_STATUS_SUCCESS != status) {
-			sms_log(pMac, LOGE,
-				FL("scan process complete failed, status %d"),
+			sme_err("scan process complete failed, status %d",
 				status);
 			return QDF_STATUS_E_FAILURE;
 		}
@@ -518,8 +503,7 @@ void csr_neighbor_roam_free_roamable_bss_list(tpAniSirGlobal mac_ctx,
 {
 	tpCsrNeighborRoamBSSInfo result = NULL;
 
-	sms_log(mac_ctx, LOGD,
-		FL("Emptying the BSS list. Current count = %d"),
+	sme_debug("Emptying the BSS list. Current count: %d",
 		csr_ll_count(llist));
 
 	/*
@@ -556,8 +540,7 @@ bool csr_neighbor_roam_remove_roamable_ap_list_entry(tpAniSirGlobal pMac,
 					   LL_ACCESS_LOCK);
 	}
 
-	sms_log(pMac, LOGD,
-		FL("Remove neigh BSS node from fail list. Current count = %d"),
+	sme_debug("Remove neigh BSS node from fail list. Current count: %d",
 		csr_ll_count(pList));
 
 	return false;
@@ -622,8 +605,7 @@ void csr_neighbor_roam_request_handoff(tpAniSirGlobal mac_ctx,
 
 	if (neighbor_roam_info->neighborRoamState !=
 		eCSR_NEIGHBOR_ROAM_STATE_PREAUTH_DONE) {
-		sms_log(mac_ctx, LOGE,
-			FL("Roam requested when Neighbor roam is in %s state"),
+		sme_err("Roam requested when Neighbor roam is in %s state",
 			mac_trace_get_neighbour_roam_state(
 			neighbor_roam_info->neighborRoamState));
 		return;
@@ -671,15 +653,13 @@ void csr_neighbor_roam_request_handoff(tpAniSirGlobal mac_ctx,
 	neighbor_roam_info->csrNeighborRoamProfile.ChannelInfo.ChannelList[0] =
 		handoff_node.pBssDescription->channelId;
 
-	sms_log(mac_ctx, LOGW,
-		" csr_roamHandoffRequested: disassociating with current AP");
+	sme_debug("csr_roamHandoffRequested: disassociating with current AP");
 
 	if (!QDF_IS_STATUS_SUCCESS
 		    (csr_roam_issue_disassociate_cmd
 			    (mac_ctx, session_id,
 			    eCSR_DISCONNECT_REASON_HANDOFF))) {
-		sms_log(mac_ctx, LOGW,
-			"csr_roamHandoffRequested:  fail to issue disassoc");
+		sme_warn("csr_roamHandoffRequested: fail to issue disassoc");
 		return;
 	}
 	/* notify HDD for handoff, providing the BSSID too */
@@ -728,8 +708,7 @@ bool csr_neighbor_roam_get_handoff_ap_info(tpAniSirGlobal pMac,
 			pMac,
 			&ngbr_roam_info->FTRoamInfo.preAuthDoneList,
 			NULL);
-		sms_log(pMac, LOGD,
-			FL("Number of Handoff candidates = %d"),
+		sme_debug("Number of Handoff candidates: %d",
 			csr_ll_count(&
 				ngbr_roam_info->FTRoamInfo.preAuthDoneList));
 	} else
@@ -740,8 +719,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, LOGD,
-			FL("Number of Handoff candidates = %d"),
+		sme_debug("Number of Handoff candidates: %d",
 			csr_ll_count(&ngbr_roam_info->FTRoamInfo.
 			preAuthDoneList));
 	} else
@@ -752,8 +730,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, LOGD,
-			FL("Number of Handoff candidates = %d"),
+		sme_debug("Number of Handoff candidates: %d",
 			csr_ll_count(
 				&ngbr_roam_info->FTRoamInfo.preAuthDoneList));
 	} else {
@@ -761,8 +738,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, LOGD,
-			FL("Number of Handoff candidates = %d"),
+		sme_debug("Number of Handoff candidates: %d",
 			csr_ll_count(&ngbr_roam_info->roamableAPList));
 	}
 	if (NULL == bss_node)