qcacld-3.0: os_if: Change %pM/QDF_MAC_ADDR_STR/ARRAY to QDF_MAC_ADDR_FMT/REF
Change %pM/QDF_MAC_ADDR_STR/ARRAY to QDF_MAC_ADDR_FMT/REF.
CRs-Fixed: 2752355
Change-Id: Ib186841ca387ccc84584864286681c23e3b34756
diff --git a/Kbuild b/Kbuild
index c73f12c..d6b5fd2 100644
--- a/Kbuild
+++ b/Kbuild
@@ -2902,6 +2902,7 @@
cppflags-$(CONFIG_RXDMA_ERR_PKT_DROP) += -DRXDMA_ERR_PKT_DROP
cppflags-$(CONFIG_MAX_ALLOC_PAGE_SIZE) += -DMAX_ALLOC_PAGE_SIZE
cppflags-$(CONFIG_DELIVERY_TO_STACK_STATUS_CHECK) += -DDELIVERY_TO_STACK_STATUS_CHECK
+cppflags-$(CONFIG_WLAN_TRACE_HIDE_MAC_ADDRESS) += -DWLAN_TRACE_HIDE_MAC_ADDRESS
cppflags-$(CONFIG_LITHIUM) += -DFEATURE_AST
cppflags-$(CONFIG_LITHIUM) += -DPEER_PROTECTED_ACCESS
diff --git a/os_if/interop_issues_ap/src/wlan_cfg80211_interop_issues_ap.c b/os_if/interop_issues_ap/src/wlan_cfg80211_interop_issues_ap.c
index 7519792..2357ab1 100644
--- a/os_if/interop_issues_ap/src/wlan_cfg80211_interop_issues_ap.c
+++ b/os_if/interop_issues_ap/src/wlan_cfg80211_interop_issues_ap.c
@@ -90,8 +90,8 @@
return;
}
- osif_debug("interop issues ap mac:" QDF_MAC_ADDR_STR,
- QDF_MAC_ADDR_ARRAY(data->rap_addr.bytes));
+ osif_debug("interop issues ap mac:" QDF_MAC_ADDR_FMT,
+ QDF_MAC_ADDR_REF(data->rap_addr.bytes));
if (nla_put(skb,
QCA_WLAN_VENDOR_ATTR_INTEROP_ISSUES_AP_BSSID,
@@ -150,8 +150,8 @@
nla_memcpy(interop_issues_ap[i].bytes,
tb2[QCA_WLAN_VENDOR_ATTR_INTEROP_ISSUES_AP_BSSID],
QDF_MAC_ADDR_SIZE);
- osif_debug(QDF_MAC_ADDR_STR,
- QDF_MAC_ADDR_ARRAY(interop_issues_ap[i].bytes));
+ osif_debug(QDF_MAC_ADDR_FMT,
+ QDF_MAC_ADDR_REF(interop_issues_ap[i].bytes));
i++;
}
diff --git a/os_if/nan/src/os_if_nan.c b/os_if/nan/src/os_if_nan.c
index 6aeb451..f78f41d 100644
--- a/os_if/nan/src/os_if_nan.c
+++ b/os_if/nan/src/os_if_nan.c
@@ -1629,9 +1629,9 @@
goto ndp_confirm_nla_failed;
cfg80211_vendor_event(vendor_event, GFP_ATOMIC);
- osif_debug("NDP confim sent, ndp instance id: %d, peer addr: %pM rsp_code: %d, reason_code: %d",
+ osif_debug("NDP confim sent, ndp instance id: %d, peer addr: "QDF_MAC_ADDR_FMT" rsp_code: %d, reason_code: %d",
ndp_confirm->ndp_instance_id,
- ndp_confirm->peer_ndi_mac_addr.bytes,
+ QDF_MAC_ADDR_REF(ndp_confirm->peer_ndi_mac_addr.bytes),
ndp_confirm->rsp_code, ndp_confirm->reason_code);
return;
@@ -1825,8 +1825,8 @@
return;
}
- osif_debug("vdev_id: %d, peer_mac: %pM",
- vdev_id, peer_ind->peer_mac_addr.bytes);
+ osif_debug("vdev_id: %d, peer_mac: "QDF_MAC_ADDR_FMT,
+ vdev_id, QDF_MAC_ADDR_REF(peer_ind->peer_mac_addr.bytes));
ret = cb_obj.new_peer_ind(vdev_id, peer_ind->sta_id,
&peer_ind->peer_mac_addr,
(active_peers == 0 ? true : false));
@@ -1866,8 +1866,8 @@
osif_err("Invalid new NDP peer params");
return;
}
- osif_debug("vdev_id: %d, peer_mac: %pM",
- vdev_id, peer_ind->peer_mac_addr.bytes);
+ osif_debug("vdev_id: %d, peer_mac: "QDF_MAC_ADDR_FMT,
+ vdev_id, QDF_MAC_ADDR_REF(peer_ind->peer_mac_addr.bytes));
active_peers--;
ucfg_nan_set_active_peers(vdev, active_peers);
cb_obj.peer_departed_ind(vdev_id, peer_ind->sta_id,
diff --git a/os_if/tdls/src/wlan_cfg80211_tdls.c b/os_if/tdls/src/wlan_cfg80211_tdls.c
index 75b6c5d..6e94de1 100644
--- a/os_if/tdls/src/wlan_cfg80211_tdls.c
+++ b/os_if/tdls/src/wlan_cfg80211_tdls.c
@@ -44,9 +44,9 @@
static const uint8_t temp_mac[QDF_MAC_ADDR_SIZE] = {0};
if (!qdf_mem_cmp(mac, temp_mac, QDF_MAC_ADDR_SIZE)) {
- osif_debug("Invalid Mac address " QDF_MAC_ADDR_STR
+ osif_debug("Invalid Mac address " QDF_MAC_ADDR_FMT
" cmd declined.",
- QDF_MAC_ADDR_ARRAY(mac));
+ QDF_MAC_ADDR_REF(mac));
return -EINVAL;
}
@@ -218,8 +218,8 @@
if (status)
return status;
- osif_debug("Add TDLS peer " QDF_MAC_ADDR_STR,
- QDF_MAC_ADDR_ARRAY(mac));
+ osif_debug("Add TDLS peer " QDF_MAC_ADDR_FMT,
+ QDF_MAC_ADDR_REF(mac));
add_peer_req = qdf_mem_malloc(sizeof(*add_peer_req));
if (!add_peer_req) {
@@ -439,8 +439,8 @@
if (status)
return status;
- osif_debug("Update TDLS peer " QDF_MAC_ADDR_STR,
- QDF_MAC_ADDR_ARRAY(mac));
+ osif_debug("Update TDLS peer " QDF_MAC_ADDR_FMT,
+ QDF_MAC_ADDR_REF(mac));
req_info = qdf_mem_malloc(sizeof(*req_info));
if (!req_info) {
@@ -772,8 +772,8 @@
/* make sure doesn't call send_mgmt() while it is pending */
if (TDLS_VDEV_MAGIC == tdls_priv->mgmt_tx_completion_status) {
- osif_err(QDF_MAC_ADDR_STR " action %d couldn't sent, as one is pending. return EBUSY",
- QDF_MAC_ADDR_ARRAY(peer_mac), action_code);
+ osif_err(QDF_MAC_ADDR_FMT " action %d couldn't sent, as one is pending. return EBUSY",
+ QDF_MAC_ADDR_REF(peer_mac), action_code);
return -EBUSY;
}