qcacld-3.0: Replace QDF_FULL_MAC_FMT with QDF_MAC_ADDR_FMT

Currently in driver, two macros are defined to specify the
mac address printing format. Since both macros achieve
the same result, replace all instances of QDF_FULL_MAC_FMT
with QDF_MAC_ADDR_FMT.

Change-Id: I88b04fbaeba061a6272427e0daafcc132f53bb1e
CRs-Fixed: 3559489

components/son/dispatcher/src/son_api.c

@@ -528,8 +528,8 @@ int wlan_son_deliver_opmode(struct wlan_objmgr_vdev *vdev,
 	opmode.num_streams = nss;
 	qdf_mem_copy(opmode.macaddr, addr, QDF_MAC_ADDR_SIZE);
 
-	son_debug("bw %d, nss %d, addr " QDF_FULL_MAC_FMT,
-		  bw, nss, QDF_FULL_MAC_REF(addr));
+	son_debug("bw %d, nss %d, addr " QDF_MAC_ADDR_FMT,
+		  bw, nss, QDF_MAC_ADDR_REF(addr));
 
 	if (!g_son_mlme_deliver_cbs.deliver_opmode) {
 		son_err("invalid deliver opmode cb");
@@ -560,8 +560,8 @@ int wlan_son_deliver_smps(struct wlan_objmgr_vdev *vdev,
 	smps.is_static = is_static;
 	qdf_mem_copy(smps.macaddr, addr, QDF_MAC_ADDR_SIZE);
 
-	son_debug("is_static %d, addr" QDF_FULL_MAC_FMT,
-		  is_static, QDF_FULL_MAC_REF(addr));
+	son_debug("is_static %d, addr" QDF_MAC_ADDR_FMT,
+		  is_static, QDF_MAC_ADDR_REF(addr));
 
 	if (!g_son_mlme_deliver_cbs.deliver_smps) {
 		son_err("invalid deliver smps cb");
@@ -643,9 +643,9 @@ int wlan_son_deliver_rrm_rpt(struct wlan_objmgr_vdev *vdev,
 
 	rrm_info.data.rrm_data.num_meas_rpts = total_bcnrpt_count;
 
-	son_debug("Sta: " QDF_FULL_MAC_FMT
+	son_debug("Sta: " QDF_MAC_ADDR_FMT
 		  "Category %d Action %d Num_Report %d Rptlen %d",
-		  QDF_FULL_MAC_REF(mac_addr),
+		  QDF_MAC_ADDR_REF(mac_addr),
 		  ACTION_CATEGORY_RRM,
 		  RRM_RADIO_MEASURE_RPT,
 		  total_bcnrpt_count,

core/hdd/src/wlan_hdd_cfr.c

@@ -136,8 +136,8 @@ wlan_cfg80211_cfr_set_group_config(struct wlan_objmgr_vdev *vdev,
 		nla_memcpy(&params.ta_mask[0],
 			   tb[QCA_WLAN_VENDOR_ATTR_PEER_CFR_GROUP_TA_MASK],
 			   QDF_MAC_ADDR_SIZE);
-		hdd_debug("ta_mask " QDF_FULL_MAC_FMT,
-			  QDF_FULL_MAC_REF(&params.ta_mask[0]));
+		hdd_debug("ta_mask " QDF_MAC_ADDR_FMT,
+			  QDF_MAC_ADDR_REF(&params.ta_mask[0]));
 	}
 
 	if (tb[QCA_WLAN_VENDOR_ATTR_PEER_CFR_GROUP_RA]) {
@@ -152,8 +152,8 @@ wlan_cfg80211_cfr_set_group_config(struct wlan_objmgr_vdev *vdev,
 		nla_memcpy(&params.ra_mask[0],
 			   tb[QCA_WLAN_VENDOR_ATTR_PEER_CFR_GROUP_RA_MASK],
 			   QDF_MAC_ADDR_SIZE);
-		hdd_debug("ra_mask " QDF_FULL_MAC_FMT,
-			  QDF_FULL_MAC_REF(&params.ra_mask[0]));
+		hdd_debug("ra_mask " QDF_MAC_ADDR_FMT,
+			  QDF_MAC_ADDR_REF(&params.ra_mask[0]));
 	}
 
 	if (!qdf_is_macaddr_zero((struct qdf_mac_addr *)&params.ta) ||

core/hdd/src/wlan_hdd_debugfs_offload.c

@@ -100,8 +100,8 @@ wlan_hdd_mc_addr_list_info_debugfs(struct hdd_context *hdd_ctx,
 		}
 
 		ret = scnprintf(buf + length, buf_avail_len - length,
-				QDF_FULL_MAC_FMT "\n",
-				QDF_FULL_MAC_REF(mc_addr_list.mc_addr[i].bytes));
+				QDF_MAC_ADDR_FMT "\n",
+				QDF_MAC_ADDR_REF(mc_addr_list.mc_addr[i].bytes));
 		if (ret <= 0)
 			return length;
 		length += ret;

core/hdd/src/wlan_hdd_debugfs_roam.c

@@ -473,16 +473,16 @@ wlan_hdd_update_roam_stats(struct hdd_context *hdd_ctx,
 			ret = scnprintf(buf + length,
 					buf_avail_len - length,
 					"\nSTA roamed from "
-					QDF_FULL_MAC_FMT " to "
-					QDF_FULL_MAC_FMT "\n",
-					QDF_FULL_MAC_REF(scan->old_bssid),
-					QDF_FULL_MAC_REF(scan->new_bssid));
+					QDF_MAC_ADDR_FMT " to "
+					QDF_MAC_ADDR_FMT "\n",
+					QDF_MAC_ADDR_REF(scan->old_bssid),
+					QDF_MAC_ADDR_REF(scan->new_bssid));
 		} else {
 			ret = scnprintf(buf + length,
 					buf_avail_len - length,
-					"\nSTA is connected to " QDF_FULL_MAC_FMT
+					"\nSTA is connected to " QDF_MAC_ADDR_FMT
 					" before and after scan, not roamed\n",
-					QDF_FULL_MAC_REF(scan->old_bssid));
+					QDF_MAC_ADDR_REF(scan->old_bssid));
 		}
 		if (ret <= 0)
 			goto free_mem;
@@ -523,8 +523,8 @@ wlan_hdd_update_roam_stats(struct hdd_context *hdd_ctx,
 
 			ret = scnprintf(buf + length,
 					buf_avail_len - length,
-					QDF_FULL_MAC_FMT " %4u  %3u   %3u\n",
-					QDF_FULL_MAC_REF(bssid),
+					QDF_MAC_ADDR_FMT " %4u  %3u   %3u\n",
+					QDF_MAC_ADDR_REF(bssid),
 					scan->cand[rci].freq,
 					scan->cand[rci].score,
 					scan->cand[rci].rssi);

core/hdd/src/wlan_hdd_hostapd.c

@@ -2873,8 +2873,8 @@ QDF_STATUS hdd_hostapd_sap_event_cb(struct sap_event *sap_event,
 			return QDF_STATUS_E_NOMEM;
 
 		snprintf(unknownSTAEvent, IW_CUSTOM_MAX,
-			 "JOIN_UNKNOWN_STA-"QDF_FULL_MAC_FMT,
-			 QDF_FULL_MAC_REF(sap_event->sapevt.sapUnknownSTAJoin.macaddr.bytes));
+			 "JOIN_UNKNOWN_STA-"QDF_MAC_ADDR_FMT,
+			 QDF_MAC_ADDR_REF(sap_event->sapevt.sapUnknownSTAJoin.macaddr.bytes));
 		we_event = IWEVCUSTOM;  /* Discovered a new node (AP mode). */
 		wrqu.data.pointer = unknownSTAEvent;
 		wrqu.data.length = strlen(unknownSTAEvent);
@@ -2888,10 +2888,10 @@ QDF_STATUS hdd_hostapd_sap_event_cb(struct sap_event *sap_event,
 			return QDF_STATUS_E_NOMEM;
 
 		snprintf(maxAssocExceededEvent, IW_CUSTOM_MAX,
-			 "Peer "QDF_FULL_MAC_FMT" denied"
+			 "Peer "QDF_MAC_ADDR_FMT" denied"
 			 " assoc due to Maximum Mobile Hotspot connections reached. Please disconnect"
 			 " one or more devices to enable the new device connection",
-			 QDF_FULL_MAC_REF(sap_event->sapevt.sapMaxAssocExceeded.macaddr.bytes));
+			 QDF_MAC_ADDR_REF(sap_event->sapevt.sapMaxAssocExceeded.macaddr.bytes));
 		we_event = IWEVCUSTOM;  /* Discovered a new node (AP mode). */
 		wrqu.data.pointer = maxAssocExceededEvent;
 		wrqu.data.length = strlen(maxAssocExceededEvent);

core/hdd/src/wlan_hdd_hostapd_wext.c

@@ -2298,9 +2298,9 @@ static int hdd_softap_get_sta_info(struct hdd_adapter *adapter,
 		}
 
 		written += scnprintf(buf + written, size - written,
-				     QDF_FULL_MAC_FMT
+				     QDF_MAC_ADDR_FMT
 				     " ecsa=%d\n",
-				     QDF_FULL_MAC_REF(sta->sta_mac.bytes),
+				     QDF_MAC_ADDR_REF(sta->sta_mac.bytes),
 				     sta->ecsa_capable);
 		hdd_put_sta_info_ref(&adapter->sta_info_list, &sta, true,
 				     STA_INFO_SOFTAP_GET_STA_INFO);
@@ -2683,8 +2683,8 @@ __iw_get_peer_rssi(struct net_device *dev, struct iw_request_info *info,
 		wrqu->data.length +=
 			scnprintf(extra + wrqu->data.length,
 				  IW_PRIV_SIZE_MASK - wrqu->data.length,
-				  "["QDF_FULL_MAC_FMT"] [%d]\n",
-				  QDF_FULL_MAC_REF(rssi_info->peer_stats[i].peer_macaddr),
+				  "["QDF_MAC_ADDR_FMT"] [%d]\n",
+				  QDF_MAC_ADDR_REF(rssi_info->peer_stats[i].peer_macaddr),
 				  rssi_info->peer_stats[i].peer_rssi);
 
 	wrqu->data.length++;

core/hdd/src/wlan_hdd_son.c

@@ -1485,7 +1485,7 @@ static void hdd_son_deauth_sta(struct wlan_objmgr_vdev *vdev,
 	param.reason_code = ignore_frame ? REASON_HOST_TRIGGERED_SILENT_DEAUTH
 					 : REASON_UNSPEC_FAILURE;
 	hdd_debug("Peer - "QDF_MAC_ADDR_FMT" Ignore Frame - %u",
-		  QDF_FULL_MAC_REF(peer_mac), ignore_frame);
+		  QDF_MAC_ADDR_REF(peer_mac), ignore_frame);
 
 	status = hdd_softap_sta_deauth(link_info->adapter, &param);
 	if (QDF_STATUS_IS_ERROR(status))
@@ -2771,8 +2771,8 @@ void hdd_son_deliver_peer_authorize_event(struct hdd_adapter *adapter,
 	}
 	peer = wlan_objmgr_get_peer_by_mac(psoc, peer_mac, WLAN_UMAC_COMP_SON);
 	if (!peer) {
-		hdd_err("No peer object for sta" QDF_FULL_MAC_FMT,
-			QDF_FULL_MAC_REF(peer_mac));
+		hdd_err("No peer object for sta" QDF_MAC_ADDR_FMT,
+			QDF_MAC_ADDR_REF(peer_mac));
 		hdd_objmgr_put_vdev_by_user(vdev, WLAN_SON_ID);
 		return;
 	}
@@ -2780,8 +2780,8 @@ void hdd_son_deliver_peer_authorize_event(struct hdd_adapter *adapter,
 	ret = os_if_son_deliver_ald_event(vdev, peer,
 					  MLME_EVENT_CLIENT_ASSOCIATED, NULL);
 	if (ret)
-		hdd_err("ALD ASSOCIATED Event failed for" QDF_FULL_MAC_FMT,
-			QDF_FULL_MAC_REF(peer_mac));
+		hdd_err("ALD ASSOCIATED Event failed for" QDF_MAC_ADDR_FMT,
+			QDF_MAC_ADDR_REF(peer_mac));
 
 	wlan_objmgr_peer_release_ref(peer, WLAN_UMAC_COMP_SON);
 	hdd_objmgr_put_vdev_by_user(vdev, WLAN_SON_ID);

core/hdd/src/wlan_hdd_sysfs_connect_info.c

@@ -352,7 +352,7 @@ static ssize_t wlan_hdd_connect_info(struct hdd_adapter *adapter, uint8_t *buf,
 	}
 	ret_val = scnprintf(buf + length, buf_avail_len - length,
 			    "ssid = %s\n"
-			    "bssid = " QDF_FULL_MAC_FMT "\n"
+			    "bssid = " QDF_MAC_ADDR_FMT "\n"
 			    "connect_time = %s\n"
 			    "auth_time = %s\n"
 			    "freq = %u\n"
@@ -363,7 +363,7 @@ static ssize_t wlan_hdd_connect_info(struct hdd_adapter *adapter, uint8_t *buf,
 			    "last_auth_type = %s\n"
 			    "dot11mode = %s\n",
 			    conn_info->last_ssid.SSID.ssId,
-			    QDF_FULL_MAC_REF(conn_info->bssid.bytes),
+			    QDF_MAC_ADDR_REF(conn_info->bssid.bytes),
 			    conn_info->connect_time,
 			    conn_info->auth_time,
 			    conn_info->chan_freq,

core/hdd/src/wlan_hdd_sysfs_sta_info.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2020, 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 above
@@ -58,8 +58,8 @@ static ssize_t __show_sta_info(struct net_device *net_dev, char *buf)
 			continue;
 		}
 		ret_val += scnprintf(buf + ret_val, PAGE_SIZE - ret_val,
-				     QDF_FULL_MAC_FMT " ecsa=%d\n",
-				     QDF_FULL_MAC_REF(sta->sta_mac.bytes),
+				     QDF_MAC_ADDR_FMT " ecsa=%d\n",
+				     QDF_MAC_ADDR_REF(sta->sta_mac.bytes),
 				     sta->ecsa_capable);
 
 		hdd_put_sta_info_ref(&adapter->sta_info_list, &sta, true,