From 6ad9002f62dfae2a01437d1082ab2b713efb898e Mon Sep 17 00:00:00 2001 From: Srinivas Girigowda Date: Tue, 25 Aug 2020 22:53:39 -0700 Subject: [PATCH] qcacmn: umac: Replace %pM/QDF_MAC_ADR_STR/ARRAY with proper macros For kernel and driver logs, replace %pM and QDF_MAC_ADDR_STR/ARRAY with QDF_MAC_ADDR_FMT. For tx/rx mask, use QDF_FULL_MAC_FMT. CRs-Fixed: 2763028 Change-Id: I6c56c2040967b279dd31100c4f376f2452146742 --- umac/cfr/dispatcher/src/wlan_cfr_ucfg_api.c | 8 ++++---- umac/scan/core/src/wlan_scan_filter.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/umac/cfr/dispatcher/src/wlan_cfr_ucfg_api.c b/umac/cfr/dispatcher/src/wlan_cfr_ucfg_api.c index 7ad36aa3c9e9..2bf377ecdf9c 100644 --- a/umac/cfr/dispatcher/src/wlan_cfr_ucfg_api.c +++ b/umac/cfr/dispatcher/src/wlan_cfr_ucfg_api.c @@ -971,12 +971,12 @@ QDF_STATUS ucfg_cfr_get_cfg(struct wlan_objmgr_vdev *vdev) glbl_cfg->data_subtype_filter); cfr_err("TX Addr: " QDF_MAC_ADDR_FMT, QDF_MAC_ADDR_REF(glbl_cfg->tx_addr)); - cfr_err("TX Addr Mask: " QDF_MAC_ADDR_STR, - QDF_MAC_ADDR_ARRAY(glbl_cfg->tx_addr_mask)); + cfr_err("TX Addr Mask: " QDF_FULL_MAC_FMT, + QDF_FULL_MAC_REF(glbl_cfg->tx_addr_mask)); cfr_err("RX Addr: " QDF_MAC_ADDR_FMT, QDF_MAC_ADDR_REF(glbl_cfg->rx_addr)); - cfr_err("RX Addr Mask: " QDF_MAC_ADDR_STR, - QDF_MAC_ADDR_ARRAY(glbl_cfg->rx_addr_mask)); + cfr_err("RX Addr Mask: " QDF_FULL_MAC_FMT, + QDF_FULL_MAC_REF(glbl_cfg->rx_addr_mask)); } wlan_objmgr_pdev_release_ref(pdev, WLAN_CFR_ID); diff --git a/umac/scan/core/src/wlan_scan_filter.c b/umac/scan/core/src/wlan_scan_filter.c index 0334f6b82b5b..0c628d15bfed 100644 --- a/umac/scan/core/src/wlan_scan_filter.c +++ b/umac/scan/core/src/wlan_scan_filter.c @@ -683,16 +683,16 @@ bool scm_filter_match(struct wlan_objmgr_psoc *psoc, if (filter->match_security_func && !filter->match_security_func(filter->match_security_func_arg, db_entry)) { - scm_debug("%pM : Ignore as custom security match failed", - db_entry->bssid.bytes); + scm_debug(QDF_MAC_ADDR_FMT" : Ignore as custom security match failed", + QDF_MAC_ADDR_REF(db_entry->bssid.bytes)); return false; } if (filter->ccx_validate_bss && !filter->ccx_validate_bss(filter->ccx_validate_bss_arg, db_entry, 0)) { - scm_debug("%pM : Ignore as CCX validateion failed", - db_entry->bssid.bytes); + scm_debug(QDF_MAC_ADDR_FMT" : Ignore as CCX validateion failed", + QDF_MAC_ADDR_REF(db_entry->bssid.bytes)); return false; }