From 451c5f8601ffc1856c3fbf37d5c5cff6c19bda82 Mon Sep 17 00:00:00 2001 From: Srinivas Girigowda Date: Mon, 10 Aug 2020 17:01:51 -0700 Subject: [PATCH] qcacld-3.0: dp: 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: 2752355 Change-Id: I40cab2cd3dc959dfab4eb7f32756308338de675b --- core/dp/txrx/ol_rx.c | 8 ++-- core/dp/txrx/ol_rx_pn.c | 12 ++--- core/dp/txrx/ol_rx_reorder.c | 8 ++-- core/dp/txrx/ol_tx_classify.c | 14 +++--- core/dp/txrx/ol_tx_queue.c | 14 +++--- core/dp/txrx/ol_txrx.c | 55 +++++++++++----------- core/dp/txrx/ol_txrx_ipa.c | 7 +-- core/dp/txrx/ol_txrx_legacy_flow_control.c | 6 +-- core/dp/txrx/ol_txrx_peer_find.c | 6 +-- 9 files changed, 64 insertions(+), 66 deletions(-) diff --git a/core/dp/txrx/ol_rx.c b/core/dp/txrx/ol_rx.c index 861215a2fddf..71030efab307 100644 --- a/core/dp/txrx/ol_rx.c +++ b/core/dp/txrx/ol_rx.c @@ -811,9 +811,9 @@ ol_rx_sec_ind_handler(ol_txrx_pdev_handle pdev, return; } ol_txrx_dbg( - "sec spec for peer %pK ("QDF_MAC_ADDR_STR"): %s key of type %d\n", + "sec spec for peer %pK ("QDF_MAC_ADDR_FMT"): %s key of type %d\n", peer, - QDF_MAC_ADDR_ARRAY(peer->mac_addr.raw), + QDF_MAC_ADDR_REF(peer->mac_addr.raw), is_unicast ? "ucast" : "mcast", sec_type); sec_index = is_unicast ? txrx_sec_ucast : txrx_sec_mcast; peer->security[sec_index].sec_type = sec_type; @@ -1414,9 +1414,9 @@ ol_rx_deliver(struct ol_txrx_vdev_t *vdev, if (OL_RX_DECAP(vdev, peer, msdu, &info) != A_OK) { discard = 1; ol_txrx_dbg( - "decap error %pK from peer %pK ("QDF_MAC_ADDR_STR") len %d\n", + "decap error %pK from peer %pK ("QDF_MAC_ADDR_FMT") len %d\n", msdu, peer, - QDF_MAC_ADDR_ARRAY(peer->mac_addr.raw), + QDF_MAC_ADDR_REF(peer->mac_addr.raw), qdf_nbuf_len(msdu)); goto DONE; } diff --git a/core/dp/txrx/ol_rx_pn.c b/core/dp/txrx/ol_rx_pn.c index 9b1749bb2b4c..94ee444cdbce 100644 --- a/core/dp/txrx/ol_rx_pn.c +++ b/core/dp/txrx/ol_rx_pn.c @@ -156,14 +156,12 @@ ol_rx_pn_check_base(struct ol_txrx_vdev_t *vdev, last_pncheck_print_time = current_time_ms; ol_txrx_warn( "PN check failed - TID %d, peer %pK " - "("QDF_MAC_ADDR_STR") %s\n" + "("QDF_MAC_ADDR_FMT") %s\n" " old PN (u64 x2)= 0x%08llx %08llx (LSBs = %lld)\n" " new PN (u64 x2)= 0x%08llx %08llx (LSBs = %lld)\n" " new seq num = %d\n", tid, peer, - peer->mac_addr.raw[0], peer->mac_addr.raw[1], - peer->mac_addr.raw[2], peer->mac_addr.raw[3], - peer->mac_addr.raw[4], peer->mac_addr.raw[5], + QDF_MAC_ADDR_REF(peer->mac_addr.raw), (index == txrx_sec_ucast) ? "ucast" : "mcast", last_pn->pn128[1], last_pn->pn128[0], @@ -175,14 +173,12 @@ ol_rx_pn_check_base(struct ol_txrx_vdev_t *vdev, } else { ol_txrx_dbg( "PN check failed - TID %d, peer %pK " - "("QDF_MAC_ADDR_STR") %s\n" + "("QDF_MAC_ADDR_FMT") %s\n" " old PN (u64 x2)= 0x%08llx %08llx (LSBs = %lld)\n" " new PN (u64 x2)= 0x%08llx %08llx (LSBs = %lld)\n" " new seq num = %d\n", tid, peer, - peer->mac_addr.raw[0], peer->mac_addr.raw[1], - peer->mac_addr.raw[2], peer->mac_addr.raw[3], - peer->mac_addr.raw[4], peer->mac_addr.raw[5], + QDF_MAC_ADDR_REF(peer->mac_addr.raw), (index == txrx_sec_ucast) ? "ucast" : "mcast", last_pn->pn128[1], last_pn->pn128[0], diff --git a/core/dp/txrx/ol_rx_reorder.c b/core/dp/txrx/ol_rx_reorder.c index 294d3396152e..8b37ec84ee58 100644 --- a/core/dp/txrx/ol_rx_reorder.c +++ b/core/dp/txrx/ol_rx_reorder.c @@ -761,11 +761,11 @@ ol_rx_pn_ind_handler(ol_txrx_pdev_handle pdev, current_time_ms; ol_txrx_warn( "Tgt PN check failed - TID %d, peer %pK " - "("QDF_MAC_ADDR_STR")\n" + "("QDF_MAC_ADDR_FMT")\n" " PN (u64 x2)= 0x%08llx %08llx (LSBs = %lld)\n" " new seq num = %d\n", tid, peer, - QDF_MAC_ADDR_ARRAY(peer->mac_addr.raw), + QDF_MAC_ADDR_REF(peer->mac_addr.raw), pn.pn128[1], pn.pn128[0], pn.pn128[0] & 0xffffffffffffULL, @@ -775,11 +775,11 @@ ol_rx_pn_ind_handler(ol_txrx_pdev_handle pdev, } else { ol_txrx_dbg( "Tgt PN check failed - TID %d, peer %pK " - "("QDF_MAC_ADDR_STR")\n" + "("QDF_MAC_ADDR_FMT")\n" " PN (u64 x2)= 0x%08llx %08llx (LSBs = %lld)\n" " new seq num = %d\n", tid, peer, - QDF_MAC_ADDR_ARRAY(peer->mac_addr.raw), + QDF_MAC_ADDR_REF(peer->mac_addr.raw), pn.pn128[1], pn.pn128[0], pn.pn128[0] & 0xffffffffffffULL, diff --git a/core/dp/txrx/ol_tx_classify.c b/core/dp/txrx/ol_tx_classify.c index 8bb5e998526b..4cc0eb366ba4 100644 --- a/core/dp/txrx/ol_tx_classify.c +++ b/core/dp/txrx/ol_tx_classify.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2019 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-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 @@ -456,9 +456,9 @@ ol_tx_classify( if (!peer) { QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, - "Error: STA %pK ("QDF_MAC_ADDR_STR") trying to send bcast DA tx data frame w/o association\n", + "Error: STA %pK ("QDF_MAC_ADDR_FMT") trying to send bcast DA tx data frame w/o association\n", vdev, - QDF_MAC_ADDR_ARRAY(vdev->mac_addr.raw)); + QDF_MAC_ADDR_REF(vdev->mac_addr.raw)); return NULL; /* error */ } else if ((peer->security[ OL_TXRX_PEER_SECURITY_MULTICAST].sec_type @@ -503,9 +503,9 @@ ol_tx_classify( if (!peer) { QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, - "Error: vdev %pK ("QDF_MAC_ADDR_STR") trying to send bcast/mcast, but no self-peer found\n", + "Error: vdev %pK ("QDF_MAC_ADDR_FMT") trying to send bcast/mcast, but no self-peer found\n", vdev, - QDF_MAC_ADDR_ARRAY(vdev->mac_addr.raw)); + QDF_MAC_ADDR_REF(vdev->mac_addr.raw)); return NULL; /* error */ } } @@ -565,9 +565,9 @@ ol_tx_classify( * associated peer. It is illegitimate to send unicast * data if there is no peer to send it to. */ - ol_txrx_err_rl("Error: vdev %pK (" QDF_MAC_ADDR_STR ") trying to send unicast tx data frame to an unknown peer", + ol_txrx_err_rl("Error: vdev %pK (" QDF_MAC_ADDR_FMT ") trying to send unicast tx data frame to an unknown peer", vdev, - QDF_MAC_ADDR_ARRAY(vdev->mac_addr.raw)); + QDF_MAC_ADDR_REF(vdev->mac_addr.raw)); return NULL; /* error */ } TX_SCHED_DEBUG_PRINT("Peer found\n"); diff --git a/core/dp/txrx/ol_tx_queue.c b/core/dp/txrx/ol_tx_queue.c index e53419ac6a3b..4347d7ad8fa2 100644 --- a/core/dp/txrx/ol_tx_queue.c +++ b/core/dp/txrx/ol_tx_queue.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2019 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-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 @@ -1336,11 +1336,11 @@ ol_tx_queue_log_record_display(struct ol_txrx_pdev_t *pdev, int offset) if (peer) QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, - "Q: %6d %5d %3d %4d ("QDF_MAC_ADDR_STR")", + "Q: %6d %5d %3d %4d ("QDF_MAC_ADDR_FMT")", record.num_frms, record.num_bytes, record.tid, record.peer_id, - QDF_MAC_ADDR_ARRAY(peer->mac_addr.raw)); + QDF_MAC_ADDR_REF(peer->mac_addr.raw)); else QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, @@ -1370,11 +1370,11 @@ ol_tx_queue_log_record_display(struct ol_txrx_pdev_t *pdev, int offset) if (peer) QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, - "DQ: %6d %5d %3d %4d ("QDF_MAC_ADDR_STR")", + "DQ: %6d %5d %3d %4d ("QDF_MAC_ADDR_FMT")", record.num_frms, record.num_bytes, record.tid, record.peer_id, - QDF_MAC_ADDR_ARRAY(peer->mac_addr.raw)); + QDF_MAC_ADDR_REF(peer->mac_addr.raw)); else QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, @@ -1404,11 +1404,11 @@ ol_tx_queue_log_record_display(struct ol_txrx_pdev_t *pdev, int offset) if (peer) QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, - "F: %6d %5d %3d %4d ("QDF_MAC_ADDR_STR")", + "F: %6d %5d %3d %4d ("QDF_MAC_ADDR_FMT")", record.num_frms, record.num_bytes, record.tid, record.peer_id, - QDF_MAC_ADDR_ARRAY(peer->mac_addr.raw)); + QDF_MAC_ADDR_REF(peer->mac_addr.raw)); else QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, diff --git a/core/dp/txrx/ol_txrx.c b/core/dp/txrx/ol_txrx.c index f6d83cf19e2c..6e0a69b74b51 100644 --- a/core/dp/txrx/ol_txrx.c +++ b/core/dp/txrx/ol_txrx.c @@ -323,8 +323,8 @@ ol_txrx_get_vdev_by_peer_addr(struct cdp_pdev *ppdev, if (!pdev) { QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_HIGH, - "PDEV not found for peer_addr: " QDF_MAC_ADDR_STR, - QDF_MAC_ADDR_ARRAY(peer_addr.bytes)); + "PDEV not found for peer_addr: " QDF_MAC_ADDR_FMT, + QDF_MAC_ADDR_REF(peer_addr.bytes)); return NULL; } @@ -333,8 +333,8 @@ ol_txrx_get_vdev_by_peer_addr(struct cdp_pdev *ppdev, if (!peer) { QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_HIGH, - "Peer not found for peer_addr:" QDF_MAC_ADDR_STR, - QDF_MAC_ADDR_ARRAY(peer_addr.bytes)); + "Peer not found for peer_addr:" QDF_MAC_ADDR_FMT, + QDF_MAC_ADDR_REF(peer_addr.bytes)); return NULL; } @@ -438,8 +438,8 @@ static bool ol_txrx_find_peer_exist_on_other_vdev(struct cdp_soc_t *soc_hdl, ol_txrx_vdev_t_to_cdp_vdev(vdev), peer_addr)) { QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO, - "%s: Duplicate peer %pM already exist on vdev %d", - __func__, peer_addr, i); + "%s: Duplicate peer "QDF_MAC_ADDR_FMT" already exist on vdev %d", + __func__, QDF_MAC_ADDR_REF(peer_addr), i); return true; } } @@ -2009,9 +2009,9 @@ ol_txrx_vdev_attach(struct cdp_soc_t *soc_hdl, uint8_t pdev_id, ol_txrx_hl_tdls_flag_reset(soc_hdl, vdev_id, false); ol_txrx_dbg( - "Created vdev %pK ("QDF_MAC_ADDR_STR")\n", + "Created vdev %pK ("QDF_MAC_ADDR_FMT")\n", vdev, - QDF_MAC_ADDR_ARRAY(vdev->mac_addr.raw)); + QDF_MAC_ADDR_REF(vdev->mac_addr.raw)); /* * We've verified that htt_op_mode == wlan_op_mode, @@ -2222,9 +2222,9 @@ ol_txrx_vdev_detach(struct cdp_soc_t *soc_hdl, uint8_t vdev_id, if (!TAILQ_EMPTY(&vdev->peer_list)) { /* debug print - will be removed later */ ol_txrx_dbg( - "not deleting vdev object %pK ("QDF_MAC_ADDR_STR") until deletion finishes for all its peers\n", + "not deleting vdev object %pK ("QDF_MAC_ADDR_FMT") until deletion finishes for all its peers\n", vdev, - QDF_MAC_ADDR_ARRAY(vdev->mac_addr.raw)); + QDF_MAC_ADDR_REF(vdev->mac_addr.raw)); /* indicate that the vdev needs to be deleted */ vdev->delete.pending = 1; vdev->delete.callback = callback; @@ -2236,9 +2236,9 @@ ol_txrx_vdev_detach(struct cdp_soc_t *soc_hdl, uint8_t vdev_id, qdf_event_destroy(&vdev->wait_delete_comp); ol_txrx_dbg( - "deleting vdev obj %pK ("QDF_MAC_ADDR_STR")\n", + "deleting vdev obj %pK ("QDF_MAC_ADDR_FMT")\n", vdev, - QDF_MAC_ADDR_ARRAY(vdev->mac_addr.raw)); + QDF_MAC_ADDR_REF(vdev->mac_addr.raw)); htt_vdev_detach(pdev->htt_pdev, vdev->vdev_id); @@ -2427,9 +2427,9 @@ ol_txrx_peer_attach(struct cdp_soc_t *soc_hdl, uint8_t vdev_id, (union ol_txrx_align_mac_addr_t *)peer_mac_addr) && (check_valid == 0 || temp_peer->valid)) { ol_txrx_info_high( - "vdev_id %d ("QDF_MAC_ADDR_STR") already exists.\n", + "vdev_id %d ("QDF_MAC_ADDR_FMT") already exists.\n", vdev->vdev_id, - QDF_MAC_ADDR_ARRAY(peer_mac_addr)); + QDF_MAC_ADDR_REF(peer_mac_addr)); if (qdf_atomic_read(&temp_peer->delete_in_progress)) { vdev->wait_on_peer_id = temp_peer->local_id; qdf_event_reset(&vdev->wait_delete_comp); @@ -2446,9 +2446,9 @@ ol_txrx_peer_attach(struct cdp_soc_t *soc_hdl, uint8_t vdev_id, (check_valid == 0 || temp_peer->valid)) { ol_txrx_info_high( - "vdev_id %d ("QDF_MAC_ADDR_STR") old peer exists.\n", + "vdev_id %d ("QDF_MAC_ADDR_FMT") old peer exists.\n", vdev->vdev_id, - QDF_MAC_ADDR_ARRAY(vdev->last_peer_mac_addr.raw)); + QDF_MAC_ADDR_REF(vdev->last_peer_mac_addr.raw)); if (qdf_atomic_read(&temp_peer->delete_in_progress)) { vdev->wait_on_peer_id = temp_peer->local_id; qdf_event_reset(&vdev->wait_delete_comp); @@ -2538,9 +2538,9 @@ ol_txrx_peer_attach(struct cdp_soc_t *soc_hdl, uint8_t vdev_id, ol_txrx_peer_find_hash_add(pdev, peer); QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_HIGH, - "vdev %pK created peer %pK ref_cnt %d ("QDF_MAC_ADDR_STR")\n", + "vdev %pK created peer %pK ref_cnt %d ("QDF_MAC_ADDR_FMT")\n", vdev, peer, qdf_atomic_read(&peer->ref_cnt), - QDF_MAC_ADDR_ARRAY(peer->mac_addr.raw)); + QDF_MAC_ADDR_REF(peer->mac_addr.raw)); /* * For every peer MAp message search and set if bss_peer */ @@ -3331,9 +3331,9 @@ int ol_txrx_peer_release_ref(ol_txrx_peer_handle peer, */ ol_txrx_tx_desc_reset_vdev(vdev); ol_txrx_dbg( - "deleting vdev object %pK ("QDF_MAC_ADDR_STR") - its last peer is done", + "deleting vdev object %pK ("QDF_MAC_ADDR_FMT") - its last peer is done", vdev, - QDF_MAC_ADDR_ARRAY(vdev->mac_addr.raw)); + QDF_MAC_ADDR_REF(vdev->mac_addr.raw)); /* all peers are gone, go ahead and delete it */ qdf_mem_free(vdev); if (vdev_delete_cb) @@ -3438,8 +3438,8 @@ ol_txrx_clear_peer(struct cdp_soc_t *soc_hdl, uint8_t pdev_id, if (!peer) return QDF_STATUS_SUCCESS; - ol_txrx_dbg("Clear peer rx frames: " QDF_MAC_ADDR_STR, - QDF_MAC_ADDR_ARRAY(peer->mac_addr.raw)); + ol_txrx_dbg("Clear peer rx frames: " QDF_MAC_ADDR_FMT, + QDF_MAC_ADDR_REF(peer->mac_addr.raw)); ol_txrx_clear_peer_internal(peer); status = ol_txrx_peer_release_ref(peer, PEER_DEBUG_ID_OL_INTERNAL); @@ -3461,9 +3461,9 @@ void peer_unmap_timer_handler(void *data) ol_txrx_err("all unmap events not received for peer %pK, ref_cnt %d", peer, qdf_atomic_read(&peer->ref_cnt)); - ol_txrx_err("peer %pK ("QDF_MAC_ADDR_STR")", + ol_txrx_err("peer %pK ("QDF_MAC_ADDR_FMT")", peer, - QDF_MAC_ADDR_ARRAY(peer->mac_addr.raw)); + QDF_MAC_ADDR_REF(peer->mac_addr.raw)); ol_register_peer_recovery_notifier(peer); cds_trigger_recovery(QDF_PEER_UNMAP_TIMEDOUT); @@ -3515,9 +3515,9 @@ static QDF_STATUS ol_txrx_peer_detach(struct cdp_soc_t *soc_hdl, uint8_t vdev_id /* htt_rx_reorder_log_print(vdev->pdev->htt_pdev); */ QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_DEBUG, - "%s:peer %pK ("QDF_MAC_ADDR_STR")", + "%s:peer %pK ("QDF_MAC_ADDR_FMT")", __func__, peer, - QDF_MAC_ADDR_ARRAY(peer->mac_addr.raw)); + QDF_MAC_ADDR_REF(peer->mac_addr.raw)); qdf_spin_lock_bh(&vdev->pdev->last_real_peer_mutex); if (vdev->last_real_peer == peer) @@ -5761,7 +5761,8 @@ static void ol_txrx_wrapper_flush_rx_frames(struct cdp_soc_t *soc_hdl, peer = ol_txrx_peer_find_hash_find_get_ref(pdev, peer_mac, 0, 1, PEER_DEBUG_ID_OL_INTERNAL); if (!peer) { - ol_txrx_err("peer %pM not found", peer_mac); + ol_txrx_err("peer "QDF_MAC_ADDR_FMT" not found", + QDF_MAC_ADDR_REF(peer_mac)); return; } diff --git a/core/dp/txrx/ol_txrx_ipa.c b/core/dp/txrx/ol_txrx_ipa.c index f17aa431d63c..876921d19926 100644 --- a/core/dp/txrx/ol_txrx_ipa.c +++ b/core/dp/txrx/ol_txrx_ipa.c @@ -775,8 +775,8 @@ QDF_STATUS ol_txrx_ipa_setup_iface(char *ifname, uint8_t *mac_addr, int ret = -EINVAL; QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_DEBUG, - "%s: Add Partial hdr: %s, %pM", - __func__, ifname, mac_addr); + "%s: Add Partial hdr: %s, "QDF_MAC_ADDR_FMT, + __func__, ifname, QDF_MAC_ADDR_REF(mac_addr)); qdf_mem_zero(&hdr_info, sizeof(qdf_ipa_wdi_hdr_info_t)); memcpy(&uc_tx_hdr, &ipa_uc_tx_hdr, OL_TXRX_IPA_UC_WLAN_TX_HDR_LEN); @@ -1304,7 +1304,8 @@ static int ol_txrx_ipa_add_header_info(char *ifname, uint8_t *mac_addr, struct ol_txrx_ipa_uc_tx_hdr *uc_tx_hdr = NULL; QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_DEBUG, - "Add Partial hdr: %s, %pM", ifname, mac_addr); + "Add Partial hdr: %s, "QDF_MAC_ADDR_FMT, ifname, + QDF_MAC_ADDR_REF(mac_addr)); /* dynamically allocate the memory to add the hdrs */ ipa_hdr = qdf_mem_malloc(sizeof(qdf_ipa_ioc_add_hdr_t) diff --git a/core/dp/txrx/ol_txrx_legacy_flow_control.c b/core/dp/txrx/ol_txrx_legacy_flow_control.c index b49955e83583..2f16a538f5db 100644 --- a/core/dp/txrx/ol_txrx_legacy_flow_control.c +++ b/core/dp/txrx/ol_txrx_legacy_flow_control.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2019 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-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 above @@ -488,8 +488,8 @@ ol_txrx_get_tx_resource(struct cdp_soc_t *soc_hdl, uint8_t pdev_id, peer_addr); if (!vdev) { QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_HIGH, - "%s: Invalid peer address: " QDF_MAC_ADDR_STR, - __func__, QDF_MAC_ADDR_ARRAY(peer_addr.bytes)); + "%s: Invalid peer address: " QDF_MAC_ADDR_FMT, + __func__, QDF_MAC_ADDR_REF(peer_addr.bytes)); /* Return true so caller do not understand that resource * is less than low_watermark. * sta_id validation will be done in ol_tx_send_data_frame diff --git a/core/dp/txrx/ol_txrx_peer_find.c b/core/dp/txrx/ol_txrx_peer_find.c index f6c661715f68..575aa154de5b 100644 --- a/core/dp/txrx/ol_txrx_peer_find.c +++ b/core/dp/txrx/ol_txrx_peer_find.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2019 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-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 @@ -832,9 +832,9 @@ void ol_txrx_peer_find_display(ol_txrx_pdev_handle pdev, int indent) hash_list_elem) { QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW, - "%*shash idx %d -> %pK ("QDF_MAC_ADDR_STR")\n", + "%*shash idx %d -> %pK ("QDF_MAC_ADDR_FMT")\n", indent + 4, " ", i, peer, - QDF_MAC_ADDR_ARRAY(peer->mac_addr.raw)); + QDF_MAC_ADDR_REF(peer->mac_addr.raw)); } } }