From 22eb121fe7bba85255bedf6714966c3cff6453cb Mon Sep 17 00:00:00 2001 From: Aditya Kodukula Date: Mon, 10 Jul 2023 07:24:10 -0700 Subject: [PATCH] qcacmn: Fix improper arguments for QDF_MAC_ADDR_REF Currently in driver while using QDF_MAC_ADDR_FMT to print mac address, the mac address reference provided to QDF_MAC_ADDR_REF is incorrect in some cases. Fix all such instances. Change-Id: I324581691dfe683e0d5b046e19b444928657ce05 CRs-Fixed: 3556423 --- dp/wifi3.0/dp_txrx_wds.c | 5 +++-- umac/mlo_mgr/src/utils_mlo.c | 4 ++-- umac/mlo_mgr/src/wlan_mlo_t2lm.c | 2 +- umac/scan/core/src/wlan_scan_cache_db.c | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dp/wifi3.0/dp_txrx_wds.c b/dp/wifi3.0/dp_txrx_wds.c index c38ad9cb12..1b90ebf72d 100644 --- a/dp/wifi3.0/dp_txrx_wds.c +++ b/dp/wifi3.0/dp_txrx_wds.c @@ -430,8 +430,9 @@ dp_txrx_peer_wds_tx_policy_update(struct cdp_soc_t *soc, uint8_t vdev_id, DP_MOD_ID_AST); if (!peer) { QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR, - FL("peer is NULL for mac %pM vdev_id %d"), - peer_mac, vdev_id); + FL("peer is NULL for mac" QDF_MAC_ADDR_FMT + " vdev_id %d"), QDF_MAC_ADDR_REF(peer_mac), + vdev_id); return QDF_STATUS_E_INVAL; } diff --git a/umac/mlo_mgr/src/utils_mlo.c b/umac/mlo_mgr/src/utils_mlo.c index efe2a29318..24a69479f9 100644 --- a/umac/mlo_mgr/src/utils_mlo.c +++ b/umac/mlo_mgr/src/utils_mlo.c @@ -468,7 +468,7 @@ util_parse_bvmlie_perstaprofile_stactrl(uint8_t *subelempayload, QDF_MAC_ADDR_SIZE); mlo_nofl_debug("Copied MAC address: " QDF_MAC_ADDR_FMT, - subelempayload + parsed_payload_len); + QDF_MAC_ADDR_REF(macaddr->bytes)); if (is_macaddr_valid) *is_macaddr_valid = true; @@ -4333,7 +4333,7 @@ util_parse_rvmlie_perstaprofile_stactrl(uint8_t *subelempayload, subelempayload + parsed_payload_len, QDF_MAC_ADDR_SIZE); mlo_nofl_debug("Copied MAC address: " QDF_MAC_ADDR_FMT, - subelempayload + parsed_payload_len); + QDF_MAC_ADDR_REF(macaddr->bytes)); if (is_macaddr_valid) *is_macaddr_valid = true; diff --git a/umac/mlo_mgr/src/wlan_mlo_t2lm.c b/umac/mlo_mgr/src/wlan_mlo_t2lm.c index e055b4e9e7..2be213e95b 100644 --- a/umac/mlo_mgr/src/wlan_mlo_t2lm.c +++ b/umac/mlo_mgr/src/wlan_mlo_t2lm.c @@ -1434,7 +1434,7 @@ wlan_mlo_link_disable_request_handler(struct wlan_objmgr_psoc *psoc, &vdev_id); if (!is_connected) { t2lm_err("Not connected to peer MLD " QDF_MAC_ADDR_FMT, - params->mld_addr.bytes); + QDF_MAC_ADDR_REF(params->mld_addr.bytes)); return QDF_STATUS_E_FAILURE; } diff --git a/umac/scan/core/src/wlan_scan_cache_db.c b/umac/scan/core/src/wlan_scan_cache_db.c index 6b43944a01..72ea18a751 100644 --- a/umac/scan/core/src/wlan_scan_cache_db.c +++ b/umac/scan/core/src/wlan_scan_cache_db.c @@ -2237,7 +2237,7 @@ QDF_STATUS scm_get_mld_addr_by_link_addr(struct wlan_objmgr_pdev *pdev, entry = scm_scan_get_entry_by_bssid(pdev, link_addr); if (!entry) { scm_err("scan entry not found for link addr: " QDF_MAC_ADDR_FMT, - QDF_MAC_ADDR_REF(link_addr)); + QDF_MAC_ADDR_REF(link_addr->bytes)); return QDF_STATUS_E_FAILURE; }