فهرست منبع

qcacld-3.0: Use QDF_MAC_ADDR_FMT to print mac address

Currently in driver, %pM is used to print mac address.
Replace all instances of it with QDF_MAC_ADDR_FMT.

Change-Id: Ibd575675804ab6545ed32fde2ec2b08caf837d83
CRs-Fixed: 3555007
Aditya Kodukula 1 سال پیش
والد
کامیت
32694d5ca9

+ 4 - 3
components/ftm_time_sync/core/src/ftm_time_sync_main.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
@@ -395,8 +395,9 @@ ssize_t ftm_time_sync_show(struct wlan_objmgr_vdev *vdev, char *buf)
 		return 0;
 	}
 
-	size = qdf_scnprintf(buf, PAGE_SIZE, "%s %pM\n", "BSSID",
-			     vdev_priv->bssid.bytes);
+	size = qdf_scnprintf(buf, PAGE_SIZE,
+			     "%s " QDF_MAC_ADDR_FMT "\n", "BSSID",
+			     QDF_MAC_ADDR_REF(vdev_priv->bssid.bytes));
 
 	for (iter = 0; iter < vdev_priv->num_qtime_pair; iter++) {
 		q_initiator = vdev_priv->ftm_ts_priv.time_pair[iter].qtime_initiator;

+ 11 - 6
core/hdd/src/wlan_hdd_debugfs_llstat.c

@@ -78,12 +78,16 @@ void hdd_debugfs_process_iface_stats(struct wlan_hdd_link_info *link_info,
 	buffer += len;
 	ll_stats.len += len;
 	len = scnprintf(buffer, DEBUGFS_LLSTATS_BUF_SIZE - ll_stats.len,
-			"\nmode: %u, MAC_ADDR: %pM, state: %u, roaming: %u, capabilities: %u, SSID: %s, BSSID_MAC: %pM, ap_country_str: %s, country_str: %s",
-			iface_info->mode, &iface_info->macAddr.bytes[0],
+			"\nmode: %u, MAC_ADDR: " QDF_MAC_ADDR_FMT ", state: %u,"
+			" roaming: %u, capabilities: %u, SSID: %s,"
+			" BSSID_MAC: " QDF_MAC_ADDR_FMT
+			", ap_country_str: %s, country_str: %s",
+			iface_info->mode,
+			QDF_MAC_ADDR_REF(&iface_info->macAddr.bytes[0]),
 			iface_info->state, iface_info->roaming,
 			iface_info->capabilities, iface_info->ssid,
-			&iface_info->bssid.bytes[0], iface_info->apCountryStr,
-			iface_info->countryStr);
+			QDF_MAC_ADDR_REF(&iface_info->bssid.bytes[0]),
+			iface_info->apCountryStr, iface_info->countryStr);
 
 	link_stats = &iface_stat->link_stats;
 	average_tsf_offset =  link_stats->avg_bcn_spread_offset_high;
@@ -201,9 +205,10 @@ void hdd_debugfs_process_peer_stats(struct hdd_adapter *adapter, void *data)
 		ll_stats.len += len;
 		len = scnprintf(buffer,
 				DEBUGFS_LLSTATS_BUF_SIZE - ll_stats.len,
-				"\nType: %d, peer_mac: %pM, capabilities: %u\nnum_rates: %d",
+				"\nType: %d, peer_mac: " QDF_MAC_ADDR_FMT
+				", capabilities: %u\nnum_rates: %d",
 				wmi_to_sir_peer_type(peer_info->type),
-				&peer_info->peer_macaddr.bytes[0],
+				QDF_MAC_ADDR_REF(&peer_info->peer_macaddr.bytes[0]),
 				peer_info->capabilities, peer_info->num_rate);
 
 		num_rate = peer_info->num_rate;

+ 2 - 2
core/hdd/src/wlan_hdd_sysfs_txrx_stats.c

@@ -94,8 +94,8 @@ __hdd_sysfs_txrx_stats_store(struct net_device *net_dev,
 
 	if (val1 == CDP_TXRX_STATS_28) {
 		if (sta_ctx->conn_info.is_authenticated) {
-			hdd_debug("ap mac addr: %pM",
-				  (void *)&sta_ctx->conn_info.bssid);
+			hdd_debug("ap mac addr:" QDF_MAC_ADDR_FMT,
+				  QDF_MAC_ADDR_REF(&sta_ctx->conn_info.bssid.bytes[0]));
 			req.peer_addr =
 				(char *)&sta_ctx->conn_info.bssid;
 		}

+ 16 - 8
core/hdd/src/wlan_hdd_tsf.c

@@ -1793,6 +1793,7 @@ static ssize_t __hdd_wlan_tsf_show(struct device *dev,
 	struct hdd_context *hdd_ctx;
 	uint64_t tsf_sync_qtime, host_time, reg_qtime, qtime, target_time;
 	ssize_t size;
+	uint8_t *mac;
 
 	struct net_device *net_dev = container_of(dev, struct net_device, dev);
 
@@ -1826,18 +1827,20 @@ static ssize_t __hdd_wlan_tsf_show(struct device *dev,
 
 	if (adapter->device_mode == QDF_STA_MODE ||
 	    adapter->device_mode == QDF_P2P_CLIENT_MODE) {
+		mac = hdd_sta_ctx->conn_info.bssid.bytes;
 		size = scnprintf(buf, PAGE_SIZE,
-				 "%s%llu %llu %pM %llu %llu %llu\n",
+				 "%s%llu %llu " QDF_MAC_ADDR_FMT "%llu %llu %llu\n",
 				 buf, adapter->tsf.last_target_time,
 				 tsf_sync_qtime,
-				 hdd_sta_ctx->conn_info.bssid.bytes,
+				 QDF_MAC_ADDR_REF(mac),
 				 qtime, host_time, target_time);
 	} else {
+		mac = adapter->mac_addr.bytes;
 		size = scnprintf(buf, PAGE_SIZE,
-				 "%s%llu %llu %pM %llu %llu %llu\n",
+				 "%s%llu %llu " QDF_MAC_ADDR_FMT "%llu %llu %llu\n",
 				 buf, adapter->tsf.last_target_time,
 				 tsf_sync_qtime,
-				 adapter->mac_addr.bytes,
+				 QDF_MAC_ADDR_REF(mac),
 				 qtime, host_time, target_time);
 	}
 
@@ -1957,6 +1960,7 @@ static ssize_t __hdd_wlan_tsf_show(struct device *dev,
 	struct hdd_context *hdd_ctx;
 	ssize_t size;
 	uint64_t host_time, target_time;
+	uint8_t *mac;
 
 	struct net_device *net_dev = container_of(dev, struct net_device, dev);
 
@@ -1986,13 +1990,17 @@ static ssize_t __hdd_wlan_tsf_show(struct device *dev,
 	} else {
 		if (adapter->device_mode == QDF_STA_MODE ||
 		    adapter->device_mode == QDF_P2P_CLIENT_MODE) {
-			size = scnprintf(buf, PAGE_SIZE, "%s%llu %llu %pM\n",
+			mac = hdd_sta_ctx->conn_info.bssid.bytes;
+			size = scnprintf(buf, PAGE_SIZE,
+					 "%s%llu %llu " QDF_MAC_ADDR_FMT "\n",
 					 buf, target_time, host_time,
-					 hdd_sta_ctx->conn_info.bssid.bytes);
+					 QDF_MAC_ADDR_REF(mac));
 		} else {
-			size = scnprintf(buf, PAGE_SIZE, "%s%llu %llu %pM\n",
+			mac = adapter->mac_addr.bytes;
+			size = scnprintf(buf, PAGE_SIZE,
+					 "%s%llu %llu " QDF_MAC_ADDR_FMT "\n",
 					 buf, target_time, host_time,
-					 adapter->mac_addr.bytes);
+					 QDF_MAC_ADDR_REF(mac));
 		}
 	}