From 40f652caf5bcba6063fbdc3aaaff726d46924c79 Mon Sep 17 00:00:00 2001 From: Srinivas Girigowda Date: Mon, 10 Aug 2020 16:39:43 -0700 Subject: [PATCH] qcacmn: target_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: 2760938 Change-Id: Ic2a0a703210bb64aee57e5e3edb4028906f62dc9 --- target_if/cfr/src/target_if_cfr_enh.c | 24 ++++++++++++------------ target_if/crypto/src/target_if_crypto.c | 3 ++- target_if/dp/src/target_if_dp.c | 6 +++--- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/target_if/cfr/src/target_if_cfr_enh.c b/target_if/cfr/src/target_if_cfr_enh.c index 36eeb776c919..1eb2a27b5f2d 100644 --- a/target_if/cfr/src/target_if_cfr_enh.c +++ b/target_if/cfr/src/target_if_cfr_enh.c @@ -379,12 +379,12 @@ static void dump_metadata(struct csi_cfr_header *header, uint32_t cookie) if (meta->is_mu_ppdu) { for (user_id = 0; user_id < meta->num_mu_users; user_id++) { usermac = meta->peer_addr.mu_peer_addr[user_id]; - cfr_debug("peermac[%d]: " QDF_MAC_ADDR_STR, - user_id, QDF_MAC_ADDR_ARRAY(usermac)); + cfr_debug("peermac[%d]: " QDF_MAC_ADDR_FMT, + user_id, QDF_MAC_ADDR_REF(usermac)); } } else { - cfr_debug("peermac: " QDF_MAC_ADDR_STR, - QDF_MAC_ADDR_ARRAY(meta->peer_addr.su_peer_addr)); + cfr_debug("peermac: " QDF_MAC_ADDR_FMT, + QDF_MAC_ADDR_REF(meta->peer_addr.su_peer_addr)); } for (chain_id = 0; chain_id < HOST_MAX_CHAINS; chain_id++) { @@ -1116,9 +1116,9 @@ static void dump_cfr_peer_tx_event_enh(wmi_cfr_peer_tx_event_param *event, uint32_t cookie) { cfr_debug("<%u>CFR capture method: %d vdev_id: %d mac: " - QDF_MAC_ADDR_STR, cookie, + QDF_MAC_ADDR_FMT, cookie, event->capture_method, event->vdev_id, - QDF_MAC_ADDR_ARRAY(event->peer_mac_addr.bytes)); + QDF_MAC_ADDR_REF(event->peer_mac_addr.bytes)); cfr_debug("<%u>Chan: %d bw: %d phymode: %d cfreq1: %d cfrq2: %d " "nss: %d\n", @@ -1278,8 +1278,8 @@ target_if_peer_capture_event(ol_scn_t sc, uint8_t *data, uint32_t datalen) if (tx_evt_param.status & PEER_CFR_CAPTURE_EVT_PS_STATUS_MASK) { cfr_err("CFR capture failed as peer is in powersave: " - QDF_MAC_ADDR_STR, - QDF_MAC_ADDR_ARRAY(tx_evt_param.peer_mac_addr.bytes)); + QDF_MAC_ADDR_FMT, + QDF_MAC_ADDR_REF(tx_evt_param.peer_mac_addr.bytes)); enh_prepare_cfr_header_txstatus(&tx_evt_param, &header_error, @@ -1296,8 +1296,8 @@ target_if_peer_capture_event(ol_scn_t sc, uint8_t *data, uint32_t datalen) } if ((tx_evt_param.status & PEER_CFR_CAPTURE_EVT_STATUS_MASK) == 0) { - cfr_debug("CFR capture failed for peer: " QDF_MAC_ADDR_STR, - QDF_MAC_ADDR_ARRAY(tx_evt_param.peer_mac_addr.bytes)); + cfr_debug("CFR capture failed for peer: " QDF_MAC_ADDR_FMT, + QDF_MAC_ADDR_REF(tx_evt_param.peer_mac_addr.bytes)); pcfr->tx_peer_status_cfr_fail++; retval = -EINVAL; goto relref; @@ -1305,9 +1305,9 @@ target_if_peer_capture_event(ol_scn_t sc, uint8_t *data, uint32_t datalen) if (tx_evt_param.status & CFR_TX_EVT_STATUS_MASK) { cfr_debug("TX packet returned status %d for peer: " - QDF_MAC_ADDR_STR, + QDF_MAC_ADDR_FMT, tx_evt_param.status & CFR_TX_EVT_STATUS_MASK, - QDF_MAC_ADDR_ARRAY(tx_evt_param.peer_mac_addr.bytes)); + QDF_MAC_ADDR_REF(tx_evt_param.peer_mac_addr.bytes)); pcfr->tx_evt_status_cfr_fail++; retval = -EINVAL; goto relref; diff --git a/target_if/crypto/src/target_if_crypto.c b/target_if/crypto/src/target_if_crypto.c index 934501daaddd..ec3c55b95696 100644 --- a/target_if/crypto/src/target_if_crypto.c +++ b/target_if/crypto/src/target_if_crypto.c @@ -253,7 +253,8 @@ QDF_STATUS target_if_crypto_set_key(struct wlan_objmgr_vdev *vdev, target_if_debug("vdev_id:%d, key: idx:%d,len:%d", params.vdev_id, params.key_idx, params.key_len); - target_if_debug("peer mac %pM", params.peer_mac); + target_if_debug("peer mac "QDF_MAC_ADDR_FMT, + QDF_MAC_ADDR_REF(params.peer_mac)); QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_CRYPTO, QDF_TRACE_LEVEL_DEBUG, ¶ms.key_rsc_ctr, sizeof(uint64_t)); status = wmi_unified_setup_install_key_cmd(pdev_wmi_handle, ¶ms); diff --git a/target_if/dp/src/target_if_dp.c b/target_if/dp/src/target_if_dp.c index 88c3649fdc33..7879aa61cebb 100644 --- a/target_if/dp/src/target_if_dp.c +++ b/target_if/dp/src/target_if_dp.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 The Linux Foundation. All rights reserved. + * Copyright (c) 2019-2020 The Linux Foundation. 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 @@ -62,8 +62,8 @@ target_if_peer_set_default_routing(struct cdp_ctrl_objmgr_psoc *psoc, if (wmi_set_peer_param_send(pdev_wmi_handle, peer_macaddr, ¶m)) { target_if_err("Unable to set default routing for peer " - QDF_MAC_ADDR_STR, - QDF_MAC_ADDR_ARRAY(peer_macaddr)); + QDF_MAC_ADDR_FMT, + QDF_MAC_ADDR_REF(peer_macaddr)); } wlan_objmgr_pdev_release_ref(pdev, WLAN_PDEV_TARGET_IF_ID); }