From a4bf024bf1c45bae976c2fd867a4617aaaa6cd1a Mon Sep 17 00:00:00 2001 From: Srinivas Girigowda Date: Wed, 12 Aug 2020 15:10:06 -0700 Subject: [PATCH] qcacmn: umac: 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: I78b072b5cc623477135823512f9b8e7ef7ef4309 --- umac/cfr/dispatcher/src/wlan_cfr_ucfg_api.c | 12 +-- .../dispatcher/src/wlan_mgmt_txrx_tgt_api.c | 15 +-- .../obj_mgr/src/wlan_objmgr_debug.c | 12 +-- .../obj_mgr/src/wlan_objmgr_peer_obj.c | 84 +++++++--------- .../obj_mgr/src/wlan_objmgr_psoc_obj.c | 8 +- .../core/src/wlan_cm_bss_scoring.c | 27 +++--- umac/scan/core/src/wlan_scan_cache_db.c | 49 +++++----- umac/scan/core/src/wlan_scan_filter.c | 96 ++++++++++--------- umac/scan/dispatcher/src/wlan_scan_ucfg_api.c | 4 +- .../scan/dispatcher/src/wlan_scan_utils_api.c | 16 ++-- 10 files changed, 164 insertions(+), 159 deletions(-) diff --git a/umac/cfr/dispatcher/src/wlan_cfr_ucfg_api.c b/umac/cfr/dispatcher/src/wlan_cfr_ucfg_api.c index 9962fcff31e9..7ad36aa3c9e9 100644 --- a/umac/cfr/dispatcher/src/wlan_cfr_ucfg_api.c +++ b/umac/cfr/dispatcher/src/wlan_cfr_ucfg_api.c @@ -304,8 +304,8 @@ static void cfr_iter_peer_handler(struct wlan_objmgr_pdev *pdev, if (pe->period && (pe->request == PEER_CFR_CAPTURE_ENABLE)) { *cfr_capt_status = pe->request; cfr_debug("CFR capture running for peer " - QDF_MAC_ADDR_STR, - QDF_MAC_ADDR_ARRAY(peer->macaddr)); + QDF_MAC_ADDR_FMT, + QDF_MAC_ADDR_REF(peer->macaddr)); } } @@ -969,12 +969,12 @@ QDF_STATUS ucfg_cfr_get_cfg(struct wlan_objmgr_vdev *vdev) glbl_cfg->ctrl_subtype_filter); cfr_err("Data subtype : 0x%x\n", glbl_cfg->data_subtype_filter); - cfr_err("TX Addr: " QDF_MAC_ADDR_STR, - QDF_MAC_ADDR_ARRAY(glbl_cfg->tx_addr)); + 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("RX Addr: " QDF_MAC_ADDR_STR, - QDF_MAC_ADDR_ARRAY(glbl_cfg->rx_addr)); + 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)); } diff --git a/umac/cmn_services/mgmt_txrx/dispatcher/src/wlan_mgmt_txrx_tgt_api.c b/umac/cmn_services/mgmt_txrx/dispatcher/src/wlan_mgmt_txrx_tgt_api.c index f9da0f77c779..0d6b470ae088 100644 --- a/umac/cmn_services/mgmt_txrx/dispatcher/src/wlan_mgmt_txrx_tgt_api.c +++ b/umac/cmn_services/mgmt_txrx/dispatcher/src/wlan_mgmt_txrx_tgt_api.c @@ -1075,8 +1075,9 @@ QDF_STATUS tgt_mgmt_txrx_rx_frame_handler( wh->i_addr3); if (!is_from_addr_valid && !is_bssid_valid) { - mgmt_txrx_debug_rl("from addr %pM bssid addr %pM both not valid, dropping them", - wh->i_addr2, wh->i_addr3); + mgmt_txrx_debug_rl("from addr "QDF_MAC_ADDR_FMT" bssid addr "QDF_MAC_ADDR_FMT" both not valid, dropping them", + QDF_MAC_ADDR_REF(wh->i_addr2), + QDF_MAC_ADDR_REF(wh->i_addr3)); qdf_nbuf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -1084,8 +1085,9 @@ QDF_STATUS tgt_mgmt_txrx_rx_frame_handler( if ((mgmt_subtype == MGMT_SUBTYPE_BEACON || mgmt_subtype == MGMT_SUBTYPE_PROBE_RESP) && !(is_from_addr_valid && is_bssid_valid)) { - mgmt_txrx_debug_rl("from addr %pM bssid addr %pM not valid, modifying them", - wh->i_addr2, wh->i_addr3); + mgmt_txrx_debug_rl("from addr "QDF_MAC_ADDR_FMT" bssid addr "QDF_MAC_ADDR_FMT" not valid, modifying them", + QDF_MAC_ADDR_REF(wh->i_addr2), + QDF_MAC_ADDR_REF(wh->i_addr3)); if (!is_from_addr_valid) qdf_mem_copy(wh->i_addr2, wh->i_addr3, QDF_MAC_ADDR_SIZE); @@ -1137,8 +1139,9 @@ QDF_STATUS tgt_mgmt_txrx_rx_frame_handler( if (!(mgmt_subtype == MGMT_SUBTYPE_BEACON || mgmt_subtype == MGMT_SUBTYPE_PROBE_RESP || mgmt_subtype == MGMT_SUBTYPE_PROBE_REQ)) - mgmt_txrx_debug("Rcvd mgmt frame subtype %x (frame type %u) from %pM, seq_num = %d, rssi = %d tsf_delta: %u", - mgmt_subtype, frm_type, wh->i_addr2, + mgmt_txrx_debug("Rcvd mgmt frame subtype %x (frame type %u) from "QDF_MAC_ADDR_FMT", seq_num = %d, rssi = %d tsf_delta: %u", + mgmt_subtype, frm_type, + QDF_MAC_ADDR_REF(wh->i_addr2), (le16toh(*(uint16_t *)wh->i_seq) >> WLAN_SEQ_SEQ_SHIFT), mgmt_rx_params->rssi, mgmt_rx_params->tsf_delta); diff --git a/umac/cmn_services/obj_mgr/src/wlan_objmgr_debug.c b/umac/cmn_services/obj_mgr/src/wlan_objmgr_debug.c index 8aff084538ab..11396e070cc4 100644 --- a/umac/cmn_services/obj_mgr/src/wlan_objmgr_debug.c +++ b/umac/cmn_services/obj_mgr/src/wlan_objmgr_debug.c @@ -203,8 +203,8 @@ void wlan_objmgr_notify_log_delete(void *obj, wlan_obj_type_get_obj(del_obj, &node->obj, obj_type); node->obj_type = obj_type; node->tstamp = tstamp; - obj_mgr_debug("#%s : mac_addr :" QDF_MAC_ADDR_STR" entered L-state", - obj_name, QDF_MAC_ADDR_ARRAY(macaddr)); + obj_mgr_debug("#%s : mac_addr: "QDF_MAC_ADDR_FMT" entered L-state", + obj_name, QDF_MAC_ADDR_REF(macaddr)); wlan_objmgr_insert_ld_obj_to_list(debug_info, &node->node); } @@ -291,8 +291,8 @@ void wlan_objmgr_notify_destroy(void *obj, obj_mgr_err("obj_name is null"); return; } - obj_mgr_debug("#%s, macaddr: " QDF_MAC_ADDR_STR" exited L-state", - obj_name, QDF_MAC_ADDR_ARRAY(macaddr)); + obj_mgr_debug("#%s : macaddr: "QDF_MAC_ADDR_FMT" exited L-state", + obj_name, QDF_MAC_ADDR_REF(macaddr)); wlan_objmgr_rem_ld_obj_from_list(del_obj, debug_info, obj_type); @@ -493,8 +493,8 @@ static void wlan_objmgr_iterate_log_del_obj_handler(void *timer_arg) break; } - obj_mgr_alert("#%s in L-state,MAC: " QDF_MAC_ADDR_STR, - obj_name, QDF_MAC_ADDR_ARRAY(macaddr)); + obj_mgr_alert("#%s in L-state,MAC: " QDF_MAC_ADDR_FMT, + obj_name, QDF_MAC_ADDR_REF(macaddr)); wlan_objmgr_print_pending_refs(&del_obj->obj, obj_type); wlan_objmgr_trace_print_ref(&del_obj->obj, obj_type); diff --git a/umac/cmn_services/obj_mgr/src/wlan_objmgr_peer_obj.c b/umac/cmn_services/obj_mgr/src/wlan_objmgr_peer_obj.c index 354e1615a0b6..6db8f44a2d42 100644 --- a/umac/cmn_services/obj_mgr/src/wlan_objmgr_peer_obj.c +++ b/umac/cmn_services/obj_mgr/src/wlan_objmgr_peer_obj.c @@ -85,9 +85,8 @@ static QDF_STATUS wlan_objmgr_peer_obj_free(struct wlan_objmgr_peer *peer) vdev = wlan_peer_get_vdev(peer); if (!vdev) { obj_mgr_err( - "VDEV is NULL for peer(%02x:%02x:%02x:%02x:%02x:%02x)", - macaddr[0], macaddr[1], macaddr[2], - macaddr[3], macaddr[4], macaddr[5]); + "VDEV is NULL for peer("QDF_MAC_ADDR_FMT")", + QDF_MAC_ADDR_REF(macaddr)); return QDF_STATUS_E_FAILURE; } @@ -97,9 +96,8 @@ static QDF_STATUS wlan_objmgr_peer_obj_free(struct wlan_objmgr_peer *peer) psoc = wlan_vdev_get_psoc(vdev); if (!psoc) { obj_mgr_err( - "PSOC is NULL for peer(%02x:%02x:%02x:%02x:%02x:%02x)", - macaddr[0], macaddr[1], macaddr[2], - macaddr[3], macaddr[4], macaddr[5]); + "PSOC is NULL for peer("QDF_MAC_ADDR_FMT")", + QDF_MAC_ADDR_REF(macaddr)); return QDF_STATUS_E_FAILURE; } @@ -115,18 +113,16 @@ static QDF_STATUS wlan_objmgr_peer_obj_free(struct wlan_objmgr_peer *peer) /* Detach peer from VDEV's peer list */ if (wlan_objmgr_vdev_peer_detach(vdev, peer) == QDF_STATUS_E_FAILURE) { obj_mgr_err( - "Peer(%02x:%02x:%02x:%02x:%02x:%02x) VDEV detach fail, vdev id: %d", - macaddr[0], macaddr[1], macaddr[2], - macaddr[3], macaddr[4], macaddr[5], vdev_id); + "Peer("QDF_MAC_ADDR_FMT") VDEV detach fail, vdev id: %d", + QDF_MAC_ADDR_REF(macaddr), vdev_id); wlan_objmgr_vdev_release_ref(vdev, WLAN_OBJMGR_ID); return QDF_STATUS_E_FAILURE; } /* Detach peer from PSOC's peer list */ if (wlan_objmgr_psoc_peer_detach(psoc, peer) == QDF_STATUS_E_FAILURE) { obj_mgr_err( - "Peer(%02x:%02x:%02x:%02x:%02x:%02x) PSOC detach failure", - macaddr[0], macaddr[1], macaddr[2], - macaddr[3], macaddr[4], macaddr[5]); + "Peer("QDF_MAC_ADDR_FMT") PSOC detach failure", + QDF_MAC_ADDR_REF(macaddr)); wlan_objmgr_vdev_release_ref(vdev, WLAN_OBJMGR_ID); return QDF_STATUS_E_FAILURE; } @@ -171,18 +167,16 @@ struct wlan_objmgr_peer *wlan_objmgr_peer_obj_create( if (!vdev) { obj_mgr_err( - "VDEV is NULL for peer (%02x:%02x:%02x:%02x:%02x:%02x)", - macaddr[0], macaddr[1], macaddr[2], - macaddr[3], macaddr[4], macaddr[5]); + "VDEV is NULL for peer ("QDF_MAC_ADDR_FMT")", + QDF_MAC_ADDR_REF(macaddr)); return NULL; } /* Get psoc, if psoc is NULL, return */ psoc = wlan_vdev_get_psoc(vdev); if (!psoc) { obj_mgr_err( - "PSOC is NULL for peer (%02x:%02x:%02x:%02x:%02x:%02x)", - macaddr[0], macaddr[1], macaddr[2], - macaddr[3], macaddr[4], macaddr[5]); + "PSOC is NULL for peer ("QDF_MAC_ADDR_FMT")", + QDF_MAC_ADDR_REF(macaddr)); return NULL; } /* Allocate memory for peer object */ @@ -211,9 +205,8 @@ struct wlan_objmgr_peer *wlan_objmgr_peer_obj_create( if (wlan_objmgr_psoc_peer_attach(psoc, peer) != QDF_STATUS_SUCCESS) { obj_mgr_warn( - "Peer(%02x:%02x:%02x:%02x:%02x:%02x) PSOC attach failure", - macaddr[0], macaddr[1], macaddr[2], - macaddr[3], macaddr[4], macaddr[5]); + "Peer("QDF_MAC_ADDR_FMT") PSOC attach failure", + QDF_MAC_ADDR_REF(macaddr)); qdf_spinlock_destroy(&peer->peer_lock); wlan_objmgr_peer_trace_deinit_lock(peer); qdf_mem_free(peer); @@ -223,9 +216,8 @@ struct wlan_objmgr_peer *wlan_objmgr_peer_obj_create( if (wlan_objmgr_vdev_peer_attach(vdev, peer) != QDF_STATUS_SUCCESS) { obj_mgr_warn( - "Peer(%02x:%02x:%02x:%02x:%02x:%02x) VDEV attach failure", - macaddr[0], macaddr[1], macaddr[2], - macaddr[3], macaddr[4], macaddr[5]); + "Peer("QDF_MAC_ADDR_FMT") VDEV attach failure", + QDF_MAC_ADDR_REF(macaddr)); /* if attach fails, detach from psoc table before free */ wlan_objmgr_psoc_peer_detach(psoc, peer); qdf_spinlock_destroy(&peer->peer_lock); @@ -269,15 +261,14 @@ struct wlan_objmgr_peer *wlan_objmgr_peer_obj_create( } else if (obj_status == QDF_STATUS_E_FAILURE) { /* Clean up the peer */ obj_mgr_err( - "Peer(%02x:%02x:%02x:%02x:%02x:%02x) comp object alloc fail", - macaddr[0], macaddr[1], macaddr[2], - macaddr[3], macaddr[4], macaddr[5]); + "Peer("QDF_MAC_ADDR_FMT") comp object alloc fail", + QDF_MAC_ADDR_REF(macaddr)); wlan_objmgr_peer_obj_delete(peer); return NULL; } - obj_mgr_debug("Created peer " QDF_MAC_ADDR_STR " type %d", - QDF_MAC_ADDR_ARRAY(macaddr), type); + obj_mgr_debug("Created peer " QDF_MAC_ADDR_FMT " type %d", + QDF_MAC_ADDR_REF(macaddr), type); return peer; } @@ -298,13 +289,13 @@ static QDF_STATUS wlan_objmgr_peer_obj_destroy(struct wlan_objmgr_peer *peer) macaddr = wlan_peer_get_macaddr(peer); - obj_mgr_debug("Physically deleting peer " QDF_MAC_ADDR_STR, - QDF_MAC_ADDR_ARRAY(macaddr)); + obj_mgr_debug("Physically deleting peer " QDF_MAC_ADDR_FMT, + QDF_MAC_ADDR_REF(macaddr)); if (peer->obj_state != WLAN_OBJ_STATE_LOGICALLY_DELETED) { obj_mgr_err("PEER object del is not invoked obj_state:%d peer " - QDF_MAC_ADDR_STR, peer->obj_state, - QDF_MAC_ADDR_ARRAY(macaddr)); + QDF_MAC_ADDR_FMT, peer->obj_state, + QDF_MAC_ADDR_REF(macaddr)); WLAN_OBJMGR_BUG(0); } @@ -350,8 +341,8 @@ QDF_STATUS wlan_objmgr_peer_obj_delete(struct wlan_objmgr_peer *peer) macaddr = wlan_peer_get_macaddr(peer); wlan_peer_obj_unlock(peer); - obj_mgr_debug("Logically deleting peer " QDF_MAC_ADDR_STR, - QDF_MAC_ADDR_ARRAY(macaddr)); + obj_mgr_debug("Logically deleting peer " QDF_MAC_ADDR_FMT, + QDF_MAC_ADDR_REF(macaddr)); print_idx = qdf_get_pidx(); wlan_objmgr_print_peer_ref_ids(peer, QDF_TRACE_LEVEL_DEBUG); @@ -620,9 +611,8 @@ wlan_objmgr_peer_release_debug_id_ref(struct wlan_objmgr_peer *peer, macaddr = wlan_peer_get_macaddr(peer); obj_mgr_err( - "peer(%02x:%02x:%02x:%02x:%02x:%02x) ref was not taken by %d", - macaddr[0], macaddr[1], macaddr[2], - macaddr[3], macaddr[4], macaddr[5], id); + "peer("QDF_MAC_ADDR_FMT") ref was not taken by %d", + QDF_MAC_ADDR_REF(macaddr), id); wlan_objmgr_print_ref_ids(peer->peer_objmgr.ref_id_dbg, QDF_TRACE_LEVEL_FATAL); WLAN_OBJMGR_BUG(0); @@ -726,8 +716,8 @@ QDF_STATUS wlan_objmgr_peer_try_get_ref_debug(struct wlan_objmgr_peer *peer, macaddr = wlan_peer_get_macaddr(peer); obj_mgr_debug( - "peer(" QDF_MAC_ADDR_STR ") not in Created st(%d)", - QDF_MAC_ADDR_ARRAY(macaddr), + "peer(" QDF_MAC_ADDR_FMT ") not in Created st(%d)", + QDF_MAC_ADDR_REF(macaddr), peer->obj_state); } return QDF_STATUS_E_RESOURCES; @@ -759,8 +749,8 @@ QDF_STATUS wlan_objmgr_peer_try_get_ref(struct wlan_objmgr_peer *peer, macaddr = wlan_peer_get_macaddr(peer); obj_mgr_debug( - "peer(" QDF_MAC_ADDR_STR ") not in Created st(%d)", - QDF_MAC_ADDR_ARRAY(macaddr), + "peer(" QDF_MAC_ADDR_FMT ") not in Created st(%d)", + QDF_MAC_ADDR_REF(macaddr), peer->obj_state); } return QDF_STATUS_E_RESOURCES; @@ -1190,9 +1180,8 @@ void wlan_objmgr_peer_release_ref_debug(struct wlan_objmgr_peer *peer, uint8_t *macaddr; macaddr = wlan_peer_get_macaddr(peer); - obj_mgr_err("peer(%02x:%02x:%02x:%02x:%02x:%02x) ref cnt is 0", - macaddr[0], macaddr[1], macaddr[2], - macaddr[3], macaddr[4], macaddr[5]); + obj_mgr_err("peer("QDF_MAC_ADDR_FMT") ref cnt is 0", + QDF_MAC_ADDR_REF(macaddr)); WLAN_OBJMGR_BUG(0); return; } @@ -1234,9 +1223,8 @@ void wlan_objmgr_peer_release_ref(struct wlan_objmgr_peer *peer, uint8_t *macaddr; macaddr = wlan_peer_get_macaddr(peer); - obj_mgr_err("peer(%02x:%02x:%02x:%02x:%02x:%02x) ref cnt is 0", - macaddr[0], macaddr[1], macaddr[2], - macaddr[3], macaddr[4], macaddr[5]); + obj_mgr_err("peer("QDF_MAC_ADDR_FMT") ref cnt is 0", + QDF_MAC_ADDR_REF(macaddr)); WLAN_OBJMGR_BUG(0); return; } diff --git a/umac/cmn_services/obj_mgr/src/wlan_objmgr_psoc_obj.c b/umac/cmn_services/obj_mgr/src/wlan_objmgr_psoc_obj.c index 8556a7619533..4699e18f086f 100644 --- a/umac/cmn_services/obj_mgr/src/wlan_objmgr_psoc_obj.c +++ b/umac/cmn_services/obj_mgr/src/wlan_objmgr_psoc_obj.c @@ -2878,8 +2878,8 @@ wlan_objmgr_print_peer_ref_leaks(struct wlan_objmgr_peer *peer, int vdev_id) ref_id_dbg = peer->peer_objmgr.ref_id_dbg; wlan_objmgr_for_each_refs(ref_id_dbg, ref_id, refs) { - obj_mgr_alert(QDF_MAC_ADDR_STR " %7u %4u %s", - QDF_MAC_ADDR_ARRAY(peer->macaddr), + obj_mgr_alert(QDF_MAC_ADDR_FMT " %7u %4u %s", + QDF_MAC_ADDR_REF(peer->macaddr), vdev_id, refs, string_from_dbgid(ref_id)); @@ -2889,8 +2889,8 @@ wlan_objmgr_print_peer_ref_leaks(struct wlan_objmgr_peer *peer, int vdev_id) static inline void wlan_objmgr_print_peer_ref_leaks(struct wlan_objmgr_peer *peer, int vdev_id) { - obj_mgr_alert(QDF_MAC_ADDR_STR " %7u %4u %s", - QDF_MAC_ADDR_ARRAY(peer->macaddr), + obj_mgr_alert(QDF_MAC_ADDR_FMT " %7u %4u %s", + QDF_MAC_ADDR_REF(peer->macaddr), vdev_id, qdf_atomic_read(&peer->peer_objmgr.ref_cnt), "TOTAL_REF_COUNT"); diff --git a/umac/mlme/connection_mgr/core/src/wlan_cm_bss_scoring.c b/umac/mlme/connection_mgr/core/src/wlan_cm_bss_scoring.c index 01a936cdf1f6..05565ff045ae 100644 --- a/umac/mlme/connection_mgr/core/src/wlan_cm_bss_scoring.c +++ b/umac/mlme/connection_mgr/core/src/wlan_cm_bss_scoring.c @@ -846,8 +846,9 @@ static int cm_calculate_bss_score(struct wlan_objmgr_psoc *psoc, if (score_config->is_bssid_hint_priority && bssid_hint && qdf_is_macaddr_equal(bssid_hint, &entry->bssid)) { entry->bss_score = CM_BEST_CANDIDATE_MAX_BSS_SCORE; - mlme_nofl_debug("Candidate(%pM freq %d): rssi %d BSSID hint given, give max score %d", - entry->bssid.bytes, entry->channel.chan_freq, + mlme_nofl_debug("Candidate("QDF_MAC_ADDR_FMT" freq %d): rssi %d BSSID hint given, give max score %d", + QDF_MAC_ADDR_REF(entry->bssid.bytes), + entry->channel.chan_freq, entry->rssi_raw, CM_BEST_CANDIDATE_MAX_BSS_SCORE); return CM_BEST_CANDIDATE_MAX_BSS_SCORE; @@ -974,8 +975,9 @@ static int cm_calculate_bss_score(struct wlan_objmgr_psoc *psoc, prorated_pcnt, sta_nss); score += nss_score; - mlme_nofl_debug("Candidate(%pM freq %d): rssi %d HT %d VHT %d HE %d su bfer %d phy %d air time frac %d qbss %d cong_pct %d NSS %d ap_tx_pwr_dbm %d oce_subnet_id_present %d prorated_pcnt %d", - entry->bssid.bytes, entry->channel.chan_freq, + mlme_nofl_debug("Candidate("QDF_MAC_ADDR_FMT" freq %d): rssi %d HT %d VHT %d HE %d su bfer %d phy %d air time frac %d qbss %d cong_pct %d NSS %d ap_tx_pwr_dbm %d oce_subnet_id_present %d prorated_pcnt %d", + QDF_MAC_ADDR_REF(entry->bssid.bytes), + entry->channel.chan_freq, entry->rssi_raw, util_scan_entry_htcap(entry) ? 1 : 0, util_scan_entry_vhtcap(entry) ? 1 : 0, util_scan_entry_hecap(entry) ? 1 : 0, ap_su_beam_former, @@ -1032,8 +1034,9 @@ static bool cm_is_assoc_allowed(struct psoc_mlme_obj *mlme_psoc_obj, if (check_assoc_disallowed && wlan_parse_oce_assoc_disallowed_ie(mbo_oce, &reason)) { - mlme_nofl_debug("Candidate(%pM freq %d): rssi %d, assoc disallowed set in MBO/OCE IE reason %d", - entry->bssid.bytes, entry->channel.chan_freq, + mlme_nofl_debug("Candidate("QDF_MAC_ADDR_FMT" freq %d): rssi %d, assoc disallowed set in MBO/OCE IE reason %d", + QDF_MAC_ADDR_REF(entry->bssid.bytes), + entry->channel.chan_freq, entry->rssi_raw, reason); return false; } @@ -1123,8 +1126,8 @@ void wlan_cm_calculate_bss_score(struct wlan_objmgr_pdev *pdev, /* add min score so that it is added back in the end */ scan_entry->entry->bss_score = CM_AVOID_CANDIDATE_MIN_SCORE; - mlme_nofl_debug("Candidate(%pM freq %d): rssi %d, is in Avoidlist, give min score %d", - scan_entry->entry->bssid.bytes, + mlme_nofl_debug("Candidate("QDF_MAC_ADDR_FMT" freq %d): rssi %d, is in Avoidlist, give min score %d", + QDF_MAC_ADDR_REF(scan_entry->entry->bssid.bytes), scan_entry->entry->channel.chan_freq, scan_entry->entry->rssi_raw, scan_entry->entry->bss_score); @@ -1133,8 +1136,8 @@ void wlan_cm_calculate_bss_score(struct wlan_objmgr_pdev *pdev, /* Remove node from current locaion to add node back shorted */ status = qdf_list_remove_node(scan_list, cur_node); if (QDF_IS_STATUS_ERROR(status)) { - mlme_err("failed to remove node for BSS %pM from scan list", - scan_entry->entry->bssid.bytes); + mlme_err("failed to remove node for BSS "QDF_MAC_ADDR_FMT" from scan list", + QDF_MAC_ADDR_REF(scan_entry->entry->bssid.bytes)); return; } @@ -1144,8 +1147,8 @@ void wlan_cm_calculate_bss_score(struct wlan_objmgr_pdev *pdev, */ if (blacklist_action == CM_BLM_REMOVE) { if (assoc_allowed) - mlme_nofl_debug("Candidate(%pM freq %d): rssi %d, is in Blacklist, remove entry", - scan_entry->entry->bssid.bytes, + mlme_nofl_debug("Candidate("QDF_MAC_ADDR_FMT" freq %d): rssi %d, is in Blacklist, remove entry", + QDF_MAC_ADDR_REF(scan_entry->entry->bssid.bytes), scan_entry->entry->channel.chan_freq, scan_entry->entry->rssi_raw); util_scan_free_cache_entry(scan_entry->entry); diff --git a/umac/scan/core/src/wlan_scan_cache_db.c b/umac/scan/core/src/wlan_scan_cache_db.c index af05bbae1a95..bae35095182e 100644 --- a/umac/scan/core/src/wlan_scan_cache_db.c +++ b/umac/scan/core/src/wlan_scan_cache_db.c @@ -103,7 +103,8 @@ static void scm_add_rnr_channel_db(struct wlan_objmgr_psoc *psoc, if (!(is_6g_bss || entry->ie_list.rnrie)) return; - scm_debug("BSS freq %d BSSID: %pM", chan_freq, entry->bssid.bytes); + scm_debug("BSS freq %d BSSID: "QDF_MAC_ADDR_FMT, chan_freq, + QDF_MAC_ADDR_REF(entry->bssid.bytes)); if (is_6g_bss) { channel = scm_get_chan_meta(psoc, chan_freq); if (!channel) { @@ -151,8 +152,9 @@ static void scm_add_rnr_channel_db(struct wlan_objmgr_psoc *psoc, QDF_MAC_ADDR_SIZE); if (rnr_bss->short_ssid) rnr_node->entry.short_ssid = rnr_bss->short_ssid; - scm_debug("Add freq %d: %pM short ssid %x", chan_freq, - rnr_bss->bssid.bytes, rnr_bss->short_ssid); + scm_debug("Add freq %d: "QDF_MAC_ADDR_FMT" short ssid %x", chan_freq, + QDF_MAC_ADDR_REF(rnr_bss->bssid.bytes), + rnr_bss->short_ssid); qdf_list_insert_back(&channel->rnr_list, &rnr_node->node); } @@ -421,8 +423,8 @@ static void scm_check_and_age_out(struct scan_dbs *scan_db, { if (util_scan_entry_age(node->entry) >= scan_aging_time) { - scm_debug("Aging out BSSID: %pM with age %lu ms", - node->entry->bssid.bytes, + scm_debug("Aging out BSSID: "QDF_MAC_ADDR_FMT" with age %lu ms", + QDF_MAC_ADDR_REF(node->entry->bssid.bytes), util_scan_entry_age(node->entry)); qdf_spin_lock_bh(&scan_db->scan_db_lock); scm_scan_entry_del(scan_db, node); @@ -544,9 +546,9 @@ static QDF_STATUS scm_flush_oldest_entry(struct scan_dbs *scan_db) } if (oldest_node) { - scm_debug("Flush oldest BSSID: %pM with age %lu ms", - oldest_node->entry->bssid.bytes, - util_scan_entry_age(oldest_node->entry)); + scm_debug("Flush oldest BSSID: "QDF_MAC_ADDR_FMT" with age %lu ms", + QDF_MAC_ADDR_REF(oldest_node->entry->bssid.bytes), + util_scan_entry_age(oldest_node->entry)); /* Release ref_cnt taken for oldest_node and delete it */ qdf_spin_lock_bh(&scan_db->scan_db_lock); scm_scan_entry_del(scan_db, oldest_node); @@ -655,8 +657,8 @@ scm_copy_info_from_dup_entry(struct wlan_objmgr_pdev *pdev, scan_params->frm_subtype == MGMT_SUBTYPE_BEACON && !util_scan_is_null_ssid(&scan_params->ssid)) { if (scan_obj->cb.unlink_bss) { - scm_debug("Hidden AP %pM switch to non-hidden SSID, So unlink the entry", - scan_entry->bssid.bytes); + scm_debug("Hidden AP "QDF_MAC_ADDR_FMT" switch to non-hidden SSID, So unlink the entry", + QDF_MAC_ADDR_REF(scan_entry->bssid.bytes)); scan_obj->cb.unlink_bss(pdev, scan_entry); } } @@ -842,16 +844,17 @@ static QDF_STATUS scm_add_update_entry(struct wlan_objmgr_psoc *psoc, if (scan_params->ie_list.csa || scan_params->ie_list.xcsa || scan_params->ie_list.cswrp) - scm_debug("CSA IE present for BSSID: %pM", - scan_params->bssid.bytes); + scm_debug("CSA IE present for BSSID: "QDF_MAC_ADDR_FMT, + QDF_MAC_ADDR_REF(scan_params->bssid.bytes)); is_dup_found = scm_find_duplicate(pdev, scan_obj, scan_db, scan_params, &dup_node); security_type = scan_params->security_type; - scm_nofl_debug("Received %s: %pM \"%.*s\" freq %d rssi %d tsf_delta %u seq %d snr %d phy %d hidden %d mismatch %d %s%s%s%s pdev %d boot_time %llu ns", + scm_nofl_debug("Received %s: "QDF_MAC_ADDR_FMT" \"%.*s\" freq %d rssi %d tsf_delta %u seq %d snr %d phy %d hidden %d mismatch %d %s%s%s%s pdev %d boot_time %llu ns", (scan_params->frm_subtype == MGMT_SUBTYPE_PROBE_RESP) ? - "prb rsp" : "bcn", scan_params->bssid.bytes, + "prb rsp" : "bcn", + QDF_MAC_ADDR_REF(scan_params->bssid.bytes), scan_params->ssid.length, scan_params->ssid.ssid, scan_params->channel.chan_freq, scan_params->rssi_raw, scan_params->tsf_delta, scan_params->seq_num, @@ -962,8 +965,8 @@ QDF_STATUS __scm_handle_bcn_probe(struct scan_bcn_probe_event *bcn) qdf_nbuf_len(bcn->buf), bcn->frm_type, bcn->rx_data); if (!scan_list || qdf_list_empty(scan_list)) { - scm_debug("failed to unpack %d frame BSSID: %pM", - bcn->frm_type, hdr->i_addr3); + scm_debug("failed to unpack %d frame BSSID: "QDF_MAC_ADDR_FMT, + bcn->frm_type, QDF_MAC_ADDR_REF(hdr->i_addr3)); status = QDF_STATUS_E_INVAL; goto free_nbuf; } @@ -972,8 +975,8 @@ QDF_STATUS __scm_handle_bcn_probe(struct scan_bcn_probe_event *bcn) for (i = 0; i < list_count; i++) { status = qdf_list_remove_front(scan_list, &next_node); if (QDF_IS_STATUS_ERROR(status) || !next_node) { - scm_debug("list remove failure i:%d, lsize:%d, BSSID: %pM", - i, list_count, hdr->i_addr3); + scm_debug("list remove failure i:%d, lsize:%d, BSSID: "QDF_MAC_ADDR_FMT, + i, list_count, QDF_MAC_ADDR_REF(hdr->i_addr3)); status = QDF_STATUS_E_INVAL; goto free_nbuf; } @@ -985,8 +988,8 @@ QDF_STATUS __scm_handle_bcn_probe(struct scan_bcn_probe_event *bcn) if (scan_obj->drop_bcn_on_chan_mismatch && scan_entry->channel_mismatch) { - scm_nofl_debug("Drop frame for chan mismatch %pM Seq Num: %d freq %d RSSI %d", - scan_entry->bssid.bytes, + scm_nofl_debug("Drop frame for chan mismatch "QDF_MAC_ADDR_FMT" Seq Num: %d freq %d RSSI %d", + QDF_MAC_ADDR_REF(scan_entry->bssid.bytes), scan_entry->seq_num, scan_entry->channel.chan_freq, scan_entry->rssi_raw); @@ -998,7 +1001,7 @@ QDF_STATUS __scm_handle_bcn_probe(struct scan_bcn_probe_event *bcn) if (scan_obj->drop_bcn_on_invalid_freq && wlan_reg_is_disable_for_freq(pdev, scan_entry->channel.chan_freq)) { - scm_nofl_debug("Drop frame for invalid freq %d: %pM Seq Num: %d RSSI %d", + scm_nofl_debug("Drop frame for invalid freq %d: "QDF_MAC_ADDR_FMT" Seq Num: %d RSSI %d", scan_entry->channel.chan_freq, scan_entry->bssid.bytes, scan_entry->seq_num, @@ -1012,8 +1015,8 @@ QDF_STATUS __scm_handle_bcn_probe(struct scan_bcn_probe_event *bcn) status = scm_add_update_entry(psoc, pdev, scan_entry); if (QDF_IS_STATUS_ERROR(status)) { - scm_debug("failed to add entry for BSSID: %pM Seq Num: %d", - scan_entry->bssid.bytes, + scm_debug("failed to add entry for BSSID: "QDF_MAC_ADDR_FMT" Seq Num: %d", + QDF_MAC_ADDR_REF(scan_entry->bssid.bytes), scan_entry->seq_num); util_scan_free_cache_entry(scan_entry); qdf_mem_free(scan_node); diff --git a/umac/scan/core/src/wlan_scan_filter.c b/umac/scan/core/src/wlan_scan_filter.c index fde366419955..0334f6b82b5b 100644 --- a/umac/scan/core/src/wlan_scan_filter.c +++ b/umac/scan/core/src/wlan_scan_filter.c @@ -39,22 +39,24 @@ static bool scm_check_open(struct scan_filter *filter, struct security_info *security) { if (db_entry->cap_info.wlan_caps.privacy) { - scm_debug("%pM : have privacy set", - db_entry->bssid.bytes); + scm_debug(QDF_MAC_ADDR_FMT" : have privacy set", + QDF_MAC_ADDR_REF(db_entry->bssid.bytes)); return false; } if (filter->ucastcipherset && !(QDF_HAS_PARAM(filter->ucastcipherset, WLAN_CRYPTO_CIPHER_NONE))) { - scm_debug("%pM : Filter doesn't have CIPHER none in uc %x", - db_entry->bssid.bytes, filter->ucastcipherset); + scm_debug(QDF_MAC_ADDR_FMT" : Filter doesn't have CIPHER none in uc %x", + QDF_MAC_ADDR_REF(db_entry->bssid.bytes), + filter->ucastcipherset); return false; } if (filter->mcastcipherset && !(QDF_HAS_PARAM(filter->mcastcipherset, WLAN_CRYPTO_CIPHER_NONE))) { - scm_debug("%pM : Filter doesn't have CIPHER none in mc %x", - db_entry->bssid.bytes, filter->mcastcipherset); + scm_debug(QDF_MAC_ADDR_FMT" : Filter doesn't have CIPHER none in mc %x", + QDF_MAC_ADDR_REF(db_entry->bssid.bytes), + filter->mcastcipherset); return false; } @@ -78,19 +80,21 @@ static bool scm_check_wep(struct scan_filter *filter, { /* If privacy bit is not set, consider no match */ if (!db_entry->cap_info.wlan_caps.privacy) { - scm_debug("%pM : doesn't have privacy set", - db_entry->bssid.bytes); + scm_debug(QDF_MAC_ADDR_FMT" : doesn't have privacy set", + QDF_MAC_ADDR_REF(db_entry->bssid.bytes)); return false; } if (!(db_entry->security_type & SCAN_SECURITY_TYPE_WEP)) { - scm_debug("%pM : doesn't support WEP", db_entry->bssid.bytes); + scm_debug(QDF_MAC_ADDR_FMT" : doesn't support WEP", + QDF_MAC_ADDR_REF(db_entry->bssid.bytes)); return false; } if (!filter->ucastcipherset || !filter->mcastcipherset) { - scm_debug("%pM : Filter uc %x or mc %x cipher are 0", - db_entry->bssid.bytes, filter->ucastcipherset, + scm_debug(QDF_MAC_ADDR_FMT" : Filter uc %x or mc %x cipher are 0", + QDF_MAC_ADDR_REF(db_entry->bssid.bytes), + filter->ucastcipherset, filter->mcastcipherset); return false; } @@ -99,8 +103,9 @@ static bool scm_check_wep(struct scan_filter *filter, QDF_HAS_PARAM(filter->ucastcipherset, WLAN_CRYPTO_CIPHER_WEP_40) || QDF_HAS_PARAM(filter->ucastcipherset, WLAN_CRYPTO_CIPHER_WEP_104))) { - scm_debug("%pM : Filter doesn't have WEP cipher in uc %x", - db_entry->bssid.bytes, filter->ucastcipherset); + scm_debug(QDF_MAC_ADDR_FMT" : Filter doesn't have WEP cipher in uc %x", + QDF_MAC_ADDR_REF(db_entry->bssid.bytes), + filter->ucastcipherset); return false; } @@ -108,8 +113,9 @@ static bool scm_check_wep(struct scan_filter *filter, QDF_HAS_PARAM(filter->mcastcipherset, WLAN_CRYPTO_CIPHER_WEP_40) || QDF_HAS_PARAM(filter->mcastcipherset, WLAN_CRYPTO_CIPHER_WEP_104))) { - scm_debug("%pM : Filter doesn't have WEP cipher in mc %x", - db_entry->bssid.bytes, filter->mcastcipherset); + scm_debug(QDF_MAC_ADDR_FMT" : Filter doesn't have WEP cipher in mc %x", + QDF_MAC_ADDR_REF(db_entry->bssid.bytes), + filter->mcastcipherset); return false; } @@ -186,8 +192,8 @@ static bool scm_chk_crypto_params(struct scan_filter *filter, struct security_info *security) { if (!scm_chk_if_cipher_n_akm_match(filter, ap_crypto)) { - scm_debug("%pM: fail. adaptive 11r %d Self: AKM %x CIPHER: mc %x uc %x mgmt %x pmf %d AP: AKM %x CIPHER: mc %x uc %x mgmt %x, RSN caps %x", - db_entry->bssid.bytes, is_adaptive_11r, + scm_debug(QDF_MAC_ADDR_FMT": fail. adaptive 11r %d Self: AKM %x CIPHER: mc %x uc %x mgmt %x pmf %d AP: AKM %x CIPHER: mc %x uc %x mgmt %x, RSN caps %x", + QDF_MAC_ADDR_REF(db_entry->bssid.bytes), is_adaptive_11r, filter->key_mgmt, filter->mcastcipherset, filter->ucastcipherset, filter->mgmtcipherset, filter->pmf_cap, ap_crypto->key_mgmt, @@ -223,7 +229,8 @@ static bool scm_check_rsn(struct scan_filter *filter, bool match; if (!util_scan_entry_rsn(db_entry)) { - scm_debug("%pM : doesn't have RSN IE", db_entry->bssid.bytes); + scm_debug(QDF_MAC_ADDR_FMT" : doesn't have RSN IE", + QDF_MAC_ADDR_REF(db_entry->bssid.bytes)); return false; } @@ -233,8 +240,8 @@ static bool scm_check_rsn(struct scan_filter *filter, status = wlan_crypto_rsnie_check(ap_crypto, util_scan_entry_rsn(db_entry)); if (QDF_IS_STATUS_ERROR(status)) { - scm_err("%pM: failed to parse RSN IE, status %d", - db_entry->bssid.bytes, status); + scm_err(QDF_MAC_ADDR_FMT": failed to parse RSN IE, status %d", + QDF_MAC_ADDR_REF(db_entry->bssid.bytes), status); qdf_mem_free(ap_crypto); return false; } @@ -290,8 +297,8 @@ static bool scm_check_wpa(struct scan_filter *filter, bool match; if (!util_scan_entry_wpa(db_entry)) { - scm_debug("%pM : doesn't have WPA IE", - db_entry->bssid.bytes); + scm_debug(QDF_MAC_ADDR_FMT" : doesn't have WPA IE", + QDF_MAC_ADDR_REF(db_entry->bssid.bytes)); return false; } @@ -302,8 +309,8 @@ static bool scm_check_wpa(struct scan_filter *filter, status = wlan_crypto_wpaie_check(ap_crypto, util_scan_entry_wpa(db_entry)); if (QDF_IS_STATUS_ERROR(status)) { - scm_err("%pM: failed to parse WPA IE, status %d", - db_entry->bssid.bytes, status); + scm_err(QDF_MAC_ADDR_FMT": failed to parse WPA IE, status %d", + QDF_MAC_ADDR_REF(db_entry->bssid.bytes), status); qdf_mem_free(ap_crypto); return false; } @@ -331,8 +338,8 @@ static bool scm_check_wapi(struct scan_filter *filter, struct wlan_crypto_params *ap_crypto; if (!util_scan_entry_wapi(db_entry)) { - scm_debug("%pM : doesn't have WAPI IE", - db_entry->bssid.bytes); + scm_debug(QDF_MAC_ADDR_FMT" : doesn't have WAPI IE", + QDF_MAC_ADDR_REF(db_entry->bssid.bytes)); return false; } @@ -343,15 +350,15 @@ static bool scm_check_wapi(struct scan_filter *filter, status = wlan_crypto_wapiie_check(ap_crypto, util_scan_entry_wapi(db_entry)); if (QDF_IS_STATUS_ERROR(status)) { - scm_err("%pM: failed to parse WAPI IE, status %d", - db_entry->bssid.bytes, status); + scm_err(QDF_MAC_ADDR_FMT": failed to parse WAPI IE, status %d", + QDF_MAC_ADDR_REF(db_entry->bssid.bytes), status); qdf_mem_free(ap_crypto); return false; } if (!scm_chk_if_cipher_n_akm_match(filter, ap_crypto)) { - scm_debug("%pM: fail. Self: AKM %x CIPHER: mc %x uc %x mgmt %x pmf %d AP: AKM %x CIPHER: mc %x uc %x mgmt %x, RSN caps %x", - db_entry->bssid.bytes, filter->key_mgmt, + scm_debug(QDF_MAC_ADDR_FMT": fail. Self: AKM %x CIPHER: mc %x uc %x mgmt %x pmf %d AP: AKM %x CIPHER: mc %x uc %x mgmt %x, RSN caps %x", + QDF_MAC_ADDR_REF(db_entry->bssid.bytes), filter->key_mgmt, filter->mcastcipherset, filter->ucastcipherset, filter->mgmtcipherset, filter->pmf_cap, ap_crypto->key_mgmt, ap_crypto->mcastcipherset, @@ -396,8 +403,8 @@ static bool scm_match_any_security(struct scan_filter *filter, status = wlan_crypto_rsnie_check(ap_crypto, util_scan_entry_rsn(db_entry)); if (QDF_IS_STATUS_ERROR(status)) { - scm_err("%pM: failed to parse RSN IE, status %d", - db_entry->bssid.bytes, status); + scm_err(QDF_MAC_ADDR_FMT": failed to parse RSN IE, status %d", + QDF_MAC_ADDR_REF(db_entry->bssid.bytes), status); goto free; } security->mcastcipherset = ap_crypto->mcastcipherset; @@ -412,8 +419,8 @@ static bool scm_match_any_security(struct scan_filter *filter, status = wlan_crypto_wpaie_check(ap_crypto, util_scan_entry_wpa(db_entry)); if (QDF_IS_STATUS_ERROR(status)) { - scm_err("%pM: failed to parse WPA IE, status %d", - db_entry->bssid.bytes, status); + scm_err(QDF_MAC_ADDR_FMT": failed to parse WPA IE, status %d", + QDF_MAC_ADDR_REF(db_entry->bssid.bytes), status); goto free; } security->mcastcipherset = ap_crypto->mcastcipherset; @@ -428,8 +435,9 @@ static bool scm_match_any_security(struct scan_filter *filter, status = wlan_crypto_wapiie_check(ap_crypto, util_scan_entry_wapi(db_entry)); if (QDF_IS_STATUS_ERROR(status)) { - scm_err("%pM: failed to parse WPA IE, status %d", - db_entry->bssid.bytes, status); + scm_err(QDF_MAC_ADDR_FMT": failed to parse WPA IE, status %d", + QDF_MAC_ADDR_REF(db_entry->bssid.bytes), + status); goto free; } security->mcastcipherset = ap_crypto->mcastcipherset; @@ -643,8 +651,8 @@ bool scm_filter_match(struct wlan_objmgr_psoc *psoc, if (filter->ignore_nol_chan && utils_dfs_is_freq_in_nol(pdev, db_entry->channel.chan_freq)) { wlan_objmgr_pdev_release_ref(pdev, WLAN_SCAN_ID); - scm_debug("%pM : Ignore as chan in NOL list", - db_entry->bssid.bytes); + scm_debug(QDF_MAC_ADDR_FMT" : Ignore as chan in NOL list", + QDF_MAC_ADDR_REF(db_entry->bssid.bytes)); return false; } wlan_objmgr_pdev_release_ref(pdev, WLAN_SCAN_ID); @@ -667,8 +675,8 @@ bool scm_filter_match(struct wlan_objmgr_psoc *psoc, if (!filter->ignore_auth_enc_type && !filter->match_security_func && !scm_is_security_match(filter, db_entry, security)) { - scm_debug("%pM : Ignore as security profile didn't match", - db_entry->bssid.bytes); + scm_debug(QDF_MAC_ADDR_FMT" : Ignore as security profile didn't match", + QDF_MAC_ADDR_REF(db_entry->bssid.bytes)); return false; } @@ -690,15 +698,15 @@ bool scm_filter_match(struct wlan_objmgr_psoc *psoc, /* Match realm */ if (!scm_is_fils_config_match(filter, db_entry)) { - scm_debug("%pM :Ignore as fils config didn't match", - db_entry->bssid.bytes); + scm_debug(QDF_MAC_ADDR_FMT" :Ignore as fils config didn't match", + QDF_MAC_ADDR_REF(db_entry->bssid.bytes)); return false; } if (!util_mdie_match(filter->mobility_domain, (struct rsn_mdie *)db_entry->ie_list.mdie)) { - scm_debug("%pM : Ignore as mdie didn't match", - db_entry->bssid.bytes); + scm_debug(QDF_MAC_ADDR_FMT" : Ignore as mdie didn't match", + QDF_MAC_ADDR_REF(db_entry->bssid.bytes)); return false; } return true; diff --git a/umac/scan/dispatcher/src/wlan_scan_ucfg_api.c b/umac/scan/dispatcher/src/wlan_scan_ucfg_api.c index cc9dfe61927b..ce36a4c74f79 100644 --- a/umac/scan/dispatcher/src/wlan_scan_ucfg_api.c +++ b/umac/scan/dispatcher/src/wlan_scan_ucfg_api.c @@ -624,8 +624,8 @@ ucfg_scan_config_hidden_ssid_for_bssid(struct wlan_objmgr_pdev *pdev, if (!scan_obj) return QDF_STATUS_E_FAILURE; - scm_debug("Configure bsssid:%pM ssid:%.*s", - bssid, ssid->length, ssid->ssid); + scm_debug("Configure bsssid:"QDF_MAC_ADDR_FMT" ssid:%.*s", + QDF_MAC_ADDR_REF(bssid), ssid->length, ssid->ssid); qdf_mem_copy(scan_obj->pdev_info[pdev_id].conf_bssid, bssid, QDF_MAC_ADDR_SIZE); scan_obj->pdev_info[pdev_id].conf_ssid.length = ssid->length; diff --git a/umac/scan/dispatcher/src/wlan_scan_utils_api.c b/umac/scan/dispatcher/src/wlan_scan_utils_api.c index 3fc4e74c50fa..c1f01943f5c5 100644 --- a/umac/scan/dispatcher/src/wlan_scan_utils_api.c +++ b/umac/scan/dispatcher/src/wlan_scan_utils_api.c @@ -274,8 +274,8 @@ util_scan_get_chan_from_he_6g_params(struct wlan_objmgr_pdev *pdev, band_mask); if (scan_obj->drop_bcn_on_invalid_freq && wlan_reg_is_disable_for_freq(pdev, *chan_freq)) { - scm_debug_rl("%pM: Drop as invalid channel %d freq %d in HE 6Ghz params", - scan_params->bssid.bytes, + scm_debug_rl(QDF_MAC_ADDR_FMT": Drop as invalid channel %d freq %d in HE 6Ghz params", + QDF_MAC_ADDR_REF(scan_params->bssid.bytes), he_6g_params->primary_channel, *chan_freq); return QDF_STATUS_E_INVAL; } @@ -955,8 +955,8 @@ util_scan_populate_bcn_ie_list(struct wlan_objmgr_pdev *pdev, /* Drop if invalid freq */ if (scan_obj->drop_bcn_on_invalid_freq && wlan_reg_is_disable_for_freq(pdev, *chan_freq)) { - scm_debug_rl("%pM: Drop as invalid channel %d freq %d in DS IE", - scan_params->bssid.bytes, + scm_debug_rl(QDF_MAC_ADDR_FMT": Drop as invalid channel %d freq %d in DS IE", + QDF_MAC_ADDR_REF(scan_params->bssid.bytes), chan_idx, *chan_freq); return QDF_STATUS_E_INVAL; } @@ -1043,8 +1043,8 @@ util_scan_populate_bcn_ie_list(struct wlan_objmgr_pdev *pdev, /* Drop if invalid freq */ if (scan_obj->drop_bcn_on_invalid_freq && wlan_reg_is_disable_for_freq(pdev, *chan_freq)) { - scm_debug_rl("%pM: Drop as invalid channel %d freq %d in HT_INFO IE", - scan_params->bssid.bytes, + scm_debug_rl(QDF_MAC_ADDR_FMT": Drop as invalid channel %d freq %d in HT_INFO IE", + QDF_MAC_ADDR_REF(scan_params->bssid.bytes), chan_idx, *chan_freq); return QDF_STATUS_E_INVAL; } @@ -1606,8 +1606,8 @@ util_scan_gen_scan_entry(struct wlan_objmgr_pdev *pdev, status = util_scan_populate_bcn_ie_list(pdev, scan_entry, &chan_freq, band_mask); if (QDF_IS_STATUS_ERROR(status)) { - scm_debug("%pM: failed to parse beacon IE", - scan_entry->bssid.bytes); + scm_debug(QDF_MAC_ADDR_FMT": failed to parse beacon IE", + QDF_MAC_ADDR_REF(scan_entry->bssid.bytes)); qdf_mem_free(scan_entry->raw_frame.ptr); qdf_mem_free(scan_entry); return QDF_STATUS_E_FAILURE;