From 2c92bf0c9c4019a53f6a3346987ef86213a388ed Mon Sep 17 00:00:00 2001 From: Yu Wang Date: Sat, 8 Oct 2022 20:20:27 -0700 Subject: [PATCH] qcacmn: fix build failures caused by QDF_MAC_ADDR_REF Build failed once WLAN_TRACE_HIDE_MAC_ADDR is enabled, due to 'error: type mismatch in conditional expression'. To fix it, correct the parameter for QDF_MAC_ADDR_REF. Change-Id: Ibcac7880af9a6029fe9fe8584349743249c45b86 CRs-Fixed: 3308194 --- cfg/src/cfg.c | 5 +++-- umac/twt/core/src/wlan_twt_common.c | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cfg/src/cfg.c b/cfg/src/cfg.c index 355360b46d..f8065c4467 100644 --- a/cfg/src/cfg.c +++ b/cfg/src/cfg.c @@ -645,7 +645,7 @@ cfg_store_print(struct wlan_objmgr_psoc *psoc) case CFG_MAC_ITEM: cfg_nofl_debug("%pK %s " QDF_MAC_ADDR_FMT, offset, meta->name, - QDF_MAC_ADDR_REF(offset)); + QDF_MAC_ADDR_REF((uint8_t *)offset)); break; case CFG_IPV4_ITEM: cfg_nofl_debug("%pK %s %pI4", @@ -720,7 +720,8 @@ cfg_ini_config_print(struct wlan_objmgr_psoc *psoc, uint8_t *buf, len = qdf_scnprintf(buf, buflen, "%s " QDF_MAC_ADDR_FMT "\n", meta->name, - QDF_MAC_ADDR_REF(offset)); + QDF_MAC_ADDR_REF( + (uint8_t *)offset)); buf += len; buflen -= len; break; diff --git a/umac/twt/core/src/wlan_twt_common.c b/umac/twt/core/src/wlan_twt_common.c index ed2ee779ca..bec606c3d9 100644 --- a/umac/twt/core/src/wlan_twt_common.c +++ b/umac/twt/core/src/wlan_twt_common.c @@ -409,7 +409,7 @@ wlan_twt_set_peer_capabilities(struct wlan_objmgr_psoc *psoc, WLAN_TWT_ID); if (!peer) { twt_err("Peer object not found "QDF_MAC_ADDR_FMT, - QDF_MAC_ADDR_REF(peer_mac)); + QDF_MAC_ADDR_REF(peer_mac->bytes)); return QDF_STATUS_E_FAILURE; } @@ -442,7 +442,7 @@ wlan_twt_get_peer_capabilities(struct wlan_objmgr_psoc *psoc, WLAN_TWT_ID); if (!peer) { twt_err("Peer object not found "QDF_MAC_ADDR_FMT, - QDF_MAC_ADDR_REF(peer_mac)); + QDF_MAC_ADDR_REF(peer_mac->bytes)); *peer_cap = 0; return QDF_STATUS_E_FAILURE; }