ソースを参照

qcacld-3.0: Use QDF_MAC_ADDR_FMT to print the mac_address in lim

Use QDF_MAC_ADDR_FMT macro to print the mac_address instead of
using lim_print_mac_addr() API

Change-Id: If7261874639bf14e2f6b1c05ab8134b6a62c22e4
CRs-Fixed: 3401115
Deeksha Gupta 2 年 前
コミット
7d4c44c1df

+ 4 - 4
core/mac/src/pe/lim/lim_api.c

@@ -2911,8 +2911,8 @@ pe_roam_synch_callback(struct mac_context *mac_ctx,
 					   session_ptr->bssType,
 					   session_ptr->vdev_id);
 	if (!ft_session_ptr) {
-		pe_err("LFR3:Cannot create PE Session");
-		lim_print_mac_addr(mac_ctx, bss_desc->bssId, LOGE);
+		pe_err("LFR3:Cannot create PE Session bssid: "QDF_MAC_ADDR_FMT,
+		       QDF_MAC_ADDR_REF(bss_desc->bssId));
 		qdf_mem_free(bss_desc);
 		return status;
 	}
@@ -3267,8 +3267,8 @@ void lim_mon_init_session(struct mac_context *mac_ptr,
 					   eSIR_MONITOR_MODE,
 					   msg->vdev_id);
 	if (!psession_entry) {
-		pe_err("Monitor mode: Session Can not be created");
-		lim_print_mac_addr(mac_ptr, msg->bss_id.bytes, LOGE);
+		pe_err("Monitor mode: Session Can not be created bssid: "
+			QDF_MAC_ADDR_FMT, QDF_MAC_ADDR_REF(msg->bss_id.bytes));
 		return;
 	}
 	psession_entry->vhtCapability = 1;

+ 2 - 3
core/mac/src/pe/lim/lim_assoc_utils.c

@@ -3033,9 +3033,8 @@ void lim_handle_cnf_wait_timeout(struct mac_context *mac, uint16_t staId)
 
 	switch (sta->mlmStaContext.mlmState) {
 	case eLIM_MLM_WT_ASSOC_CNF_STATE:
-		pe_debug("Did not receive Assoc Cnf in eLIM_MLM_WT_ASSOC_CNF_STATE sta Assoc id %d",
-				sta->assocId);
-		lim_print_mac_addr(mac, sta->staAddr, LOGD);
+		pe_debug("Did not receive Assoc Cnf in eLIM_MLM_WT_ASSOC_CNF_STATE sta Assoc id %d and STA: "QDF_MAC_ADDR_FMT,
+			 sta->assocId, QDF_MAC_ADDR_REF(sta->staAddr));
 
 		if (LIM_IS_AP_ROLE(pe_session)) {
 			lim_reject_association(mac, sta->staAddr,

+ 6 - 7
core/mac/src/pe/lim/lim_ft_preauth.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2016-2021 The Linux Foundation. All rights reserved.
- * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -329,8 +329,8 @@ QDF_STATUS lim_ft_setup_auth_session(struct mac_context *mac,
 		pe_find_session_by_bssid(mac, pe_session->limReAssocbssId,
 					 &sessionId);
 	if (!ft_session) {
-		pe_err("No session found for bssid");
-		lim_print_mac_addr(mac, pe_session->limReAssocbssId, LOGE);
+		pe_err("No session found for bssid: "QDF_MAC_ADDR_FMT,
+			QDF_MAC_ADDR_REF(pe_session->limReAssocbssId));
 		return QDF_STATUS_E_FAILURE;
 	}
 
@@ -478,13 +478,12 @@ void lim_handle_ft_pre_auth_rsp(struct mac_context *mac, QDF_STATUS status,
 		else
 			ft_session->vdev_nss = mac->vdev_type_nss_5g.sta;
 
-		pe_debug("created session (%pK) with id = %d",
-			ft_session, ft_session->peSessionId);
-
 		/* Update the ReAssoc BSSID of the current session */
 		sir_copy_mac_addr(pe_session->limReAssocbssId,
 				  pbssDescription->bssId);
-		lim_print_mac_addr(mac, pe_session->limReAssocbssId, LOGD);
+		pe_debug("created session (%pK) with id = %d BSSID = "QDF_MAC_ADDR_FMT,
+			 ft_session, ft_session->peSessionId,
+			 QDF_MAC_ADDR_REF(pe_session->limReAssocbssId));
 	}
 send_rsp:
 	if ((pe_session->curr_op_freq !=