From cb7b8b8065efdf54a52cacece695a2b34078687d Mon Sep 17 00:00:00 2001 From: Srinivas Girigowda Date: Wed, 10 Apr 2019 14:27:47 -0700 Subject: [PATCH] qcacld-3.0: Replace MAC_ADDRESS_STR with QDF_MAC_ADDR_STR Replace MAC_ADDRESS_STR with converged macro QDF_MAC_ADDR_STR. Change-Id: Ib9bd0a93a3ffdb89a42e11200d8b68ce1af86681 CRs-Fixed: 2433317 --- core/dp/txrx/ol_rx.c | 12 ++-- core/dp/txrx/ol_rx_pn.c | 6 +- core/dp/txrx/ol_rx_reorder.c | 20 ++---- core/dp/txrx/ol_tx_classify.c | 24 ++----- core/dp/txrx/ol_tx_queue.c | 27 ++------ core/dp/txrx/ol_txrx.c | 60 ++++++------------ core/dp/txrx/ol_txrx_peer_find.c | 9 +-- core/hdd/inc/wlan_hdd_main.h | 3 +- core/hdd/src/wlan_hdd_assoc.c | 32 +++++----- core/hdd/src/wlan_hdd_cfg80211.c | 62 +++++++++---------- core/hdd/src/wlan_hdd_debugfs_connect.c | 2 +- core/hdd/src/wlan_hdd_debugfs_offload.c | 2 +- core/hdd/src/wlan_hdd_debugfs_roam.c | 8 +-- core/hdd/src/wlan_hdd_ext_scan.c | 14 ++--- core/hdd/src/wlan_hdd_hostapd.c | 37 ++++------- core/hdd/src/wlan_hdd_hostapd_wext.c | 10 +-- core/hdd/src/wlan_hdd_ioctl.c | 13 ++-- core/hdd/src/wlan_hdd_main.c | 38 ++++++------ core/hdd/src/wlan_hdd_oemdata.c | 2 +- core/hdd/src/wlan_hdd_p2p.c | 2 +- core/hdd/src/wlan_hdd_rssi_monitor.c | 2 +- core/hdd/src/wlan_hdd_station_info.c | 4 +- core/hdd/src/wlan_hdd_stats.c | 2 +- core/hdd/src/wlan_hdd_wext.c | 4 +- core/mac/src/dph/dph_hash_table.c | 6 +- core/mac/src/include/sir_debug.h | 2 - core/mac/src/pe/lim/lim_assoc_utils.c | 24 +++---- core/mac/src/pe/lim/lim_ft.c | 2 +- core/mac/src/pe/lim/lim_ft_preauth.c | 2 +- core/mac/src/pe/lim/lim_ibss_peer_mgmt.c | 16 ++--- .../mac/src/pe/lim/lim_link_monitoring_algo.c | 4 +- .../src/pe/lim/lim_process_assoc_req_frame.c | 60 +++++++++--------- .../src/pe/lim/lim_process_assoc_rsp_frame.c | 10 +-- core/mac/src/pe/lim/lim_process_auth_frame.c | 52 ++++++++-------- .../mac/src/pe/lim/lim_process_deauth_frame.c | 36 +++++------ .../src/pe/lim/lim_process_disassoc_frame.c | 14 ++--- .../src/pe/lim/lim_process_message_queue.c | 2 +- .../src/pe/lim/lim_process_mlm_host_roam.c | 4 +- .../src/pe/lim/lim_process_mlm_req_messages.c | 46 +++++++------- .../src/pe/lim/lim_process_mlm_rsp_messages.c | 6 +- .../src/pe/lim/lim_process_probe_req_frame.c | 2 +- .../src/pe/lim/lim_process_probe_rsp_frame.c | 4 +- .../src/pe/lim/lim_process_sme_req_messages.c | 26 ++++---- core/mac/src/pe/lim/lim_process_tdls.c | 36 +++++------ core/mac/src/pe/lim/lim_scan_result_utils.c | 4 +- .../src/pe/lim/lim_send_management_frames.c | 20 +++--- .../src/pe/lim/lim_send_sme_rsp_messages.c | 14 ++--- core/mac/src/pe/lim/lim_session.c | 6 +- core/mac/src/pe/lim/lim_utils.c | 6 +- core/mac/src/pe/nan/nan_datapath.c | 10 +-- core/mac/src/pe/sch/sch_beacon_process.c | 2 +- .../legacy/src/system/src/sys_entry_func.c | 6 +- core/sap/src/sap_api_link_cntl.c | 4 +- core/sap/src/sap_fsm.c | 8 +-- core/sap/src/sap_module.c | 20 +++--- core/sme/src/common/sme_api.c | 14 ++--- core/sme/src/common/sme_ft_api.c | 2 +- core/sme/src/csr/csr_api_roam.c | 42 ++++++------- core/sme/src/csr/csr_api_scan.c | 8 +-- core/sme/src/csr/csr_host_scan_roam.c | 8 +-- core/sme/src/csr/csr_neighbor_roam.c | 2 +- core/sme/src/csr/csr_roam_preauth.c | 10 +-- core/sme/src/csr/csr_util.c | 6 +- core/sme/src/rrm/sme_rrm.c | 10 +-- core/wma/src/wma_data.c | 39 ++++-------- core/wma/src/wma_dev_if.c | 2 +- core/wma/src/wma_features.c | 20 +++--- core/wma/src/wma_main.c | 4 +- core/wma/src/wma_mgmt.c | 6 +- core/wma/src/wma_nan_datapath.c | 2 +- core/wma/src/wma_power.c | 8 +-- 71 files changed, 465 insertions(+), 567 deletions(-) diff --git a/core/dp/txrx/ol_rx.c b/core/dp/txrx/ol_rx.c index c8e02f261221..a1de0d283a45 100644 --- a/core/dp/txrx/ol_rx.c +++ b/core/dp/txrx/ol_rx.c @@ -798,11 +798,9 @@ ol_rx_sec_ind_handler(ol_txrx_pdev_handle pdev, return; } ol_txrx_dbg( - "sec spec for peer %pK (%02x:%02x:%02x:%02x:%02x:%02x): %s key of type %d\n", + "sec spec for peer %pK ("QDF_MAC_ADDR_STR"): %s key of type %d\n", 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_ARRAY(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; @@ -1271,11 +1269,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 (%02x:%02x:%02x:%02x:%02x:%02x) len %d\n", + "decap error %pK from peer %pK ("QDF_MAC_ADDR_STR") len %d\n", msdu, 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_ARRAY(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 dd09c3f50c71..53727c8c65b9 100644 --- a/core/dp/txrx/ol_rx_pn.c +++ b/core/dp/txrx/ol_rx_pn.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2013-2017 The Linux Foundation. All rights reserved. + * Copyright (c) 2011, 2013-2017, 2019 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 @@ -156,7 +156,7 @@ 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 " - "(%02x:%02x:%02x:%02x:%02x:%02x) %s\n" + "("QDF_MAC_ADDR_STR") %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", @@ -175,7 +175,7 @@ ol_rx_pn_check_base(struct ol_txrx_vdev_t *vdev, } else { ol_txrx_dbg( "PN check failed - TID %d, peer %pK " - "(%02x:%02x:%02x:%02x:%02x:%02x) %s\n" + "("QDF_MAC_ADDR_STR") %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", diff --git a/core/dp/txrx/ol_rx_reorder.c b/core/dp/txrx/ol_rx_reorder.c index c7963e6c437d..5ec5be971a10 100644 --- a/core/dp/txrx/ol_rx_reorder.c +++ b/core/dp/txrx/ol_rx_reorder.c @@ -647,16 +647,12 @@ ol_rx_pn_ind_handler(ol_txrx_pdev_handle pdev, current_time_ms; ol_txrx_warn( "Tgt PN check failed - TID %d, peer %pK " - "(%02x:%02x:%02x:%02x:%02x:%02x)\n" + "("QDF_MAC_ADDR_STR")\n" " 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], pn.pn128[1], + QDF_MAC_ADDR_ARRAY(peer->mac_addr.raw), + pn.pn128[1], pn.pn128[0], pn.pn128[0] & 0xffffffffffffULL, htt_rx_mpdu_desc_seq_num(htt_pdev, @@ -664,16 +660,12 @@ ol_rx_pn_ind_handler(ol_txrx_pdev_handle pdev, } else { ol_txrx_dbg( "Tgt PN check failed - TID %d, peer %pK " - "(%02x:%02x:%02x:%02x:%02x:%02x)\n" + "("QDF_MAC_ADDR_STR")\n" " 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], pn.pn128[1], + QDF_MAC_ADDR_ARRAY(peer->mac_addr.raw), + pn.pn128[1], pn.pn128[0], pn.pn128[0] & 0xffffffffffffULL, htt_rx_mpdu_desc_seq_num(htt_pdev, diff --git a/core/dp/txrx/ol_tx_classify.c b/core/dp/txrx/ol_tx_classify.c index 4628a5df4873..bcff5b189d12 100644 --- a/core/dp/txrx/ol_tx_classify.c +++ b/core/dp/txrx/ol_tx_classify.c @@ -410,14 +410,9 @@ ol_tx_classify( if (!peer) { QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, - "Error: STA %pK (%02x:%02x:%02x:%02x:%02x:%02x) trying to send bcast DA tx data frame w/o association\n", + "Error: STA %pK ("QDF_MAC_ADDR_STR") trying to send bcast DA tx data frame w/o association\n", vdev, - vdev->mac_addr.raw[0], - vdev->mac_addr.raw[1], - vdev->mac_addr.raw[2], - vdev->mac_addr.raw[3], - vdev->mac_addr.raw[4], - vdev->mac_addr.raw[5]); + QDF_MAC_ADDR_ARRAY(vdev->mac_addr.raw)); return NULL; /* error */ } else if ((peer->security[ OL_TXRX_PEER_SECURITY_MULTICAST].sec_type @@ -462,14 +457,9 @@ ol_tx_classify( if (!peer) { QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, - "Error: vdev %pK (%02x:%02x:%02x:%02x:%02x:%02x) trying to send bcast/mcast, but no self-peer found\n", + "Error: vdev %pK ("QDF_MAC_ADDR_STR") trying to send bcast/mcast, but no self-peer found\n", vdev, - vdev->mac_addr.raw[0], - vdev->mac_addr.raw[1], - vdev->mac_addr.raw[2], - vdev->mac_addr.raw[3], - vdev->mac_addr.raw[4], - vdev->mac_addr.raw[5]); + QDF_MAC_ADDR_ARRAY(vdev->mac_addr.raw)); return NULL; /* error */ } } @@ -529,11 +519,9 @@ ol_tx_classify( */ QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, - "Error: vdev %pK (%02x:%02x:%02x:%02x:%02x:%02x) trying to send unicast tx data frame to an unknown peer\n", + "Error: vdev %pK ("QDF_MAC_ADDR_STR") trying to send unicast tx data frame to an unknown peer\n", vdev, - vdev->mac_addr.raw[0], vdev->mac_addr.raw[1], - vdev->mac_addr.raw[2], vdev->mac_addr.raw[3], - vdev->mac_addr.raw[4], vdev->mac_addr.raw[5]); + QDF_MAC_ADDR_ARRAY(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 e64553b51604..af5c8f0e86c2 100644 --- a/core/dp/txrx/ol_tx_queue.c +++ b/core/dp/txrx/ol_tx_queue.c @@ -1277,16 +1277,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 (%02x:%02x:%02x:%02x:%02x:%02x)", + "Q: %6d %5d %3d %4d ("QDF_MAC_ADDR_STR")", record.num_frms, record.num_bytes, record.tid, record.peer_id, - 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_ARRAY(peer->mac_addr.raw)); else QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, @@ -1316,16 +1311,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 (%02x:%02x:%02x:%02x:%02x:%02x)", + "DQ: %6d %5d %3d %4d ("QDF_MAC_ADDR_STR")", record.num_frms, record.num_bytes, record.tid, record.peer_id, - 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_ARRAY(peer->mac_addr.raw)); else QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, @@ -1355,16 +1345,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 (%02x:%02x:%02x:%02x:%02x:%02x)", + "F: %6d %5d %3d %4d ("QDF_MAC_ADDR_STR")", record.num_frms, record.num_bytes, record.tid, record.peer_id, - 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_ARRAY(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 9b728151e686..61620026433f 100644 --- a/core/dp/txrx/ol_txrx.c +++ b/core/dp/txrx/ol_txrx.c @@ -1691,11 +1691,9 @@ ol_txrx_vdev_attach(struct cdp_pdev *ppdev, pdev->monitor_vdev = vdev; ol_txrx_dbg( - "Created vdev %pK (%02x:%02x:%02x:%02x:%02x:%02x)\n", + "Created vdev %pK ("QDF_MAC_ADDR_STR")\n", vdev, - vdev->mac_addr.raw[0], vdev->mac_addr.raw[1], - vdev->mac_addr.raw[2], vdev->mac_addr.raw[3], - vdev->mac_addr.raw[4], vdev->mac_addr.raw[5]); + QDF_MAC_ADDR_ARRAY(vdev->mac_addr.raw)); /* * We've verified that htt_op_mode == wlan_op_mode, @@ -1903,11 +1901,9 @@ ol_txrx_vdev_detach(struct cdp_vdev *pvdev, if (!TAILQ_EMPTY(&vdev->peer_list)) { /* debug print - will be removed later */ ol_txrx_dbg( - "not deleting vdev object %pK (%02x:%02x:%02x:%02x:%02x:%02x) until deletion finishes for all its peers\n", + "not deleting vdev object %pK ("QDF_MAC_ADDR_STR") until deletion finishes for all its peers\n", vdev, - vdev->mac_addr.raw[0], vdev->mac_addr.raw[1], - vdev->mac_addr.raw[2], vdev->mac_addr.raw[3], - vdev->mac_addr.raw[4], vdev->mac_addr.raw[5]); + QDF_MAC_ADDR_ARRAY(vdev->mac_addr.raw)); /* indicate that the vdev needs to be deleted */ vdev->delete.pending = 1; vdev->delete.callback = callback; @@ -1919,11 +1915,9 @@ ol_txrx_vdev_detach(struct cdp_vdev *pvdev, qdf_event_destroy(&vdev->wait_delete_comp); ol_txrx_dbg( - "deleting vdev obj %pK (%02x:%02x:%02x:%02x:%02x:%02x)\n", + "deleting vdev obj %pK ("QDF_MAC_ADDR_STR")\n", vdev, - vdev->mac_addr.raw[0], vdev->mac_addr.raw[1], - vdev->mac_addr.raw[2], vdev->mac_addr.raw[3], - vdev->mac_addr.raw[4], vdev->mac_addr.raw[5]); + QDF_MAC_ADDR_ARRAY(vdev->mac_addr.raw)); htt_vdev_detach(pdev->htt_pdev, vdev->vdev_id); @@ -2107,11 +2101,9 @@ ol_txrx_peer_attach(struct cdp_vdev *pvdev, uint8_t *peer_mac_addr, (union ol_txrx_align_mac_addr_t *)peer_mac_addr) && (check_valid == 0 || temp_peer->valid)) { ol_txrx_info_high( - "vdev_id %d (%02x:%02x:%02x:%02x:%02x:%02x) already exists.\n", + "vdev_id %d ("QDF_MAC_ADDR_STR") already exists.\n", vdev->vdev_id, - peer_mac_addr[0], peer_mac_addr[1], - peer_mac_addr[2], peer_mac_addr[3], - peer_mac_addr[4], peer_mac_addr[5]); + QDF_MAC_ADDR_ARRAY(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); @@ -2128,14 +2120,9 @@ ol_txrx_peer_attach(struct cdp_vdev *pvdev, uint8_t *peer_mac_addr, (check_valid == 0 || temp_peer->valid)) { ol_txrx_info_high( - "vdev_id %d (%02x:%02x:%02x:%02x:%02x:%02x) old peer exists.\n", + "vdev_id %d ("QDF_MAC_ADDR_STR") old peer exists.\n", vdev->vdev_id, - vdev->last_peer_mac_addr.raw[0], - vdev->last_peer_mac_addr.raw[1], - vdev->last_peer_mac_addr.raw[2], - vdev->last_peer_mac_addr.raw[3], - vdev->last_peer_mac_addr.raw[4], - vdev->last_peer_mac_addr.raw[5]); + QDF_MAC_ADDR_ARRAY(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); @@ -2226,11 +2213,9 @@ ol_txrx_peer_attach(struct cdp_vdev *pvdev, uint8_t *peer_mac_addr, 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 (%02x:%02x:%02x:%02x:%02x:%02x)\n", + "vdev %pK created peer %pK ref_cnt %d ("QDF_MAC_ADDR_STR")\n", vdev, peer, qdf_atomic_read(&peer->ref_cnt), - 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_ARRAY(peer->mac_addr.raw)); /* * For every peer MAp message search and set if bss_peer */ @@ -3024,14 +3009,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 (%02x:%02x:%02x:%02x:%02x:%02x) - its last peer is done", + "deleting vdev object %pK ("QDF_MAC_ADDR_STR") - its last peer is done", vdev, - vdev->mac_addr.raw[0], - vdev->mac_addr.raw[1], - vdev->mac_addr.raw[2], - vdev->mac_addr.raw[3], - vdev->mac_addr.raw[4], - vdev->mac_addr.raw[5]); + QDF_MAC_ADDR_ARRAY(vdev->mac_addr.raw)); /* all peers are gone, go ahead and delete it */ qdf_mem_free(vdev); if (vdev_delete_cb) @@ -3171,11 +3151,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 (%02x:%02x:%02x:%02x:%02x:%02x)", + ol_txrx_err("peer %pK ("QDF_MAC_ADDR_STR")", 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_ARRAY(peer->mac_addr.raw)); if (!cds_is_driver_recovering() && !cds_is_fw_down()) { qdf_create_work(0, &txrx_pdev->peer_unmap_timer_work, peer_unmap_timer_work_function, @@ -3218,11 +3196,9 @@ static void ol_txrx_peer_detach(void *ppeer, uint32_t bitmap) /* htt_rx_reorder_log_print(vdev->pdev->htt_pdev); */ QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_DEBUG, - "%s:peer %pK (%02x:%02x:%02x:%02x:%02x:%02x)", + "%s:peer %pK ("QDF_MAC_ADDR_STR")", __func__, 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_ARRAY(peer->mac_addr.raw)); qdf_spin_lock_bh(&vdev->pdev->last_real_peer_mutex); if (vdev->last_real_peer == peer) diff --git a/core/dp/txrx/ol_txrx_peer_find.c b/core/dp/txrx/ol_txrx_peer_find.c index d64c8b15b6e5..0bb5d1a963d4 100644 --- a/core/dp/txrx/ol_txrx_peer_find.c +++ b/core/dp/txrx/ol_txrx_peer_find.c @@ -832,14 +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 (%02x:%02x:%02x:%02x:%02x:%02x)\n", + "%*shash idx %d -> %pK ("QDF_MAC_ADDR_STR")\n", indent + 4, " ", i, 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_ARRAY(peer->mac_addr.raw)); } } } diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h index 7d93d697baf6..3c0cc7ed7f17 100644 --- a/core/hdd/inc/wlan_hdd_main.h +++ b/core/hdd/inc/wlan_hdd_main.h @@ -246,8 +246,7 @@ enum hdd_driver_flags { /* Maximum time(ms) to wait for external acs response */ #define WLAN_VENDOR_ACS_WAIT_TIME 1000 -/** Mac Address string **/ -#define MAC_ADDRESS_STR "%02x:%02x:%02x:%02x:%02x:%02x" +/* Mac Address string length */ #define MAC_ADDRESS_STR_LEN 18 /* Including null terminator */ /* Max and min IEs length in bytes */ #define MAX_GENIE_LEN (512) diff --git a/core/hdd/src/wlan_hdd_assoc.c b/core/hdd/src/wlan_hdd_assoc.c index adf6ce73090d..c943d4488b0c 100644 --- a/core/hdd/src/wlan_hdd_assoc.c +++ b/core/hdd/src/wlan_hdd_assoc.c @@ -1372,8 +1372,8 @@ static void hdd_send_association_event(struct net_device *dev, ucfg_p2p_status_connect(adapter->vdev); - hdd_info("wlan: " MAC_ADDRESS_STR " connected to " - MAC_ADDRESS_STR "\n", + hdd_info("wlan: " QDF_MAC_ADDR_STR " connected to " + QDF_MAC_ADDR_STR "\n", QDF_MAC_ADDR_ARRAY(adapter->mac_addr.bytes), QDF_MAC_ADDR_ARRAY(wrqu.ap_addr.sa_data)); hdd_send_update_beacon_ies_event(adapter, roam_info); @@ -1454,7 +1454,7 @@ static void hdd_send_association_event(struct net_device *dev, adapter->vdev_id); memcpy(wrqu.ap_addr.sa_data, sta_ctx->conn_info.bssid.bytes, ETH_ALEN); - hdd_debug("wlan: new IBSS peer connection to BSSID " MAC_ADDRESS_STR, + hdd_debug("wlan: new IBSS peer connection to BSSID " QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(sta_ctx->conn_info.bssid.bytes)); } else { /* Not Associated */ hdd_debug("wlan: disconnected"); @@ -2466,7 +2466,7 @@ static uint8_t hdd_get_ibss_peer_sta_id(struct hdd_station_ctx *hddstactx, &roaminfo->peerMac, &sta_id); if (status != QDF_STATUS_SUCCESS) { hdd_err("Unable to find station ID for " - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(roaminfo->peerMac.bytes)); } } @@ -2656,7 +2656,7 @@ hdd_roam_set_key_complete_handler(struct hdd_adapter *adapter, * directly into 'authenticated' state. */ hdd_debug("Set Key completion roam_status =%d roam_result=%d " - MAC_ADDRESS_STR, roam_status, roam_result, + QDF_MAC_ADDR_STR, roam_status, roam_result, QDF_MAC_ADDR_ARRAY(roam_info->peerMac.bytes)); connected = hdd_conn_get_connected_cipher_algo(sta_ctx, @@ -3198,7 +3198,7 @@ hdd_association_completion_handler(struct hdd_adapter *adapter, reqRsnLength); else { hdd_debug("sending connect indication to nl80211:for bssid " - MAC_ADDRESS_STR + QDF_MAC_ADDR_STR " result:%d and Status:%d", QDF_MAC_ADDR_ARRAY (roam_info->bssid.bytes), @@ -3336,12 +3336,12 @@ hdd_association_completion_handler(struct hdd_adapter *adapter, qdf_copy_macaddr(&roam_info->bssid, &sta_ctx->requested_bssid); if (roam_info) - hdd_err("wlan: connection failed with " MAC_ADDRESS_STR + hdd_err("wlan: connection failed with " QDF_MAC_ADDR_STR " result: %d and Status: %d", QDF_MAC_ADDR_ARRAY(roam_info->bssid.bytes), roam_result, roam_status); else - hdd_err("wlan: connection failed with " MAC_ADDRESS_STR + hdd_err("wlan: connection failed with " QDF_MAC_ADDR_STR " result: %d and Status: %d", QDF_MAC_ADDR_ARRAY(sta_ctx->requested_bssid.bytes), roam_result, roam_status); @@ -3375,7 +3375,7 @@ hdd_association_completion_handler(struct hdd_adapter *adapter, && !hddDisconInProgress) { if (roam_info) { hdd_err("send connect failure to nl80211: for bssid " - MAC_ADDRESS_STR + QDF_MAC_ADDR_STR " result: %d and Status: %d reasoncode: %d", QDF_MAC_ADDR_ARRAY(roam_info->bssid.bytes), roam_result, roam_status, @@ -3384,7 +3384,7 @@ hdd_association_completion_handler(struct hdd_adapter *adapter, roam_info->statusCode; } else { hdd_err("connect failed: for bssid " - MAC_ADDRESS_STR + QDF_MAC_ADDR_STR " result: %d and status: %d ", QDF_MAC_ADDR_ARRAY(sta_ctx->requested_bssid.bytes), roam_result, roam_status); @@ -3545,7 +3545,7 @@ static void hdd_roam_ibss_indication_handler(struct hdd_adapter *adapter, unsigned int freq; #endif /* we created the IBSS, notify supplicant */ - hdd_debug("%s: created ibss " MAC_ADDRESS_STR, + hdd_debug("%s: created ibss " QDF_MAC_ADDR_STR, adapter->dev->name, QDF_MAC_ADDR_ARRAY( roam_info->pBssDesc->bssId)); @@ -3879,8 +3879,8 @@ roam_roam_connect_status_update_handler(struct hdd_adapter *adapter, eCsrEncryptionType encr_type = sta_ctx->ibss_enc_key.encType; hdd_debug("IBSS New Peer indication from SME " - "with peerMac " MAC_ADDRESS_STR " BSSID: " - MAC_ADDRESS_STR " and stationID= %d", + "with peerMac " QDF_MAC_ADDR_STR " BSSID: " + QDF_MAC_ADDR_STR " and stationID= %d", QDF_MAC_ADDR_ARRAY(roam_info->peerMac.bytes), QDF_MAC_ADDR_ARRAY(sta_ctx->conn_info.bssid.bytes), roam_info->staId); @@ -3967,8 +3967,8 @@ roam_roam_connect_status_update_handler(struct hdd_adapter *adapter, hdd_warn("IBSS peer departed by cannot find peer in our registration table with TL"); hdd_debug("IBSS Peer Departed from SME " - "with peerMac " MAC_ADDRESS_STR " BSSID: " - MAC_ADDRESS_STR " and stationID= %d", + "with peerMac " QDF_MAC_ADDR_STR " BSSID: " + QDF_MAC_ADDR_STR " and stationID= %d", QDF_MAC_ADDR_ARRAY(roam_info->peerMac.bytes), QDF_MAC_ADDR_ARRAY(sta_ctx->conn_info.bssid.bytes), roam_info->staId); @@ -4245,7 +4245,7 @@ hdd_indicate_cckm_pre_auth(struct hdd_adapter *adapter, memset(buf, '\0', sizeof(buf)); /* Timestamp0 is lower 32 bits and Timestamp1 is upper 32 bits */ - hdd_debug("CCXPREAUTHNOTIFY=" MAC_ADDRESS_STR " %d:%d", + hdd_debug("CCXPREAUTHNOTIFY=" QDF_MAC_ADDR_STR " %d:%d", QDF_MAC_ADDR_ARRAY(roam_info->bssid.bytes), roam_info->timestamp[0], roam_info->timestamp[1]); diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index a0685b6614b0..16ac749d5b21 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -3803,7 +3803,7 @@ static int hdd_set_bssid_prefs(struct hdd_context *hdd_ctx, nla_memcpy(roam_params->bssid_favored[i].bytes, tb2[PARAM_ROAM_BSSID], QDF_MAC_ADDR_SIZE); - hdd_debug(MAC_ADDRESS_STR, + hdd_debug(QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(roam_params->bssid_favored[i].bytes)); /* Parse and fetch preference factor*/ if (!tb2[PARAM_RSSI_MODIFIER]) { @@ -3889,7 +3889,7 @@ static int hdd_set_blacklist_bssid(struct hdd_context *hdd_ctx, } nla_memcpy(roam_params->bssid_avoid_list[i].bytes, tb2[PARAM_SET_BSSID], QDF_MAC_ADDR_SIZE); - hdd_debug(MAC_ADDRESS_STR, + hdd_debug(QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(roam_params->bssid_avoid_list[i].bytes)); i++; } @@ -7816,7 +7816,7 @@ wlan_hdd_add_tx_ptrn(struct hdd_adapter *adapter, struct hdd_context *hdd_ctx, } nla_memcpy(add_req->mac_address.bytes, tb[PARAM_SRC_MAC_ADDR], QDF_MAC_ADDR_SIZE); - hdd_debug("input src mac address: "MAC_ADDRESS_STR, + hdd_debug("input src mac address: "QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(add_req->mac_address.bytes)); if (!qdf_is_macaddr_equal(&add_req->mac_address, @@ -7830,7 +7830,7 @@ wlan_hdd_add_tx_ptrn(struct hdd_adapter *adapter, struct hdd_context *hdd_ctx, goto fail; } nla_memcpy(dst_addr.bytes, tb[PARAM_DST_MAC_ADDR], QDF_MAC_ADDR_SIZE); - hdd_debug("input dst mac address: "MAC_ADDRESS_STR, + hdd_debug("input dst mac address: "QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(dst_addr.bytes)); if (!tb[PARAM_IP_PACKET]) { @@ -7941,7 +7941,7 @@ wlan_hdd_del_tx_ptrn(struct hdd_adapter *adapter, struct hdd_context *hdd_ctx, return -ENOMEM; qdf_copy_macaddr(&del_req->mac_address, &adapter->mac_addr); - hdd_debug(MAC_ADDRESS_STR, + hdd_debug(QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(del_req->mac_address.bytes)); del_req->ucPtrnId = pattern_id; hdd_debug("Request Id: %u Pattern id: %d", @@ -8631,7 +8631,7 @@ static int __wlan_hdd_cfg80211_get_link_properties(struct wiphy *wiphy, qdf_mem_copy(peer_mac, nla_data(tb[QCA_WLAN_VENDOR_ATTR_MAC_ADDR]), QDF_MAC_ADDR_SIZE); - hdd_debug("peerMac="MAC_ADDRESS_STR" for device_mode:%d", + hdd_debug("peerMac="QDF_MAC_ADDR_STR" for device_mode:%d", QDF_MAC_ADDR_ARRAY(peer_mac), adapter->device_mode); if (adapter->device_mode == QDF_STA_MODE || @@ -8641,7 +8641,7 @@ static int __wlan_hdd_cfg80211_get_link_properties(struct wiphy *wiphy, eConnectionState_Associated) || qdf_mem_cmp(hdd_sta_ctx->conn_info.bssid.bytes, peer_mac, QDF_MAC_ADDR_SIZE)) { - hdd_err("Not Associated to mac "MAC_ADDRESS_STR, + hdd_err("Not Associated to mac "QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(peer_mac)); return -EINVAL; } @@ -8664,7 +8664,7 @@ static int __wlan_hdd_cfg80211_get_link_properties(struct wiphy *wiphy, } if (WLAN_MAX_STA_COUNT == sta_id) { - hdd_err("No active peer with mac="MAC_ADDRESS_STR, + hdd_err("No active peer with mac="QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(peer_mac)); return -EINVAL; } @@ -8674,7 +8674,7 @@ static int __wlan_hdd_cfg80211_get_link_properties(struct wiphy *wiphy, (WLAN_HDD_GET_AP_CTX_PTR(adapter))->operating_channel); rate_flags = adapter->sta_info[sta_id].rate_flags; } else { - hdd_err("Not Associated! with mac "MAC_ADDRESS_STR, + hdd_err("Not Associated! with mac "QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(peer_mac)); return -EINVAL; } @@ -14223,7 +14223,7 @@ static int __wlan_hdd_cfg80211_change_iface(struct wiphy *wiphy, memcpy(adapter->mac_addr.bytes, ndev->dev_addr, QDF_MAC_ADDR_SIZE); pr_info("wlan: Generated HotSpot BSSID " - MAC_ADDRESS_STR "\n", + QDF_MAC_ADDR_STR "\n", QDF_MAC_ADDR_ARRAY(ndev->dev_addr)); } @@ -15019,7 +15019,7 @@ static int __wlan_hdd_cfg80211_add_key(struct wiphy *wiphy, qdf_mem_copy(&roam_profile->Keys.KeyMaterial[key_index][0], params->key, params->key_len); - hdd_debug("Set key for peerMac "MAC_ADDRESS_STR" direction %d", + hdd_debug("Set key for peerMac "QDF_MAC_ADDR_STR" direction %d", QDF_MAC_ADDR_ARRAY(set_key.peerMac.bytes), set_key.keyDirection); @@ -15073,7 +15073,7 @@ static int __wlan_hdd_cfg80211_add_key(struct wiphy *wiphy, set_key.keyDirection = eSIR_RX_ONLY; qdf_set_macaddr_broadcast(&set_key.peerMac); - hdd_debug("Set key peerMac "MAC_ADDRESS_STR" direction %d", + hdd_debug("Set key peerMac "QDF_MAC_ADDR_STR" direction %d", QDF_MAC_ADDR_ARRAY(set_key.peerMac.bytes), set_key.keyDirection); @@ -15574,7 +15574,7 @@ void wlan_hdd_cfg80211_unlink_bss(struct hdd_adapter *adapter, hdd_err("BSS not present"); } else { hdd_debug("cfg80211_unlink_bss called for BSSID " - MAC_ADDRESS_STR, QDF_MAC_ADDR_ARRAY(bssid)); + QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(bssid)); cfg80211_unlink_bss(wiphy, bss); /* cfg80211_get_bss get bss with ref count so release it */ cfg80211_put_bss(wiphy, bss); @@ -15740,7 +15740,7 @@ wlan_hdd_inform_bss_frame(struct hdd_adapter *adapter, for (i = 0; i < WLAN_MGMT_TXRX_HOST_MAX_ANTENNA; i++) bss_data.per_chain_rssi[i] = WLAN_INVALID_PER_CHAIN_RSSI; - hdd_debug("BSSID: " MAC_ADDRESS_STR " Channel:%d RSSI:%d TSF %u seq %d", + hdd_debug("BSSID: " QDF_MAC_ADDR_STR " Channel:%d RSSI:%d TSF %u seq %d", QDF_MAC_ADDR_ARRAY(bss_data.mgmt->bssid), bss_data.chan->center_freq, (int)(bss_data.rssi / 100), bss_desc->timeStamp[0], ((bss_desc->seq_ctrl.seqNumHi << @@ -15814,7 +15814,7 @@ int wlan_hdd_cfg80211_pmksa_candidate_notify(struct hdd_adapter *adapter, return -EINVAL; } - hdd_info(MAC_ADDRESS_STR, QDF_MAC_ADDR_ARRAY(roam_info->bssid.bytes)); + hdd_info(QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(roam_info->bssid.bytes)); cfg80211_pmksa_candidate_notify(dev, index, roam_info->bssid.bytes, preauth, GFP_KERNEL); @@ -15853,7 +15853,7 @@ wlan_hdd_cfg80211_roam_metrics_preauth(struct hdd_adapter *adapter, wrqu.data.pointer = metrics_notification; wrqu.data.length = scnprintf(metrics_notification, sizeof(metrics_notification), - "QCOM: LFR_PREAUTH_INIT " MAC_ADDRESS_STR, + "QCOM: LFR_PREAUTH_INIT " QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(roam_info->bssid.bytes)); wireless_send_event(adapter->dev, IWEVCUSTOM, &wrqu, @@ -15894,7 +15894,7 @@ wlan_hdd_cfg80211_roam_metrics_preauth_status(struct hdd_adapter *adapter, memset(metrics_notification, 0, sizeof(metrics_notification)); scnprintf(metrics_notification, sizeof(metrics_notification), - "QCOM: LFR_PREAUTH_STATUS " MAC_ADDRESS_STR, + "QCOM: LFR_PREAUTH_STATUS " QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(roam_info->bssid.bytes)); if (1 == preauth_status) @@ -15946,7 +15946,7 @@ wlan_hdd_cfg80211_roam_metrics_handover(struct hdd_adapter *adapter, wrqu.data.length = scnprintf(metrics_notification, sizeof(metrics_notification), "QCOM: LFR_PREAUTH_HANDOVER " - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(roam_info->bssid.bytes)); wireless_send_event(adapter->dev, IWEVCUSTOM, &wrqu, @@ -18128,7 +18128,7 @@ static int wlan_hdd_reassoc_bssid_hint(struct hdd_adapter *adapter, channel = req->channel_hint->hw_value; if (bssid && channel && req->prev_bssid) { - hdd_debug("REASSOC Attempt on channel %d to " MAC_ADDRESS_STR, + hdd_debug("REASSOC Attempt on channel %d to " QDF_MAC_ADDR_STR, channel, QDF_MAC_ADDR_ARRAY(bssid)); /* * Save BSSID in a separate variable as @@ -18294,7 +18294,7 @@ static int __wlan_hdd_cfg80211_connect(struct wiphy *wiphy, bssid = bssid_hint; if (bssid && hdd_get_adapter_by_macaddr(hdd_ctx, (uint8_t *)bssid)) { - hdd_err("adapter exist with same mac address " MAC_ADDRESS_STR, + hdd_err("adapter exist with same mac address " QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(bssid)); return -EINVAL; } @@ -19455,7 +19455,7 @@ int __wlan_hdd_cfg80211_del_station(struct wiphy *wiphy, QDF_MAC_ADDR_SIZE); hdd_debug("Delete STA with MAC::" - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(mac)); if (hdd_ctx->dev_dfs_cac_status == @@ -19487,7 +19487,7 @@ int __wlan_hdd_cfg80211_del_station(struct wiphy *wiphy, &sta_id); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hdd_debug("Skip DEL STA as this is not used::" - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(mac)); return -ENOENT; } @@ -19495,14 +19495,14 @@ int __wlan_hdd_cfg80211_del_station(struct wiphy *wiphy, if (adapter->sta_info[sta_id].is_deauth_in_progress == true) { hdd_debug("Skip DEL STA as deauth is in progress::" - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(mac)); return -ENOENT; } adapter->sta_info[sta_id].is_deauth_in_progress = true; - hdd_debug("ucast, Delete STA with MAC:" MAC_ADDRESS_STR, + hdd_debug("ucast, Delete STA with MAC:" QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(mac)); /* Case: SAP in ACS selected DFS ch and client connected @@ -19526,7 +19526,7 @@ int __wlan_hdd_cfg80211_del_station(struct wiphy *wiphy, adapter->sta_info[sta_id].is_deauth_in_progress = false; hdd_debug("STA removal failed for ::" - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(mac)); return -ENOENT; } @@ -19675,7 +19675,7 @@ static int __wlan_hdd_cfg80211_add_station(struct wiphy *wiphy, set = params->sta_flags_set; - hdd_debug("mask 0x%x set 0x%x " MAC_ADDRESS_STR, mask, set, + hdd_debug("mask 0x%x set 0x%x " QDF_MAC_ADDR_STR, mask, set, QDF_MAC_ADDR_ARRAY(mac)); if (mask & BIT(NL80211_STA_FLAG_TDLS_PEER)) { @@ -19856,7 +19856,7 @@ static void hdd_fill_pmksa_info(struct hdd_adapter *adapter, struct cfg80211_pmksa *pmksa, bool is_delete) { if (pmksa->bssid) { - hdd_debug("%s PMKSA for " MAC_ADDRESS_STR, + hdd_debug("%s PMKSA for " QDF_MAC_ADDR_STR, is_delete ? "Delete" : "Set", QDF_MAC_ADDR_ARRAY(pmksa->bssid)); qdf_mem_copy(pmk_cache->BSSID.bytes, @@ -19914,7 +19914,7 @@ static void hdd_fill_pmksa_info(struct hdd_adapter *adapter, { mac_handle_t mac_handle; - hdd_debug("%s PMKSA for " MAC_ADDRESS_STR, is_delete ? "Delete" : "Set", + hdd_debug("%s PMKSA for " QDF_MAC_ADDR_STR, is_delete ? "Delete" : "Set", QDF_MAC_ADDR_ARRAY(pmksa->bssid)); qdf_mem_copy(pmk_cache->BSSID.bytes, pmksa->bssid, QDF_MAC_ADDR_SIZE); @@ -20083,7 +20083,7 @@ static int __wlan_hdd_cfg80211_del_pmksa(struct wiphy *wiphy, /* Delete the PMKID CSR cache */ if (QDF_STATUS_SUCCESS != wlan_hdd_del_pmksa_cache(adapter, &pmk_cache)) { - hdd_err("Failed to delete PMKSA for " MAC_ADDRESS_STR, + hdd_err("Failed to delete PMKSA for " QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(pmksa->bssid)); status = -EINVAL; } @@ -20614,7 +20614,7 @@ static int __wlan_hdd_cfg80211_set_mac_acl(struct wiphy *wiphy, config->num_accept_mac = params->n_acl_entries; for (i = 0; i < params->n_acl_entries; i++) { hdd_debug("** Add ACL MAC entry %i in WhiletList :" - MAC_ADDRESS_STR, i, + QDF_MAC_ADDR_STR, i, QDF_MAC_ADDR_ARRAY( params->mac_addrs[i].addr)); @@ -20626,7 +20626,7 @@ static int __wlan_hdd_cfg80211_set_mac_acl(struct wiphy *wiphy, config->num_deny_mac = params->n_acl_entries; for (i = 0; i < params->n_acl_entries; i++) { hdd_debug("** Add ACL MAC entry %i in BlackList :" - MAC_ADDRESS_STR, i, + QDF_MAC_ADDR_STR, i, QDF_MAC_ADDR_ARRAY( params->mac_addrs[i].addr)); diff --git a/core/hdd/src/wlan_hdd_debugfs_connect.c b/core/hdd/src/wlan_hdd_debugfs_connect.c index 957c35768933..3f808121509b 100644 --- a/core/hdd/src/wlan_hdd_debugfs_connect.c +++ b/core/hdd/src/wlan_hdd_debugfs_connect.c @@ -358,7 +358,7 @@ wlan_hdd_connect_info_debugfs(struct hdd_adapter *adapter, uint8_t *buf, } ret_val = scnprintf(buf + length, buf_avail_len - length, "ssid = %s\n" - "bssid = " MAC_ADDRESS_STR "\n" + "bssid = " QDF_MAC_ADDR_STR "\n" "connect_time = %s\n" "auth_time = %s\n" "freq = %u\n" diff --git a/core/hdd/src/wlan_hdd_debugfs_offload.c b/core/hdd/src/wlan_hdd_debugfs_offload.c index a01bc0ef393b..0a9a1fc4fb23 100644 --- a/core/hdd/src/wlan_hdd_debugfs_offload.c +++ b/core/hdd/src/wlan_hdd_debugfs_offload.c @@ -98,7 +98,7 @@ wlan_hdd_mc_addr_list_info_debugfs(struct hdd_context *hdd_ctx, } ret = scnprintf(buf + length, buf_avail_len - length, - MAC_ADDRESS_STR "\n", + QDF_MAC_ADDR_STR "\n", QDF_MAC_ADDR_ARRAY(mc_addr_list.mc_addr[i].bytes)); if (ret <= 0) return length; diff --git a/core/hdd/src/wlan_hdd_debugfs_roam.c b/core/hdd/src/wlan_hdd_debugfs_roam.c index 36d86ca6cc8f..fac5531b6ed8 100644 --- a/core/hdd/src/wlan_hdd_debugfs_roam.c +++ b/core/hdd/src/wlan_hdd_debugfs_roam.c @@ -476,14 +476,14 @@ wlan_hdd_update_roam_stats(struct hdd_context *hdd_ctx, ret = scnprintf(buf + length, buf_avail_len - length, "\nSTA roamed from " - MAC_ADDRESS_STR " to " - MAC_ADDRESS_STR "\n", + QDF_MAC_ADDR_STR " to " + QDF_MAC_ADDR_STR "\n", QDF_MAC_ADDR_ARRAY(scan->old_bssid), QDF_MAC_ADDR_ARRAY(scan->new_bssid)); } else { ret = scnprintf(buf + length, buf_avail_len - length, - "\nSTA is connected to " MAC_ADDRESS_STR + "\nSTA is connected to " QDF_MAC_ADDR_STR " before and after scan, not roamed\n", QDF_MAC_ADDR_ARRAY(scan->old_bssid)); } @@ -526,7 +526,7 @@ wlan_hdd_update_roam_stats(struct hdd_context *hdd_ctx, ret = scnprintf(buf + length, buf_avail_len - length, - MAC_ADDRESS_STR " %4u %3u %3u\n", + QDF_MAC_ADDR_STR " %4u %3u %3u\n", QDF_MAC_ADDR_ARRAY(bssid), scan->cand[rci].freq, scan->cand[rci].score, diff --git a/core/hdd/src/wlan_hdd_ext_scan.c b/core/hdd/src/wlan_hdd_ext_scan.c index 7220b635c709..c453ebfabe45 100644 --- a/core/hdd/src/wlan_hdd_ext_scan.c +++ b/core/hdd/src/wlan_hdd_ext_scan.c @@ -423,7 +423,7 @@ wlan_hdd_cfg80211_extscan_cached_results_ind(struct hdd_context *hdd_ctx, ap->ts += hdd_ctx->ext_scan_start_since_boot; hdd_debug("Timestamp %llu " "Ssid: %s " - "Bssid (" MAC_ADDRESS_STR ") " + "Bssid (" QDF_MAC_ADDR_STR ") " "Channel %u " "Rssi %d " "RTT %u " @@ -587,7 +587,7 @@ wlan_hdd_cfg80211_extscan_hotlist_match_ind(struct hdd_context *hdd_ctx, hdd_debug("[i=%d] Timestamp %llu " "Ssid: %s " - "Bssid (" MAC_ADDRESS_STR ") " + "Bssid (" QDF_MAC_ADDR_STR ") " "Channel %u " "Rssi %d " "RTT %u " @@ -717,7 +717,7 @@ wlan_hdd_cfg80211_extscan_signif_wifi_change_results_ind( ap_info = &data->ap[0]; for (i = 0; i < data->numResults; i++) { hdd_debug("[i=%d] " - "Bssid (" MAC_ADDRESS_STR ") " + "Bssid (" QDF_MAC_ADDR_STR ") " "Channel %u " "numOfRssi %d", i, @@ -854,7 +854,7 @@ wlan_hdd_cfg80211_extscan_full_scan_result_event(struct hdd_context *hdd_ctx, hdd_debug("Req Id %u More Data %u", data->requestId, data->moreData); hdd_debug("AP Info: Timestamp %llu Ssid: %s " - "Bssid (" MAC_ADDRESS_STR ") " + "Bssid (" QDF_MAC_ADDR_STR ") " "Channel %u " "Rssi %d " "RTT %u " @@ -1131,7 +1131,7 @@ wlan_hdd_cfg80211_extscan_epno_match_found(struct hdd_context *hdd_ctx, for (i = 0; i < data->num_results; i++) { data->ap[i].channel = cds_chan_to_freq(data->ap[i].channel); hdd_debug("AP Info: Timestamp %llu) Ssid: %s " - "Bssid (" MAC_ADDRESS_STR ") " + "Bssid (" QDF_MAC_ADDR_STR ") " "Channel %u " "Rssi %d " "RTT %u " @@ -1237,7 +1237,7 @@ wlan_hdd_cfg80211_passpoint_match_found(void *ctx, data->request_id, data->id, data->anqp_len, num_matches); for (i = 0; i < num_matches; i++) { hdd_debug("AP Info: Timestamp %llu Ssid: %s " - "Bssid (" MAC_ADDRESS_STR ") " + "Bssid (" QDF_MAC_ADDR_STR ") " "Channel %u " "Rssi %d " "RTT %u " @@ -1880,7 +1880,7 @@ static int hdd_parse_ap_rssi_threshold(struct nlattr *attr, return -EINVAL; } nla_memcpy(ap->bssid.bytes, tb[id], QDF_MAC_ADDR_SIZE); - hdd_debug("BSSID: " MAC_ADDRESS_STR, + hdd_debug("BSSID: " QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(ap->bssid.bytes)); /* Parse and fetch low RSSI */ diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c index 865fd5bb8d51..be08dc0df5a5 100644 --- a/core/hdd/src/wlan_hdd_hostapd.c +++ b/core/hdd/src/wlan_hdd_hostapd.c @@ -684,7 +684,7 @@ static int __hdd_hostapd_set_mac_address(struct net_device *dev, void *addr) if (adapter_temp) { if (!qdf_str_cmp(adapter_temp->dev->name, dev->name)) return 0; - hdd_err("%s adapter exist with same address " MAC_ADDRESS_STR, + hdd_err("%s adapter exist with same address " QDF_MAC_ADDR_STR, adapter_temp->dev->name, QDF_MAC_ADDR_ARRAY(mac_addr.bytes)); return -EINVAL; @@ -705,7 +705,7 @@ static int __hdd_hostapd_set_mac_address(struct net_device *dev, void *addr) return -EINVAL; } - hdd_info("Changing MAC to " MAC_ADDRESS_STR " of interface %s ", + hdd_info("Changing MAC to " QDF_MAC_ADDR_STR " of interface %s ", QDF_MAC_ADDR_ARRAY(mac_addr.bytes), dev->name); hdd_update_dynamic_mac(hdd_ctx, &adapter->mac_addr, &mac_addr); @@ -2127,7 +2127,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(struct sap_event *sap_event, memcpy(msg.src_addr.sa_data, &sap_event->sapevt.sapStationMICFailureEvent. staMac, QDF_MAC_ADDR_SIZE); - hdd_debug("MIC MAC " MAC_ADDRESS_STR, + hdd_debug("MIC MAC " QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(msg.src_addr.sa_data)); if (sap_event->sapevt.sapStationMICFailureEvent. multicast == true) @@ -2161,7 +2161,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(struct sap_event *sap_event, case eSAP_STA_REASSOC_EVENT: event = &sap_event->sapevt.sapStationAssocReassocCompleteEvent; if (eSAP_STATUS_FAILURE == event->status) { - hdd_info("assoc failure: " MAC_ADDRESS_STR, + hdd_info("assoc failure: " QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(wrqu.addr.sa_data)); break; } @@ -2171,7 +2171,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(struct sap_event *sap_event, wrqu.addr.sa_family = ARPHRD_ETHER; memcpy(wrqu.addr.sa_data, &event->staMac, QDF_MAC_ADDR_SIZE); - hdd_info("associated " MAC_ADDRESS_STR, + hdd_info("associated " QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(wrqu.addr.sa_data)); we_event = IWEVREGISTERED; @@ -2194,7 +2194,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(struct sap_event *sap_event, event->wmmEnabled); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) hdd_err("Failed to register STA %d " - MAC_ADDRESS_STR "", qdf_status, + QDF_MAC_ADDR_STR "", qdf_status, QDF_MAC_ADDR_ARRAY(wrqu.addr.sa_data)); } else { qdf_status = hdd_softap_register_sta( @@ -2207,7 +2207,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(struct sap_event *sap_event, event->wmmEnabled); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) hdd_err("Failed to register STA %d " - MAC_ADDRESS_STR "", qdf_status, + QDF_MAC_ADDR_STR "", qdf_status, QDF_MAC_ADDR_ARRAY(wrqu.addr.sa_data)); } @@ -2325,7 +2325,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(struct sap_event *sap_event, cache_stainfo->reason_code = disassoc_comp->reason_code; cache_stainfo->disassoc_ts = qdf_system_ticks(); } - hdd_info(" disassociated " MAC_ADDRESS_STR, + hdd_info(" disassociated " QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(wrqu.addr.sa_data)); qdf_status = qdf_event_set(&hostapd_state->qdf_sta_disassoc_event); @@ -2432,13 +2432,8 @@ QDF_STATUS hdd_hostapd_sap_event_cb(struct sap_event *sap_event, case eSAP_UNKNOWN_STA_JOIN: snprintf(unknownSTAEvent, IW_CUSTOM_MAX, - "JOIN_UNKNOWN_STA-%02x:%02x:%02x:%02x:%02x:%02x", - sap_event->sapevt.sapUnknownSTAJoin.macaddr.bytes[0], - sap_event->sapevt.sapUnknownSTAJoin.macaddr.bytes[1], - sap_event->sapevt.sapUnknownSTAJoin.macaddr.bytes[2], - sap_event->sapevt.sapUnknownSTAJoin.macaddr.bytes[3], - sap_event->sapevt.sapUnknownSTAJoin.macaddr.bytes[4], - sap_event->sapevt.sapUnknownSTAJoin.macaddr.bytes[5]); + "JOIN_UNKNOWN_STA-"QDF_MAC_ADDR_STR, + QDF_MAC_ADDR_ARRAY(sap_event->sapevt.sapUnknownSTAJoin.macaddr.bytes)); we_event = IWEVCUSTOM; /* Discovered a new node (AP mode). */ wrqu.data.pointer = unknownSTAEvent; wrqu.data.length = strlen(unknownSTAEvent); @@ -2448,16 +2443,10 @@ QDF_STATUS hdd_hostapd_sap_event_cb(struct sap_event *sap_event, case eSAP_MAX_ASSOC_EXCEEDED: snprintf(maxAssocExceededEvent, IW_CUSTOM_MAX, - "Peer %02x:%02x:%02x:%02x:%02x:%02x denied" + "Peer "QDF_MAC_ADDR_STR" denied" " assoc due to Maximum Mobile Hotspot connections reached. Please disconnect" " one or more devices to enable the new device connection", - sap_event->sapevt.sapMaxAssocExceeded.macaddr.bytes[0], - sap_event->sapevt.sapMaxAssocExceeded.macaddr.bytes[1], - sap_event->sapevt.sapMaxAssocExceeded.macaddr.bytes[2], - sap_event->sapevt.sapMaxAssocExceeded.macaddr.bytes[3], - sap_event->sapevt.sapMaxAssocExceeded.macaddr.bytes[4], - sap_event->sapevt.sapMaxAssocExceeded.macaddr. - bytes[5]); + QDF_MAC_ADDR_ARRAY(sap_event->sapevt.sapMaxAssocExceeded.macaddr.bytes)); we_event = IWEVCUSTOM; /* Discovered a new node (AP mode). */ wrqu.data.pointer = maxAssocExceededEvent; wrqu.data.length = strlen(maxAssocExceededEvent); @@ -5481,7 +5470,7 @@ int wlan_hdd_cfg80211_start_bss(struct hdd_adapter *adapter, config->mfpCapable, config->mfpRequired); #endif - hdd_debug("SOftAP macaddress : " MAC_ADDRESS_STR, + hdd_debug("SOftAP macaddress : " QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(adapter->mac_addr.bytes)); hdd_debug("ssid =%s, beaconint=%d, channel=%d", config->SSIDinfo.ssid.ssId, (int)config->beacon_int, diff --git a/core/hdd/src/wlan_hdd_hostapd_wext.c b/core/hdd/src/wlan_hdd_hostapd_wext.c index 1a7dcc455128..793d0acea5a3 100644 --- a/core/hdd/src/wlan_hdd_hostapd_wext.c +++ b/core/hdd/src/wlan_hdd_hostapd_wext.c @@ -282,7 +282,7 @@ static void print_mac_list(struct qdf_mac_addr *macList, uint8_t size) for (i = 0; i < size; i++) { macArray = (macList + i)->bytes; - pr_info("ACL entry %i - %02x:%02x:%02x:%02x:%02x:%02x\n", + pr_info("ACL entry %i - "QDF_MAC_ADDR_STR"\n", i, QDF_MAC_ADDR_ARRAY(macArray)); } } @@ -390,7 +390,7 @@ static int hdd_set_peer_rate(struct hdd_adapter *adapter, int set_value) (OL_TXRX_PEER_STATE_CONN == adapter->sta_info[aid].peer_state)) { peer_mac = (uint8_t *)&(adapter->sta_info[aid].sta_mac.bytes[0]); - hdd_info("Peer AID: %d MAC_ADDR: "MAC_ADDRESS_STR, + hdd_info("Peer AID: %d MAC_ADDR: "QDF_MAC_ADDR_STR, aid, QDF_MAC_ADDR_ARRAY(peer_mac)); } else { hdd_err("No matching peer found for AID: %d", aid); @@ -1500,7 +1500,7 @@ int __iw_softap_modify_acl(struct net_device *dev, i++; cmd = (int)(*(value + i)); - hdd_debug("Modify ACL mac:" MAC_ADDRESS_STR " type: %d cmd: %d", + hdd_debug("Modify ACL mac:" QDF_MAC_ADDR_STR " type: %d cmd: %d", QDF_MAC_ADDR_ARRAY(peer_mac), list_type, cmd); qdf_status = wlansap_modify_acl( @@ -1895,7 +1895,7 @@ static __iw_softap_disassoc_sta(struct net_device *dev, */ peer_macaddr = (uint8_t *) (extra); - hdd_debug("data " MAC_ADDRESS_STR, + hdd_debug("data " QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(peer_macaddr)); wlansap_populate_del_sta_params(peer_macaddr, eSIR_MAC_DEAUTH_LEAVING_BSS_REASON, @@ -2297,7 +2297,7 @@ static int hdd_softap_get_sta_info(struct hdd_adapter *adapter, continue; written += scnprintf(buf + written, size - written, - "%5d %02x:%02x:%02x:%02x:%02x:%02x ecsa=%d\n", + "%5d "QDF_MAC_ADDR_STR" ecsa=%d\n", sta->sta_id, sta->sta_mac.bytes[0], sta->sta_mac.bytes[1], diff --git a/core/hdd/src/wlan_hdd_ioctl.c b/core/hdd/src/wlan_hdd_ioctl.c index a6a3b9cd8d7a..139cd226ff34 100644 --- a/core/hdd/src/wlan_hdd_ioctl.c +++ b/core/hdd/src/wlan_hdd_ioctl.c @@ -1722,7 +1722,7 @@ static QDF_STATUS hdd_parse_plm_cmd(uint8_t *command, req->mac_addr.bytes[count] = content; } - hdd_debug("MAC addr " MAC_ADDRESS_STR, + hdd_debug("MAC addr " QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(req->mac_addr.bytes)); in_ptr = strpbrk(in_ptr, " "); @@ -2023,7 +2023,7 @@ static int hdd_set_app_type2_parser(struct hdd_adapter *adapter, return -EINVAL; } - if (6 != sscanf(mac_addr, "%02x:%02x:%02x:%02x:%02x:%02x", + if (6 != sscanf(mac_addr, QDF_MAC_ADDR_STR, &gateway_mac[0], &gateway_mac[1], &gateway_mac[2], &gateway_mac[3], &gateway_mac[4], &gateway_mac[5])) { hdd_err("Invalid MacAddress Input %s", mac_addr); @@ -5173,9 +5173,8 @@ static int drv_cmd_get_ibss_peer_info_all(struct hdd_adapter *adapter, length += scnprintf(extra + length, user_size - length, - "%02x:%02x:%02x:%02x:%02x:%02x %d %d ", - mac_addr[0], mac_addr[1], mac_addr[2], - mac_addr[3], mac_addr[4], mac_addr[5], + QDF_MAC_ADDR_STR" %d %d ", + QDF_MAC_ADDR_ARRAY(mac_addr), tx_rate, rssi); /* * cdf_trace_msg has limitation of 512 bytes for the @@ -5767,7 +5766,7 @@ static int drv_cmd_max_tx_power(struct hdd_adapter *adapter, &adapter->mac_addr); hdd_debug("Device mode %d max tx power %d selfMac: " - MAC_ADDRESS_STR " bssId: " MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR " bssId: " QDF_MAC_ADDR_STR, adapter->device_mode, tx_power, QDF_MAC_ADDR_ARRAY(selfmac.bytes), QDF_MAC_ADDR_ARRAY(bssid.bytes)); @@ -6219,7 +6218,7 @@ static int hdd_set_rx_filter(struct hdd_adapter *adapter, bool action, sizeof(adapter->mc_addr_list.addr[i])); hdd_debug("%s RX filter : addr =" - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, action ? "setting" : "clearing", QDF_MAC_ADDR_ARRAY(filter->multicastAddr[j].bytes)); j++; diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index 69b87f072077..e8c9211b22da 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -1220,7 +1220,7 @@ void hdd_update_macaddr(struct hdd_context *hdd_ctx, hw_macaddr.bytes, QDF_MAC_ADDR_SIZE); hdd_ctx->num_provisioned_addr++; hdd_info("hdd_ctx->provisioned_mac_addr[0]: " - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(hdd_ctx-> provisioned_mac_addr[0].bytes)); } else { @@ -1229,7 +1229,7 @@ void hdd_update_macaddr(struct hdd_context *hdd_ctx, QDF_MAC_ADDR_SIZE); hdd_ctx->num_derived_addr++; hdd_info("hdd_ctx->derived_mac_addr[0]: " - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(hdd_ctx->derived_mac_addr[0].bytes)); } for (i = hdd_ctx->num_derived_addr; i < (QDF_MAX_CONCURRENCY_PERSONA - @@ -1252,7 +1252,7 @@ void hdd_update_macaddr(struct hdd_context *hdd_ctx, hdd_ctx->derived_mac_addr[i].bytes[0] |= 0x02; hdd_ctx->derived_mac_addr[i].bytes[3] = macaddr_b3; hdd_info("hdd_ctx->derived_mac_addr[%d]: " - MAC_ADDRESS_STR, i, + QDF_MAC_ADDR_STR, i, QDF_MAC_ADDR_ARRAY(hdd_ctx->derived_mac_addr[i].bytes)); hdd_ctx->num_derived_addr++; } @@ -3462,7 +3462,7 @@ static int __hdd_set_mac_address(struct net_device *dev, void *addr) if (adapter_temp) { if (!qdf_str_cmp(adapter_temp->dev->name, dev->name)) return 0; - hdd_err("%s adapter exist with same address " MAC_ADDRESS_STR, + hdd_err("%s adapter exist with same address " QDF_MAC_ADDR_STR, adapter_temp->dev->name, QDF_MAC_ADDR_ARRAY(mac_addr.bytes)); return -EINVAL; @@ -3472,7 +3472,7 @@ static int __hdd_set_mac_address(struct net_device *dev, void *addr) if (QDF_IS_STATUS_ERROR(qdf_ret_status)) return -EINVAL; - hdd_info("Changing MAC to " MAC_ADDRESS_STR " of the interface %s ", + hdd_info("Changing MAC to " QDF_MAC_ADDR_STR " of the interface %s ", QDF_MAC_ADDR_ARRAY(mac_addr.bytes), dev->name); hdd_update_dynamic_mac(hdd_ctx, &adapter->mac_addr, &mac_addr); @@ -3518,7 +3518,7 @@ static uint8_t *wlan_hdd_get_derived_intf_addr(struct hdd_context *hdd_ctx) if (i < 0 || i >= hdd_ctx->num_derived_addr) return NULL; qdf_atomic_set_bit(i, &hdd_ctx->derived_intf_addr_mask); - hdd_info("Assigning MAC from derived list" MAC_ADDRESS_STR, + hdd_info("Assigning MAC from derived list" QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(hdd_ctx->derived_mac_addr[i].bytes)); /* Copy the mac in dynamic mac list at first free position */ @@ -3549,7 +3549,7 @@ static uint8_t *wlan_hdd_get_provisioned_intf_addr(struct hdd_context *hdd_ctx) if (i < 0 || i >= hdd_ctx->num_provisioned_addr) return NULL; qdf_atomic_set_bit(i, &hdd_ctx->provisioned_intf_addr_mask); - hdd_info("Assigning MAC from provisioned list" MAC_ADDRESS_STR, + hdd_info("Assigning MAC from provisioned list" QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(hdd_ctx->provisioned_mac_addr[i].bytes)); /* Copy the mac in dynamic mac list at first free position */ @@ -3611,14 +3611,14 @@ void wlan_hdd_release_intf_addr(struct hdd_context *hdd_ctx, provisioned_intf_addr_mask); hdd_info("Releasing MAC from provisioned list"); hdd_info( - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(releaseAddr)); } else { qdf_atomic_clear_bit( mac_pos_in_mask, &hdd_ctx-> derived_intf_addr_mask); hdd_info("Releasing MAC from derived list"); - hdd_info(MAC_ADDRESS_STR, + hdd_info(QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(releaseAddr)); } qdf_zero_macaddr(&hdd_ctx-> @@ -3631,7 +3631,7 @@ void wlan_hdd_release_intf_addr(struct hdd_context *hdd_ctx, } if (i == QDF_MAX_CONCURRENCY_PERSONA) - hdd_err("Releasing non existing MAC" MAC_ADDRESS_STR, + hdd_err("Releasing non existing MAC" QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(releaseAddr)); } @@ -3697,7 +3697,7 @@ static void __hdd_set_multicast_list(struct net_device *dev) goto free_req; } netdev_for_each_mc_addr(ha, dev) { - hdd_debug("ha_addr[%d] "MAC_ADDRESS_STR, + hdd_debug("ha_addr[%d] "QDF_MAC_ADDR_STR, i, QDF_MAC_ADDR_ARRAY(ha->addr)); if (i == mc_count) break; @@ -5041,7 +5041,7 @@ static void hdd_reset_locally_admin_bit(struct hdd_context *hdd_ctx, */ WLAN_HDD_RESET_LOCALLY_ADMINISTERED_BIT(mac_addr); hdd_debug("locally administered bit reset in sta mode: " - MAC_ADDRESS_STR, QDF_MAC_ADDR_ARRAY(mac_addr)); + QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(mac_addr)); } static void wlan_hdd_cfg80211_scan_block_cb(struct work_struct *work) @@ -5101,7 +5101,7 @@ struct hdd_adapter *hdd_open_adapter(struct hdd_context *hdd_ctx, uint8_t sessio status = hdd_check_for_existing_macaddr(hdd_ctx, mac_addr); if (QDF_STATUS_E_FAILURE == status) { - hdd_err("Duplicate MAC addr: " MAC_ADDRESS_STR + hdd_err("Duplicate MAC addr: " QDF_MAC_ADDR_STR " already exists", QDF_MAC_ADDR_ARRAY(mac_addr)); return NULL; @@ -5119,7 +5119,7 @@ struct hdd_adapter *hdd_open_adapter(struct hdd_context *hdd_ctx, uint8_t sessio status = hdd_check_for_existing_macaddr(hdd_ctx, mac_addr); if (QDF_STATUS_E_FAILURE == status) { - hdd_err("Duplicate MAC addr: " MAC_ADDRESS_STR + hdd_err("Duplicate MAC addr: " QDF_MAC_ADDR_STR " already exists", QDF_MAC_ADDR_ARRAY(mac_addr)); return NULL; @@ -10258,7 +10258,7 @@ void hdd_populate_random_mac_addr(struct hdd_context *hdd_ctx, uint32_t num) macaddr_b3 ^= (1 << INTF_MACADDR_MASK); buf[0] |= 0x02; buf[3] = macaddr_b3; - hdd_debug(MAC_ADDRESS_STR, QDF_MAC_ADDR_ARRAY(buf)); + hdd_debug(QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(buf)); hdd_ctx->num_derived_addr++; } } @@ -10298,7 +10298,7 @@ static int hdd_platform_wlan_mac(struct hdd_context *hdd_ctx) for (iter = 0; iter < no_of_mac_addr; ++iter, addr += mac_addr_size) { buf = hdd_ctx->provisioned_mac_addr[iter].bytes; qdf_mem_copy(buf, addr, QDF_MAC_ADDR_SIZE); - hdd_info("provisioned MAC Addr [%d]" MAC_ADDRESS_STR, iter, + hdd_info("provisioned MAC Addr [%d]" QDF_MAC_ADDR_STR, iter, QDF_MAC_ADDR_ARRAY(buf)); } @@ -10320,7 +10320,7 @@ static int hdd_platform_wlan_mac(struct hdd_context *hdd_ctx) addr += mac_addr_size) { buf = hdd_ctx->derived_mac_addr[iter].bytes; qdf_mem_copy(buf, addr, QDF_MAC_ADDR_SIZE); - hdd_debug("derived MAC Addr [%d]" MAC_ADDRESS_STR, iter, + hdd_debug("derived MAC Addr [%d]" QDF_MAC_ADDR_STR, iter, QDF_MAC_ADDR_ARRAY(buf)); } hdd_ctx->num_derived_addr = no_of_mac_addr; @@ -14711,7 +14711,7 @@ bool hdd_is_connection_in_progress(uint8_t *out_vdev_id, mac_handle, adapter->vdev_id)) { sta_mac = (uint8_t *) &(adapter->mac_addr.bytes[0]); - hdd_debug("client " MAC_ADDRESS_STR + hdd_debug("client " QDF_MAC_ADDR_STR " is in middle of WPS/EAPOL exchange.", QDF_MAC_ADDR_ARRAY(sta_mac)); if (out_vdev_id && out_reason) { @@ -14732,7 +14732,7 @@ bool hdd_is_connection_in_progress(uint8_t *out_vdev_id, sta_mac = (uint8_t *) &(adapter->sta_info[sta_id]. sta_mac.bytes[0]); - hdd_debug("client " MAC_ADDRESS_STR + hdd_debug("client " QDF_MAC_ADDR_STR " of SAP/GO is in middle of WPS/EAPOL exchange", QDF_MAC_ADDR_ARRAY(sta_mac)); if (out_vdev_id && out_reason) { diff --git a/core/hdd/src/wlan_hdd_oemdata.c b/core/hdd/src/wlan_hdd_oemdata.c index 478c658c9b8e..69aa916cc66f 100644 --- a/core/hdd/src/wlan_hdd_oemdata.c +++ b/core/hdd/src/wlan_hdd_oemdata.c @@ -730,7 +730,7 @@ void hdd_send_peer_status_ind_to_oem_app(struct qdf_mac_addr *peer_mac, } skb_put(skb, NLMSG_SPACE((sizeof(tAniMsgHdr) + ani_hdr->length))); - hdd_info("sending peer " MAC_ADDRESS_STR + hdd_info("sending peer " QDF_MAC_ADDR_STR " status(%d), peer_capability(%d), vdev_id(%d), chanId(%d)" " to oem app pid(%d), center freq 1 (%d), center freq 2 (%d)," " info (0x%x), frequency (%d),reg info 1 (0x%x)," diff --git a/core/hdd/src/wlan_hdd_p2p.c b/core/hdd/src/wlan_hdd_p2p.c index 366832db9e59..f3e076a6f7e7 100644 --- a/core/hdd/src/wlan_hdd_p2p.c +++ b/core/hdd/src/wlan_hdd_p2p.c @@ -993,7 +993,7 @@ void __hdd_indicate_mgmt_frame(struct hdd_adapter *adapter, * we are dropping action frame */ hdd_err("adapter for action frame is NULL Macaddr = " - MAC_ADDRESS_STR, QDF_MAC_ADDR_ARRAY(dest_addr)); + QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(dest_addr)); hdd_debug("Frame Type = %d Frame Length = %d subType = %d", frame_type, frm_len, sub_type); /* diff --git a/core/hdd/src/wlan_hdd_rssi_monitor.c b/core/hdd/src/wlan_hdd_rssi_monitor.c index ac57ca105218..5fa6511ebb16 100644 --- a/core/hdd/src/wlan_hdd_rssi_monitor.c +++ b/core/hdd/src/wlan_hdd_rssi_monitor.c @@ -206,7 +206,7 @@ void hdd_rssi_threshold_breached(hdd_handle_t hdd_handle, hdd_debug("Req Id: %u Current rssi: %d", data->request_id, data->curr_rssi); - hdd_debug("Current BSSID: "MAC_ADDRESS_STR, + hdd_debug("Current BSSID: "QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(data->curr_bssid.bytes)); if (nla_put_u32(skb, QCA_WLAN_VENDOR_ATTR_RSSI_MONITORING_REQUEST_ID, diff --git a/core/hdd/src/wlan_hdd_station_info.c b/core/hdd/src/wlan_hdd_station_info.c index 6d5ba3b9176a..9876b5cf78f3 100644 --- a/core/hdd/src/wlan_hdd_station_info.c +++ b/core/hdd/src/wlan_hdd_station_info.c @@ -936,7 +936,7 @@ static int hdd_get_cached_station_remote(struct hdd_context *hdd_ctx, uint8_t channel_width; if (!stainfo) { - hdd_err("peer " MAC_ADDRESS_STR " not found", + hdd_err("peer " QDF_MAC_ADDR_STR " not found", QDF_MAC_ADDR_ARRAY(mac_addr.bytes)); return -EINVAL; } @@ -1219,7 +1219,7 @@ __hdd_cfg80211_get_station_cmd(struct wiphy *wiphy, nla_memcpy(mac_addr.bytes, tb[STATION_REMOTE], QDF_MAC_ADDR_SIZE); - hdd_debug("STATION_REMOTE " MAC_ADDRESS_STR, + hdd_debug("STATION_REMOTE " QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(mac_addr.bytes)); status = hdd_get_station_remote(hdd_ctx, adapter, mac_addr); diff --git a/core/hdd/src/wlan_hdd_stats.c b/core/hdd/src/wlan_hdd_stats.c index 059b51f5ad6d..f4c14a67fa33 100644 --- a/core/hdd/src/wlan_hdd_stats.c +++ b/core/hdd/src/wlan_hdd_stats.c @@ -569,7 +569,7 @@ bool hdd_get_interface_info(struct hdd_adapter *adapter, if ((eConnectionState_Associated == sta_ctx->conn_info.conn_state) && (!sta_ctx->conn_info.is_authenticated)) { - hdd_err("client " MAC_ADDRESS_STR + hdd_err("client " QDF_MAC_ADDR_STR " is in the middle of WPS/EAPOL exchange.", QDF_MAC_ADDR_ARRAY(adapter->mac_addr.bytes)); info->state = WIFI_AUTHENTICATING; diff --git a/core/hdd/src/wlan_hdd_wext.c b/core/hdd/src/wlan_hdd_wext.c index 59dbcb0b4f8b..fc6f9804bd1c 100644 --- a/core/hdd/src/wlan_hdd_wext.c +++ b/core/hdd/src/wlan_hdd_wext.c @@ -7231,7 +7231,7 @@ static int __iw_get_char_setnone(struct net_device *dev, buf = snprintf ((extra + length), WE_MAX_STR_LEN - length, - "\n%d .%02x:%02x:%02x:%02x:%02x:%02x\n", + "\n%d ."QDF_MAC_ADDR_STR"\n", sta_ctx->conn_info.sta_id[idx], sta_ctx->conn_info. peer_macaddr[idx].bytes[0], @@ -8878,7 +8878,7 @@ static int __iw_set_keepalive_params(struct net_device *dev, request->destIpv4Addr[0], request->destIpv4Addr[1], request->destIpv4Addr[2], request->destIpv4Addr[3]); - hdd_debug("Dest MAC address: "MAC_ADDRESS_STR, + hdd_debug("Dest MAC address: "QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(request->dest_macaddr.bytes)); break; } diff --git a/core/mac/src/dph/dph_hash_table.c b/core/mac/src/dph/dph_hash_table.c index 2f703d38a4f4..34b1932746d9 100644 --- a/core/mac/src/dph/dph_hash_table.c +++ b/core/mac/src/dph/dph_hash_table.c @@ -274,7 +274,7 @@ tpDphHashNode dph_add_hash_entry(struct mac_context *mac, tSirMacAddr staAddr, pe_debug("assocId %d index %d STA addr", assocId, index); - pe_debug(MAC_ADDRESS_STR, QDF_MAC_ADDR_ARRAY(staAddr)); + pe_debug(QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(staAddr)); if (assocId >= hash_table->size) { pe_err("invalid STA id %d", assocId); @@ -346,7 +346,7 @@ QDF_STATUS dph_delete_hash_entry(struct mac_context *mac, tSirMacAddr staAddr, uint16_t index = hash_function(mac, staAddr, hash_table->size); pe_debug("assocId %d index %d STA addr", assocId, index); - pe_debug(MAC_ADDRESS_STR, QDF_MAC_ADDR_ARRAY(staAddr)); + pe_debug(QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(staAddr)); if (assocId >= hash_table->size) { pe_err("invalid STA id %d", assocId); @@ -384,7 +384,7 @@ QDF_STATUS dph_delete_hash_entry(struct mac_context *mac, tSirMacAddr staAddr, ptr->next = 0; } else { pe_err("Entry not present STA addr"); - pe_err(MAC_ADDRESS_STR, QDF_MAC_ADDR_ARRAY(staAddr)); + pe_err(QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(staAddr)); return QDF_STATUS_E_FAILURE; } diff --git a/core/mac/src/include/sir_debug.h b/core/mac/src/include/sir_debug.h index bee0003f8b5a..989f27b96817 100644 --- a/core/mac/src/include/sir_debug.h +++ b/core/mac/src/include/sir_debug.h @@ -35,8 +35,6 @@ #define LOG4 7 #define LOGD 8 -#define MAC_ADDRESS_STR "%02x:%02x:%02x:%02x:%02x:%02x" - #define pe_alert_rl(params...) QDF_TRACE_FATAL_RL(QDF_MODULE_ID_PE, params) #define pe_err_rl(params...) QDF_TRACE_ERROR_RL(QDF_MODULE_ID_PE, params) #define pe_warn_rl(params...) QDF_TRACE_WARN_RL(QDF_MODULE_ID_PE, params) diff --git a/core/mac/src/pe/lim/lim_assoc_utils.c b/core/mac/src/pe/lim/lim_assoc_utils.c index bad330b2c3fa..7af987a2e9e3 100644 --- a/core/mac/src/pe/lim/lim_assoc_utils.c +++ b/core/mac/src/pe/lim/lim_assoc_utils.c @@ -692,7 +692,7 @@ lim_send_del_sta_cnf(struct mac_context *mac, struct qdf_mac_addr sta_dsaddr, tLimMlmDeauthCnf mlmDeauthCnf; tLimMlmPurgeStaInd mlmPurgeStaInd; - pe_debug("Sessionid: %d staDsAssocId: %d Trigger: %d statusCode: %d sta_dsaddr: "MAC_ADDRESS_STR, + pe_debug("Sessionid: %d staDsAssocId: %d Trigger: %d statusCode: %d sta_dsaddr: "QDF_MAC_ADDR_STR, pe_session->peSessionId, staDsAssocId, mlmStaContext.cleanupTrigger, statusCode, QDF_MAC_ADDR_ARRAY(sta_dsaddr.bytes)); @@ -892,7 +892,7 @@ lim_reject_association(struct mac_context *mac_ctx, tSirMacAddr peer_addr, { tpDphHashNode sta_ds; - pe_debug("Sessionid: %d auth_type: %d sub_type: %d add_pre_auth_context: %d sta_id: %d delete_sta: %d result_code : %d peer_addr: " MAC_ADDRESS_STR, + pe_debug("Sessionid: %d auth_type: %d sub_type: %d add_pre_auth_context: %d sta_id: %d delete_sta: %d result_code : %d peer_addr: " QDF_MAC_ADDR_STR, session_entry->peSessionId, auth_type, sub_type, add_pre_auth_context, sta_id, delete_sta, result_code, QDF_MAC_ADDR_ARRAY(peer_addr)); @@ -2150,7 +2150,7 @@ lim_add_sta(struct mac_context *mac_ctx, else sta_Addr = &sta_mac; - pe_debug(MAC_ADDRESS_STR ": Subtype(Assoc/Reassoc): %d", + pe_debug(QDF_MAC_ADDR_STR ": Subtype(Assoc/Reassoc): %d", QDF_MAC_ADDR_ARRAY(*sta_Addr), sta_ds->mlmStaContext.subType); qdf_mem_copy((uint8_t *) add_sta_params->staMac, @@ -2681,7 +2681,7 @@ lim_del_sta(struct mac_context *mac, pe_debug("Sessionid %d :Sending SIR_HAL_DELETE_STA_REQ " "for STAID: %X and AssocID: %d MAC : " - MAC_ADDRESS_STR, pDelStaParams->sessionId, + QDF_MAC_ADDR_STR, pDelStaParams->sessionId, pDelStaParams->staIdx, pDelStaParams->assocId, QDF_MAC_ADDR_ARRAY(sta->staAddr)); @@ -2744,7 +2744,7 @@ lim_add_sta_self(struct mac_context *mac, uint16_t staIdx, uint8_t updateSta, (int)mac->roam.configParam.uCfgDot11Mode); sir_copy_mac_addr(staMac, pe_session->selfMacAddr); - pe_debug(MAC_ADDRESS_STR ": ", QDF_MAC_ADDR_ARRAY(staMac)); + pe_debug(QDF_MAC_ADDR_STR ": ", QDF_MAC_ADDR_ARRAY(staMac)); pAddStaParams = qdf_mem_malloc(sizeof(tAddStaParams)); if (!pAddStaParams) return QDF_STATUS_E_NOMEM; @@ -2900,7 +2900,7 @@ lim_add_sta_self(struct mac_context *mac, uint16_t staIdx, uint8_t updateSta, msgQ.bodyptr = pAddStaParams; msgQ.bodyval = 0; - pe_debug(MAC_ADDRESS_STR ":Sessionid %d : " + pe_debug(QDF_MAC_ADDR_STR ":Sessionid %d : " "Sending WMA_ADD_STA_REQ. (aid %d)", QDF_MAC_ADDR_ARRAY(pAddStaParams->staMac), pAddStaParams->sessionId, pAddStaParams->assocId); @@ -3369,7 +3369,7 @@ lim_del_bss(struct mac_context *mac, tpDphHashNode sta, uint16_t bssIdx, sizeof(tSirMacAddr)); pDelBssParams->smesessionId = pe_session->smeSessionId; pe_debug("Sessionid %d : Sending HAL_DELETE_BSS_REQ " - "for bss idx: %X BSSID:" MAC_ADDRESS_STR, + "for bss idx: %X BSSID:" QDF_MAC_ADDR_STR, pDelBssParams->sessionId, pDelBssParams->bssIdx, QDF_MAC_ADDR_ARRAY(pe_session->bssId)); /* we need to defer the message until we get the response back from HAL. */ @@ -3568,7 +3568,7 @@ QDF_STATUS lim_sta_send_add_bss(struct mac_context *mac, tpSirAssocRsp pAssocRsp pe_session->smeSessionId, updateEntry, GET_LIM_SYSTEM_ROLE(pe_session)); - pe_debug("BSSID: " MAC_ADDRESS_STR, + pe_debug("BSSID: " QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(pAddBssParams->bssId)); pAddBssParams->bssType = eSIR_INFRASTRUCTURE_MODE; @@ -3743,7 +3743,7 @@ QDF_STATUS lim_sta_send_add_bss(struct mac_context *mac, tpSirAssocRsp pAssocRsp &pe_session->dph.dphHashTable); if (!sta) { pe_err("Couldn't get assoc id for " "MAC ADDR: " - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY( pAddBssParams->staContext.staMac)); return QDF_STATUS_E_FAILURE; @@ -3757,7 +3757,7 @@ QDF_STATUS lim_sta_send_add_bss(struct mac_context *mac, tpSirAssocRsp pAssocRsp (uint8_t) pAssocRsp->capabilityInfo.shortPreamble; pAddBssParams->staContext.updateSta = updateEntry; - pe_debug("StaContext: " MAC_ADDRESS_STR + pe_debug("StaContext: " QDF_MAC_ADDR_STR " shortPreambleSupported: %d", QDF_MAC_ADDR_ARRAY(pAddBssParams->staContext.staMac), pAddBssParams->staContext.shortPreambleSupported); @@ -4113,7 +4113,7 @@ QDF_STATUS lim_sta_send_add_bss_pre_assoc(struct mac_context *mac, uint8_t updat pe_session->smeSessionId, updateEntry, GET_LIM_SYSTEM_ROLE(pe_session)); - pe_debug("BSSID: " MAC_ADDRESS_STR, + pe_debug("BSSID: " QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(pAddBssParams->bssId)); /* Incorrect BSS Type which caused UMA Descriptor to be overwritten on * top of an already established Infra link. This lead to issues in @@ -4295,7 +4295,7 @@ QDF_STATUS lim_sta_send_add_bss_pre_assoc(struct mac_context *mac, uint8_t updat (uint8_t) pBeaconStruct->capabilityInfo.shortPreamble; pAddBssParams->staContext.updateSta = updateEntry; - pe_debug("StaCtx: " MAC_ADDRESS_STR " shortPreamble: %d", + pe_debug("StaCtx: " QDF_MAC_ADDR_STR " shortPreamble: %d", QDF_MAC_ADDR_ARRAY(pAddBssParams->staContext.staMac), pAddBssParams->staContext.shortPreambleSupported); diff --git a/core/mac/src/pe/lim/lim_ft.c b/core/mac/src/pe/lim/lim_ft.c index f0150c951195..f90714f37c90 100644 --- a/core/mac/src/pe/lim/lim_ft.c +++ b/core/mac/src/pe/lim/lim_ft.c @@ -808,7 +808,7 @@ bool lim_process_ft_update_key(struct mac_context *mac, uint32_t *pMsgBuf) pAddBssParams->extSetStaKeyParam.staIdx = 0; - pe_debug("BSSID: " MAC_ADDRESS_STR, + pe_debug("BSSID: " QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(pKeyInfo->bssid.bytes)); qdf_copy_macaddr(&pAddBssParams->extSetStaKeyParam.peer_macaddr, diff --git a/core/mac/src/pe/lim/lim_ft_preauth.c b/core/mac/src/pe/lim/lim_ft_preauth.c index ba1951f1016d..a9a9f4ba72ea 100644 --- a/core/mac/src/pe/lim/lim_ft_preauth.c +++ b/core/mac/src/pe/lim/lim_ft_preauth.c @@ -142,7 +142,7 @@ int lim_process_ft_pre_auth_req(struct mac_context *mac_ctx, &session_id); if (!session) { pe_err("Unable to find session for the bssid" - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(ft_pre_auth_req->currbssId)); /* Post the FT Pre Auth Response to SME */ lim_post_ft_pre_auth_rsp(mac_ctx, QDF_STATUS_E_FAILURE, NULL, 0, diff --git a/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c b/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c index c60922dae759..a0466c572906 100644 --- a/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c +++ b/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c @@ -1049,7 +1049,7 @@ lim_ibss_search_and_delete_peer(struct mac_context *mac_ctx, prev_node = temp_node = mac_ctx->lim.gLimIbssPeerList; - pe_debug(" PEER ADDR :" MAC_ADDRESS_STR, + pe_debug(" PEER ADDR :" QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(mac_addr)); /** Compare Peer */ @@ -1109,7 +1109,7 @@ lim_ibss_delete_peer(struct mac_context *mac_ctx, tpDphHashNode sta = NULL; uint16_t peer_idx = 0; - pe_debug("Delete peer :" MAC_ADDRESS_STR, + pe_debug("Delete peer :" QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(mac_addr)); sta = dph_lookup_hash_entry(mac_ctx, mac_addr, @@ -1174,7 +1174,7 @@ void lim_process_ibss_del_sta_rsp(struct mac_context *mac_ctx, status = eSIR_SME_REFUSED; goto skip_event; } - pe_debug("Deleted STA associd %d staId %d MAC " MAC_ADDRESS_STR, + pe_debug("Deleted STA associd %d staId %d MAC " QDF_MAC_ADDR_STR, sta_ds->assocId, sta_ds->staIndex, QDF_MAC_ADDR_ARRAY(sta_ds->staAddr)); @@ -1215,14 +1215,14 @@ lim_ibss_add_sta_rsp(struct mac_context *mac, void *msg, struct pe_session *pe_s dph_lookup_hash_entry(mac, pAddStaParams->staMac, &peerIdx, &pe_session->dph.dphHashTable); if (!sta) { - pe_err("IBSS: ADD_STA_RSP for unknown MAC addr: "MAC_ADDRESS_STR, + pe_err("IBSS: ADD_STA_RSP for unknown MAC addr: "QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(pAddStaParams->staMac)); qdf_mem_free(pAddStaParams); return QDF_STATUS_E_FAILURE; } if (pAddStaParams->status != QDF_STATUS_SUCCESS) { - pe_err("IBSS: ADD_STA_RSP error: %x for MAC:"MAC_ADDRESS_STR, + pe_err("IBSS: ADD_STA_RSP error: %x for MAC:"QDF_MAC_ADDR_STR, pAddStaParams->status, QDF_MAC_ADDR_ARRAY(pAddStaParams->staMac)); lim_ibss_delete_peer(mac, @@ -1448,8 +1448,8 @@ lim_ibss_coalesce(struct mac_context *mac, sir_copy_mac_addr(currentBssId, pe_session->bssId); - pe_debug("Current BSSID :" MAC_ADDRESS_STR " Received BSSID :" - MAC_ADDRESS_STR, QDF_MAC_ADDR_ARRAY(currentBssId), + pe_debug("Current BSSID :" QDF_MAC_ADDR_STR " Received BSSID :" + QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(currentBssId), QDF_MAC_ADDR_ARRAY(pHdr->bssId)); /* Check for IBSS Coalescing only if Beacon is from different BSS */ @@ -1484,7 +1484,7 @@ lim_ibss_coalesce(struct mac_context *mac, */ mac->lim.gLimIbssCoalescingHappened = true; ibss_coalesce_save(mac, pHdr, pBeacon); - pe_debug("IBSS Coalescing happened Delete BSSID :" MAC_ADDRESS_STR, + pe_debug("IBSS Coalescing happened Delete BSSID :" QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(currentBssId)); lim_ibss_bss_delete(mac, pe_session); diff --git a/core/mac/src/pe/lim/lim_link_monitoring_algo.c b/core/mac/src/pe/lim/lim_link_monitoring_algo.c index 3ae3f4c06973..c187a753520c 100644 --- a/core/mac/src/pe/lim/lim_link_monitoring_algo.c +++ b/core/mac/src/pe/lim/lim_link_monitoring_algo.c @@ -147,7 +147,7 @@ static void lim_delete_sta_util(struct mac_context *mac_ctx, tpDeleteStaContext pe_debug("Received SIR_LIM_DELETE_STA_CONTEXT_IND for " "STA that either has no context or " "in some transit state, Addr = " - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(msg->bssId)); return; } @@ -421,7 +421,7 @@ lim_tear_down_link_with_ap(struct mac_context *mac, uint8_t sessionId, mac->lim.gLimHeartBeatApMacIndex = 1; pe_debug("HB Failure on MAC " - MAC_ADDRESS_STR" Store it on Index %d", + QDF_MAC_ADDR_STR" Store it on Index %d", QDF_MAC_ADDR_ARRAY(sta->staAddr), apCount); sir_copy_mac_addr(mac->lim.gLimHeartBeatApMac[apCount], diff --git a/core/mac/src/pe/lim/lim_process_assoc_req_frame.c b/core/mac/src/pe/lim/lim_process_assoc_req_frame.c index 2046f309a569..e6f4680d614b 100644 --- a/core/mac/src/pe/lim/lim_process_assoc_req_frame.c +++ b/core/mac/src/pe/lim/lim_process_assoc_req_frame.c @@ -174,7 +174,7 @@ static QDF_STATUS lim_check_sta_in_pe_entries(struct mac_context *mac_ctx, } sta_ds->sta_deletion_in_progress = true; pe_err("Sending Disassoc and Deleting existing STA entry:" - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(session->selfMacAddr)); lim_send_disassoc_mgmt_frame(mac_ctx, eSIR_MAC_UNSPEC_FAILURE_REASON, @@ -285,7 +285,7 @@ static bool lim_chk_assoc_req_parse_error(struct mac_context *mac_ctx, return true; pe_warn("Assoc Req rejected: frame parsing error. source addr:" - MAC_ADDRESS_STR, QDF_MAC_ADDR_ARRAY(hdr->sa)); + QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(hdr->sa)); lim_send_assoc_rsp_mgmt_frame(mac_ctx, eSIR_MAC_UNSPEC_FAILURE_STATUS, 1, hdr->sa, sub_type, 0, session); return false; @@ -321,7 +321,7 @@ static bool lim_chk_capab(struct mac_context *mac_ctx, tpSirMacMgmtHdr hdr, if (lim_compare_capabilities(mac_ctx, assoc_req, local_cap, session) == false) { pe_warn("Rcvd %s Req with unsupported capab from" - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, (LIM_ASSOC == sub_type) ? "Assoc" : "ReAssoc", QDF_MAC_ADDR_ARRAY(hdr->sa)); /* @@ -357,7 +357,7 @@ static bool lim_chk_ssid(struct mac_context *mac_ctx, tpSirMacMgmtHdr hdr, return true; pe_err("%s Req with ssid wrong(Rcvd: %.*s self: %.*s) from " - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, (LIM_ASSOC == sub_type) ? "Assoc" : "ReAssoc", assoc_req->ssId.length, assoc_req->ssId.ssId, session->ssId.length, session->ssId.ssId, @@ -414,7 +414,7 @@ static bool lim_chk_rates(struct mac_context *mac_ctx, tpSirMacMgmtHdr hdr, return true; pe_warn("Assoc Req rejected: unsupported rates, soruce addr: %s" - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, (LIM_ASSOC == sub_type) ? "Assoc" : "ReAssoc", QDF_MAC_ADDR_ARRAY(hdr->sa)); /* @@ -447,7 +447,7 @@ static bool lim_chk_11g_only(struct mac_context *mac_ctx, tpSirMacMgmtHdr hdr, (session->dot11mode == MLME_DOT11_MODE_11G_ONLY) && (assoc_req->HTCaps.present)) { pe_err("SOFTAP was in 11G only mode, rejecting legacy STA: " - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(hdr->sa)); lim_send_assoc_rsp_mgmt_frame(mac_ctx, eSIR_MAC_CAPABILITIES_NOT_SUPPORTED_STATUS, @@ -477,7 +477,7 @@ static bool lim_chk_11n_only(struct mac_context *mac_ctx, tpSirMacMgmtHdr hdr, (session->dot11mode == MLME_DOT11_MODE_11N_ONLY) && (!assoc_req->HTCaps.present)) { pe_err("SOFTAP was in 11N only mode, rejecting legacy STA: " - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(hdr->sa)); lim_send_assoc_rsp_mgmt_frame(mac_ctx, eSIR_MAC_CAPABILITIES_NOT_SUPPORTED_STATUS, @@ -644,14 +644,14 @@ lim_process_for_spectrum_mgmt(struct mac_context *mac_ctx, tpSirMacMgmtHdr hdr, */ if (!assoc_req->powerCapabilityPresent) { pe_warn("LIM Info: Missing Power capability IE in %s Req from " - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, (LIM_ASSOC == sub_type) ? "Assoc" : "ReAssoc", QDF_MAC_ADDR_ARRAY(hdr->sa)); } if (!assoc_req->supportedChannelsPresent) { pe_warn("LIM Info: Missing Supported channel IE in %s Req from " - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, (LIM_ASSOC == sub_type) ? "Assoc" : "ReAssoc", QDF_MAC_ADDR_ARRAY(hdr->sa)); @@ -663,7 +663,7 @@ lim_process_for_spectrum_mgmt(struct mac_context *mac_ctx, tpSirMacMgmtHdr hdr, mac_ctx, assoc_req, session); if (QDF_STATUS_SUCCESS != status) { pe_warn("LIM Info: MinTxPower(STA) > MaxTxPower(AP) in %s Req from " - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, (LIM_ASSOC == sub_type) ? "Assoc" : "ReAssoc", QDF_MAC_ADDR_ARRAY(hdr->sa)); @@ -672,7 +672,7 @@ lim_process_for_spectrum_mgmt(struct mac_context *mac_ctx, tpSirMacMgmtHdr hdr, mac_ctx, assoc_req); if (QDF_STATUS_SUCCESS != status) { pe_warn("LIM Info: wrong supported channels (STA) in %s Req from " - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, (LIM_ASSOC == sub_type) ? "Assoc" : "ReAssoc", QDF_MAC_ADDR_ARRAY(hdr->sa)); @@ -718,7 +718,7 @@ static bool lim_chk_mcs(struct mac_context *mac_ctx, tpSirMacMgmtHdr hdr, if ((assoc_req->HTCaps.present) && (lim_check_mcs_set(mac_ctx, assoc_req->HTCaps.supportedMCSSet) == false)) { pe_warn("rcvd %s req with unsupported MCS Rate Set from " - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, (LIM_ASSOC == sub_type) ? "Assoc" : "ReAssoc", QDF_MAC_ADDR_ARRAY(hdr->sa)); /* @@ -972,12 +972,12 @@ static bool lim_check_wpa_rsn_ie(struct pe_session *session, qdf_mem_zero((uint8_t *) &dot11f_ie_rsn, sizeof(dot11f_ie_rsn)); qdf_mem_zero((uint8_t *) &dot11f_ie_wpa, sizeof(dot11f_ie_wpa)); pe_err("RSN enabled auth, Re/Assoc req from STA: " - MAC_ADDRESS_STR, QDF_MAC_ADDR_ARRAY(hdr->sa)); + QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(hdr->sa)); if (assoc_req->rsnPresent) { if (!(assoc_req->rsn.length)) { pe_warn("Re/Assoc rejected from: " - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(hdr->sa)); /* * rcvd Assoc req frame with RSN IE but @@ -1010,7 +1010,7 @@ static bool lim_check_wpa_rsn_ie(struct pe_session *session, pmf_connection); if (eSIR_MAC_SUCCESS_STATUS != status) { pe_warn("Re/Assoc rejected from: " - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(hdr->sa)); lim_send_assoc_rsp_mgmt_frame(mac_ctx, status, @@ -1019,7 +1019,7 @@ static bool lim_check_wpa_rsn_ie(struct pe_session *session, return false; } } else { - pe_warn("Re/Assoc rejected from: " MAC_ADDRESS_STR, + pe_warn("Re/Assoc rejected from: " QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(hdr->sa)); /* * rcvd Assoc req frame with RSN IE but @@ -1037,7 +1037,7 @@ static bool lim_check_wpa_rsn_ie(struct pe_session *session, status = lim_check_sae_pmf_cap(session, &dot11f_ie_rsn); if (eSIR_MAC_SUCCESS_STATUS != status) { /* Reject pmf disable SAE STA */ - pe_warn("Re/Assoc rejected from: " MAC_ADDRESS_STR, + pe_warn("Re/Assoc rejected from: " QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(hdr->sa)); lim_send_assoc_rsp_mgmt_frame(mac_ctx, status, 1, hdr->sa, sub_type, @@ -1048,7 +1048,7 @@ static bool lim_check_wpa_rsn_ie(struct pe_session *session, } else if (assoc_req->wpaPresent) { if (!(assoc_req->wpa.length)) { pe_warn("Re/Assoc rejected from: " - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(hdr->sa)); /* rcvd Assoc req frame with invalid WPA IE length */ @@ -1075,7 +1075,7 @@ static bool lim_check_wpa_rsn_ie(struct pe_session *session, &dot11f_ie_wpa); if (eSIR_MAC_SUCCESS_STATUS != status) { pe_warn("Re/Assoc rejected from: " - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(hdr->sa)); /* * rcvd Assoc req frame with WPA IE @@ -1190,7 +1190,7 @@ static bool lim_process_assoc_req_no_sta_ctx(struct mac_context *mac_ctx, hdr->sa, session, false); pe_warn("rcvd %s req, sessionid: %d, without pre-auth ctx" - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, (LIM_ASSOC == sub_type) ? "Assoc" : "ReAssoc", session->peSessionId, QDF_MAC_ADDR_ARRAY(hdr->sa)); return false; @@ -1646,7 +1646,7 @@ static bool lim_update_sta_ds(struct mac_context *mac_ctx, tpSirMacMgmtHdr hdr, &assoc_req->he_cap) != QDF_STATUS_SUCCESS) { /* Could not update hash table entry at DPH with rateset */ pe_err("Couldn't update hash entry for aid: %d MacAddr: " - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, peer_idx, QDF_MAC_ADDR_ARRAY(hdr->sa)); /* Release AID */ @@ -2005,7 +2005,7 @@ bool lim_send_assoc_ind_to_sme(struct mac_context *mac_ctx, return false; /* STA is Associated ! */ - pe_debug("Received: %s Req successful from " MAC_ADDRESS_STR, + pe_debug("Received: %s Req successful from " QDF_MAC_ADDR_STR, (sub_type == LIM_ASSOC) ? "Assoc" : "ReAssoc", QDF_MAC_ADDR_ARRAY(hdr->sa)); @@ -2036,7 +2036,7 @@ bool lim_send_assoc_ind_to_sme(struct mac_context *mac_ctx, if (!sta_ds) { /* Could not add hash table entry at DPH */ pe_err("couldn't add hash entry at DPH for aid: %d MacAddr:" - MAC_ADDRESS_STR, peer_idx, QDF_MAC_ADDR_ARRAY(hdr->sa)); + QDF_MAC_ADDR_STR, peer_idx, QDF_MAC_ADDR_ARRAY(hdr->sa)); /* Release AID */ lim_release_peer_idx(mac_ctx, peer_idx, session); @@ -2120,14 +2120,14 @@ void lim_process_assoc_req_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_in frame_len = WMA_GET_RX_PAYLOAD_LEN(rx_pkt_info); pe_debug("Rcvd: %s Req Frame sessionid: %d systemrole: %d MlmState: %d from: " - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, (LIM_ASSOC == sub_type) ? "Assoc" : "ReAssoc", session->peSessionId, GET_LIM_SYSTEM_ROLE(session), session->limMlmState, QDF_MAC_ADDR_ARRAY(hdr->sa)); if (LIM_IS_STA_ROLE(session)) { pe_err("Rcvd unexpected ASSOC REQ, sessionid: %d sys sub_type: %d for role: %d from: " - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, session->peSessionId, sub_type, GET_LIM_SYSTEM_ROLE(session), QDF_MAC_ADDR_ARRAY(hdr->sa)); @@ -2138,7 +2138,7 @@ void lim_process_assoc_req_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_in } if (session->limMlmState == eLIM_MLM_WT_DEL_BSS_RSP_STATE) { pe_err("drop ASSOC REQ on sessionid: %d " - "role: %d from: "MAC_ADDRESS_STR" in limMlmState: %d", + "role: %d from: "QDF_MAC_ADDR_STR" in limMlmState: %d", session->peSessionId, GET_LIM_SYSTEM_ROLE(session), QDF_MAC_ADDR_ARRAY(hdr->sa), @@ -2158,7 +2158,7 @@ void lim_process_assoc_req_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_in if (sta_ds) { if (hdr->fc.retry > 0) { pe_err("STA is initiating Assoc Req after ACK lost. Do not process sessionid: %d sys sub_type=%d for role=%d from: " - MAC_ADDRESS_STR, session->peSessionId, + QDF_MAC_ADDR_STR, session->peSessionId, sub_type, GET_LIM_SYSTEM_ROLE(session), QDF_MAC_ADDR_ARRAY(hdr->sa)); return; @@ -2187,7 +2187,7 @@ void lim_process_assoc_req_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_in sub_type, sta_ds, session); pe_err("DUT already received an assoc request frame and STA is sending another assoc req.So, do not Process sessionid: %d sys sub_type: %d for role: %d from: " - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, session->peSessionId, sub_type, session->limSystemRole, QDF_MAC_ADDR_ARRAY(hdr->sa)); @@ -2222,7 +2222,7 @@ void lim_process_assoc_req_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_in * ignore it */ pe_err("Rcvd: %s Req, sessionid: %d from a BC/MC address" - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, (LIM_ASSOC == sub_type) ? "Assoc" : "ReAssoc", session->peSessionId, QDF_MAC_ADDR_ARRAY(hdr->sa)); return; @@ -2576,7 +2576,7 @@ void lim_send_mlm_assoc_ind(struct mac_context *mac_ctx, sub_type = LIM_ASSOC; pe_debug("Sessionid: %d ssid: %s sub_type: %d Associd: %d staAddr: " - MAC_ADDRESS_STR, session_entry->peSessionId, + QDF_MAC_ADDR_STR, session_entry->peSessionId, assoc_req->ssId.ssId, sub_type, sta_ds->assocId, QDF_MAC_ADDR_ARRAY(sta_ds->staAddr)); diff --git a/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c b/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c index 4222f857ad88..46d45eb4c11f 100644 --- a/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c +++ b/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c @@ -514,7 +514,7 @@ lim_process_assoc_rsp_frame(struct mac_context *mac_ctx, } pe_debug("received Re/Assoc: %d resp on sessionid: %d systemrole: %d" - " and mlmstate: %d RSSI: %d from "MAC_ADDRESS_STR, subtype, + " and mlmstate: %d RSSI: %d from "QDF_MAC_ADDR_STR, subtype, session_entry->peSessionId, GET_LIM_SYSTEM_ROLE(session_entry), session_entry->limMlmState, (uint) abs((int8_t) WMA_GET_RX_RSSI_NORMALIZED(rx_pkt_info)), @@ -573,7 +573,7 @@ lim_process_assoc_rsp_frame(struct mac_context *mac_ctx, * other than one to which request was initiated. * Ignore this and wait until Assoc Failure Timeout */ - pe_warn("received AssocRsp from unexpected peer "MAC_ADDRESS_STR, + pe_warn("received AssocRsp from unexpected peer "QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(hdr->sa)); qdf_mem_free(beacon); return; @@ -587,7 +587,7 @@ lim_process_assoc_rsp_frame(struct mac_context *mac_ctx, * other than one to which request was initiated. * Ignore this and wait until Reassoc Failure Timeout. */ - pe_warn("received ReassocRsp from unexpected peer "MAC_ADDRESS_STR, + pe_warn("received ReassocRsp from unexpected peer "QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(hdr->sa)); qdf_mem_free(beacon); return; @@ -938,7 +938,7 @@ lim_process_assoc_rsp_frame(struct mac_context *mac_ctx, qdf_mem_free(beacon); return; } - pe_debug("Successfully Associated with BSS " MAC_ADDRESS_STR, + pe_debug("Successfully Associated with BSS " QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(hdr->sa)); #ifdef FEATURE_WLAN_ESE if (session_entry->eseContext.tsm.tsmInfo.state) @@ -1042,7 +1042,7 @@ assocReject: && (session_entry->limMlmState == eLIM_MLM_WT_FT_REASSOC_RSP_STATE))) { pe_err("Assoc Rejected by the peer mlmestate: %d sessionid: %d Reason: %d MACADDR:" - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, session_entry->limMlmState, session_entry->peSessionId, assoc_cnf.resultCode, QDF_MAC_ADDR_ARRAY(hdr->sa)); diff --git a/core/mac/src/pe/lim/lim_process_auth_frame.c b/core/mac/src/pe/lim/lim_process_auth_frame.c index 594e7db3519c..e3e28b7aaeda 100644 --- a/core/mac/src/pe/lim/lim_process_auth_frame.c +++ b/core/mac/src/pe/lim/lim_process_auth_frame.c @@ -151,7 +151,7 @@ static void lim_process_auth_shared_system_algo(struct mac_context *mac_ctx, cfg_privacy_opt_imp = (uint8_t) val; if (!cfg_privacy_opt_imp) { pe_err("rx Auth frame for unsupported auth algorithm %d " - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, rx_auth_frm_body->authAlgoNumber, QDF_MAC_ADDR_ARRAY(mac_hdr->sa)); @@ -442,7 +442,7 @@ static void lim_process_auth_frame_type1(struct mac_context *mac_ctx, &pMlmDisassocReq->peer_macaddr.bytes, QDF_MAC_ADDR_SIZE))) { pe_debug("TODO:Ack for disassoc frame is pending Issue delsta for " - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY( pMlmDisassocReq->peer_macaddr.bytes)); lim_process_disassoc_ack_timeout(mac_ctx); @@ -455,7 +455,7 @@ static void lim_process_auth_frame_type1(struct mac_context *mac_ctx, &pMlmDeauthReq->peer_macaddr.bytes, QDF_MAC_ADDR_SIZE))) { pe_debug("TODO:Ack for deauth frame is pending Issue delsta for " - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY( pMlmDeauthReq->peer_macaddr.bytes)); lim_process_deauth_ack_timeout(mac_ctx); @@ -608,7 +608,7 @@ static void lim_process_auth_frame_type1(struct mac_context *mac_ctx, break; default: pe_err("rx Auth frm for unsupported auth algo %d " - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, rx_auth_frm_body->authAlgoNumber, QDF_MAC_ADDR_ARRAY(mac_hdr->sa)); @@ -632,7 +632,7 @@ static void lim_process_auth_frame_type1(struct mac_context *mac_ctx, } } else { pe_err("received Authentication frame for unsupported auth algorithm %d " - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, rx_auth_frm_body->authAlgoNumber, QDF_MAC_ADDR_ARRAY(mac_hdr->sa)); @@ -721,7 +721,7 @@ static void lim_process_auth_frame_type2(struct mac_context *mac_ctx, */ pe_warn("received Auth frame2 from unexpected peer" - MAC_ADDRESS_STR, QDF_MAC_ADDR_ARRAY(mac_hdr->sa)); + QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(mac_hdr->sa)); return; } @@ -760,7 +760,7 @@ static void lim_process_auth_frame_type2(struct mac_context *mac_ctx, */ pe_warn("rx Auth frame2 for unexpected auth algo %d" - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, rx_auth_frm_body->authAlgoNumber, QDF_MAC_ADDR_ARRAY(mac_hdr->sa)); return; @@ -773,7 +773,7 @@ static void lim_process_auth_frame_type2(struct mac_context *mac_ctx, * Return Auth confirm with received failure code to SME */ pe_err("rx Auth frame from peer with failure code %d " - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, rx_auth_frm_body->authStatusCode, QDF_MAC_ADDR_ARRAY(mac_hdr->sa)); lim_restore_from_auth_state(mac_ctx, eSIR_SME_AUTH_REFUSED, @@ -829,7 +829,7 @@ static void lim_process_auth_frame_type2(struct mac_context *mac_ctx, */ pe_err("rx Auth frm from peer for unsupported auth algo %d " - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, rx_auth_frm_body->authAlgoNumber, QDF_MAC_ADDR_ARRAY(mac_hdr->sa)); @@ -933,7 +933,7 @@ static void lim_process_auth_frame_type3(struct mac_context *mac_ctx, /* AuthFrame 3 */ if (rx_auth_frm_body->authAlgoNumber != eSIR_SHARED_KEY) { pe_err("rx Auth frame3 from peer with auth algo number %d " - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, rx_auth_frm_body->authAlgoNumber, QDF_MAC_ADDR_ARRAY(mac_hdr->sa)); /* @@ -960,7 +960,7 @@ static void lim_process_auth_frame_type3(struct mac_context *mac_ctx, */ if (!mac_hdr->fc.wep) { pe_err("received Auth frame3 from peer with no WEP bit set " - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(mac_hdr->sa)); /* WEP bit is not set in FC of Auth Frame3 */ auth_frame->authAlgoNumber = eSIR_SHARED_KEY; @@ -978,7 +978,7 @@ static void lim_process_auth_frame_type3(struct mac_context *mac_ctx, auth_node = lim_search_pre_auth_list(mac_ctx, mac_hdr->sa); if (!auth_node) { pe_warn("received AuthFrame3 from peer that has no preauth context " - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(mac_hdr->sa)); /* * No 'pre-auth' context exists for this STA that sent @@ -998,7 +998,7 @@ static void lim_process_auth_frame_type3(struct mac_context *mac_ctx, if (auth_node->mlmState == eLIM_MLM_AUTH_RSP_TIMEOUT_STATE) { pe_warn("auth response timer timedout for peer " - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(mac_hdr->sa)); /* * Received Auth Frame3 after Auth Response timeout. @@ -1026,7 +1026,7 @@ static void lim_process_auth_frame_type3(struct mac_context *mac_ctx, * to delete STA context. */ pe_err("rx Auth frm3 from peer with status code %d " - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, rx_auth_frm_body->authStatusCode, QDF_MAC_ADDR_ARRAY(mac_hdr->sa)); return; @@ -1061,7 +1061,7 @@ static void lim_process_auth_frame_type3(struct mac_context *mac_ctx, pe_session); return; } else { - pe_warn("Challenge failure for peer "MAC_ADDRESS_STR, + pe_warn("Challenge failure for peer "QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(mac_hdr->sa)); /* * Challenge Failure. @@ -1096,7 +1096,7 @@ static void lim_process_auth_frame_type4(struct mac_context *mac_ctx, * Log error and ignore the frame. */ pe_warn("received unexpected Auth frame4 from peer in state %d, addr " - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, pe_session->limMlmState, QDF_MAC_ADDR_ARRAY(mac_hdr->sa)); return; @@ -1110,7 +1110,7 @@ static void lim_process_auth_frame_type4(struct mac_context *mac_ctx, * failure to SME. */ pe_err("received Auth frame4 from peer with invalid auth algo %d" - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, rx_auth_frm_body->authAlgoNumber, QDF_MAC_ADDR_ARRAY(mac_hdr->sa)); return; @@ -1125,7 +1125,7 @@ static void lim_process_auth_frame_type4(struct mac_context *mac_ctx, * Wait until Authentication Failure Timeout. */ - pe_warn("received Auth frame4 from unexpected peer "MAC_ADDRESS_STR, + pe_warn("received Auth frame4 from unexpected peer "QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(mac_hdr->sa)); return; } @@ -1139,7 +1139,7 @@ static void lim_process_auth_frame_type4(struct mac_context *mac_ctx, */ pe_err("received Authentication frame from peer with invalid auth seq number %d " - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, rx_auth_frm_body->authTransactionSeqNumber, QDF_MAC_ADDR_ARRAY(mac_hdr->sa)); return; @@ -1175,7 +1175,7 @@ static void lim_process_auth_frame_type4(struct mac_context *mac_ctx, * Authentication failure. * Return Auth confirm with received failure code to SME */ - pe_err("Authentication failure from peer "MAC_ADDRESS_STR, + pe_err("Authentication failure from peer "QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(mac_hdr->sa)); lim_restore_from_auth_state(mac_ctx, eSIR_SME_AUTH_REFUSED, rx_auth_frm_body->authStatusCode, @@ -1256,7 +1256,7 @@ lim_process_auth_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_info, curr_seq_num = (mac_hdr->seqControl.seqNumHi << 4) | (mac_hdr->seqControl.seqNumLo); - pe_debug("Sessionid: %d System role: %d limMlmState: %d: Auth response Received BSSID: "MAC_ADDRESS_STR" RSSI: %d", + pe_debug("Sessionid: %d System role: %d limMlmState: %d: Auth response Received BSSID: "QDF_MAC_ADDR_STR" RSSI: %d", pe_session->peSessionId, GET_LIM_SYSTEM_ROLE(pe_session), pe_session->limMlmState, QDF_MAC_ADDR_ARRAY(mac_hdr->bssId), (uint) abs((int8_t) WMA_GET_RX_RSSI_NORMALIZED(rx_pkt_info))); @@ -1378,7 +1378,7 @@ lim_process_auth_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_info, if (!cfg_privacy_opt_imp) { pe_err("received Authentication frame3 from peer that while privacy option is turned OFF " - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(mac_hdr->sa)); /* * Privacy option is not implemented. @@ -1407,7 +1407,7 @@ lim_process_auth_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_info, auth_node = lim_search_pre_auth_list(mac_ctx, mac_hdr->sa); if (!auth_node) { pe_err("rx Auth frame with no preauth ctx with WEP bit set " - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(mac_hdr->sa)); /* * No 'pre-auth' context exists for this STA @@ -1434,7 +1434,7 @@ lim_process_auth_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_info, (auth_node->mlmState != eLIM_MLM_AUTH_RSP_TIMEOUT_STATE)) { pe_err("received Authentication frame from peer that is in state %d " - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, auth_node->mlmState, QDF_MAC_ADDR_ARRAY(mac_hdr->sa)); /* @@ -1495,7 +1495,7 @@ lim_process_auth_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_info, SIR_MAC_WEP_IV_LENGTH)); if (decrypt_result == LIM_DECRYPT_ICV_FAIL) { pe_err("received Authentication frame from peer that failed decryption: " - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(mac_hdr->sa)); /* ICV failure */ lim_delete_pre_auth_node(mac_ctx, mac_hdr->sa); @@ -1629,7 +1629,7 @@ QDF_STATUS lim_process_auth_frame_no_session(struct mac_context *mac, uint8_t *p pBody = WMA_GET_RX_MPDU_DATA(pBd); frameLen = WMA_GET_RX_PAYLOAD_LEN(pBd); - pe_debug("Auth Frame Received: BSSID " MAC_ADDRESS_STR " (RSSI %d)", + pe_debug("Auth Frame Received: BSSID " QDF_MAC_ADDR_STR " (RSSI %d)", QDF_MAC_ADDR_ARRAY(pHdr->bssId), (uint) abs((int8_t) WMA_GET_RX_RSSI_NORMALIZED(pBd))); diff --git a/core/mac/src/pe/lim/lim_process_deauth_frame.c b/core/mac/src/pe/lim/lim_process_deauth_frame.c index 633323167730..6da9fb758cf3 100644 --- a/core/mac/src/pe/lim/lim_process_deauth_frame.c +++ b/core/mac/src/pe/lim/lim_process_deauth_frame.c @@ -147,10 +147,10 @@ lim_process_deauth_frame(struct mac_context *mac, uint8_t *pRxPacketInfo, /* Get reasonCode from Deauthentication frame body */ reasonCode = sir_read_u16(pBody); - pe_debug("Received Deauth frame for Addr: " MAC_ADDRESS_STR + pe_debug("Received Deauth frame for Addr: " QDF_MAC_ADDR_STR "(mlm state = %s, sme state = %d systemrole = %d " "RSSI = %d) with reason code %d [%s] from " - MAC_ADDRESS_STR, QDF_MAC_ADDR_ARRAY(pHdr->da), + QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(pHdr->da), lim_mlm_state_str(pe_session->limMlmState), pe_session->limSmeState, GET_LIM_SYSTEM_ROLE(pe_session), frame_rssi, @@ -188,7 +188,7 @@ lim_process_deauth_frame(struct mac_context *mac, uint8_t *pRxPacketInfo, /* Invalid reasonCode in received Deauthentication frame */ /* Log error and ignore the frame */ pe_err("received Deauth frame with invalid reasonCode %d from " - MAC_ADDRESS_STR, reasonCode, + QDF_MAC_ADDR_STR, reasonCode, QDF_MAC_ADDR_ARRAY(pHdr->sa)); break; @@ -208,7 +208,7 @@ lim_process_deauth_frame(struct mac_context *mac, uint8_t *pRxPacketInfo, /* Invalid reasonCode in received Deauth frame */ /* Log error and ignore the frame */ pe_err("received Deauth frame with invalid reasonCode %d from " - MAC_ADDRESS_STR, reasonCode, + QDF_MAC_ADDR_STR, reasonCode, QDF_MAC_ADDR_ARRAY(pHdr->sa)); break; @@ -217,7 +217,7 @@ lim_process_deauth_frame(struct mac_context *mac, uint8_t *pRxPacketInfo, /* Received Deauth frame in either IBSS */ /* or un-known role. Log and ignore it */ pe_err("received Deauth frame with reasonCode %d in role %d from " - MAC_ADDRESS_STR, reasonCode, + QDF_MAC_ADDR_STR, reasonCode, GET_LIM_SYSTEM_ROLE(pe_session), QDF_MAC_ADDR_ARRAY(pHdr->sa)); @@ -272,8 +272,8 @@ lim_process_deauth_frame(struct mac_context *mac, uint8_t *pRxPacketInfo, } if (!IS_REASSOC_BSSID(mac, pHdr->sa, pe_session)) { pe_debug("Rcv Deauth from unknown/different " - "AP while ReAssoc. Ignore " MAC_ADDRESS_STR - "limReAssocbssId : " MAC_ADDRESS_STR, + "AP while ReAssoc. Ignore " QDF_MAC_ADDR_STR + "limReAssocbssId : " QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(pHdr->sa), QDF_MAC_ADDR_ARRAY(pe_session->limReAssocbssId)); return; @@ -284,8 +284,8 @@ lim_process_deauth_frame(struct mac_context *mac, uint8_t *pRxPacketInfo, */ if (!IS_CURRENT_BSSID(mac, pHdr->sa, pe_session)) { pe_debug("received DeAuth from the New AP to " - "which ReAssoc is sent " MAC_ADDRESS_STR - "pe_session->bssId: " MAC_ADDRESS_STR, + "which ReAssoc is sent " QDF_MAC_ADDR_STR + "pe_session->bssId: " QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(pHdr->sa), QDF_MAC_ADDR_ARRAY(pe_session->bssId)); @@ -304,7 +304,7 @@ lim_process_deauth_frame(struct mac_context *mac, uint8_t *pRxPacketInfo, if (!IS_CURRENT_BSSID(mac, pHdr->bssId, pe_session)) { pe_err("received DeAuth from an AP other " "than we're trying to join. Ignore. " - MAC_ADDRESS_STR, QDF_MAC_ADDR_ARRAY(pHdr->sa)); + QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(pHdr->sa)); if (lim_search_pre_auth_list(mac, pHdr->sa)) { pe_debug("Preauth entry exist. Deleting"); @@ -346,7 +346,7 @@ void lim_perform_deauth(struct mac_context *mac_ctx, struct pe_session *pe_sessi */ pe_debug("received Deauth frame state %X with failure " - "code %d from " MAC_ADDRESS_STR, + "code %d from " QDF_MAC_ADDR_STR, pe_session->limMlmState, rc, QDF_MAC_ADDR_ARRAY(addr)); @@ -358,7 +358,7 @@ void lim_perform_deauth(struct mac_context *mac_ctx, struct pe_session *pe_sessi case eLIM_MLM_AUTHENTICATED_STATE: pe_debug("received Deauth frame state %X with " - "reasonCode=%d from " MAC_ADDRESS_STR, + "reasonCode=%d from " QDF_MAC_ADDR_STR, pe_session->limMlmState, rc, QDF_MAC_ADDR_ARRAY(addr)); /* / Issue Deauth Indication to SME. */ @@ -384,7 +384,7 @@ void lim_perform_deauth(struct mac_context *mac_ctx, struct pe_session *pe_sessi * if any and issue ASSOC_CNF to SME. */ pe_debug("received Deauth frame state %X with " - "reasonCode=%d from " MAC_ADDRESS_STR, + "reasonCode=%d from " QDF_MAC_ADDR_STR, pe_session->limMlmState, rc, QDF_MAC_ADDR_ARRAY(addr)); if (lim_search_pre_auth_list(mac_ctx, addr)) @@ -421,7 +421,7 @@ void lim_perform_deauth(struct mac_context *mac_ctx, struct pe_session *pe_sessi case eLIM_MLM_WT_ADD_STA_RSP_STATE: pe_session->fDeauthReceived = true; pe_debug("Received Deauth frame in state %X with Reason " - "Code %d from Peer" MAC_ADDRESS_STR, + "Code %d from Peer" QDF_MAC_ADDR_STR, pe_session->limMlmState, rc, QDF_MAC_ADDR_ARRAY(addr)); return; @@ -433,7 +433,7 @@ void lim_perform_deauth(struct mac_context *mac_ctx, struct pe_session *pe_sessi && (STA_ENTRY_TDLS_PEER == sta_ds->staType)) { pe_err("received Deauth frame in state %X with " "reason code %d from Tdls peer" - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, pe_session->limMlmState, rc, QDF_MAC_ADDR_ARRAY(addr)); lim_send_sme_tdls_del_sta_ind(mac_ctx, sta_ds, @@ -463,21 +463,21 @@ void lim_perform_deauth(struct mac_context *mac_ctx, struct pe_session *pe_sessi case eLIM_MLM_WT_REASSOC_RSP_STATE: pe_err("received Deauth frame state %X with " - "reasonCode=%d from " MAC_ADDRESS_STR, + "reasonCode=%d from " QDF_MAC_ADDR_STR, pe_session->limMlmState, rc, QDF_MAC_ADDR_ARRAY(addr)); break; case eLIM_MLM_WT_FT_REASSOC_RSP_STATE: pe_err("received Deauth frame in FT state %X with " - "reasonCode=%d from " MAC_ADDRESS_STR, + "reasonCode=%d from " QDF_MAC_ADDR_STR, pe_session->limMlmState, rc, QDF_MAC_ADDR_ARRAY(addr)); break; default: pe_err("received Deauth frame in state %X with " - "reasonCode=%d from " MAC_ADDRESS_STR, + "reasonCode=%d from " QDF_MAC_ADDR_STR, pe_session->limMlmState, rc, QDF_MAC_ADDR_ARRAY(addr)); return; diff --git a/core/mac/src/pe/lim/lim_process_disassoc_frame.c b/core/mac/src/pe/lim/lim_process_disassoc_frame.c index af6c285e7ba0..5ecf2f9fb93e 100644 --- a/core/mac/src/pe/lim/lim_process_disassoc_frame.c +++ b/core/mac/src/pe/lim/lim_process_disassoc_frame.c @@ -146,9 +146,9 @@ lim_process_disassoc_frame(struct mac_context *mac, uint8_t *pRxPacketInfo, /* Get reasonCode from Disassociation frame body */ reasonCode = sir_read_u16(pBody); - pe_debug("Received Disassoc frame for Addr: " MAC_ADDRESS_STR + pe_debug("Received Disassoc frame for Addr: " QDF_MAC_ADDR_STR "(mlm state=%s, sme state=%d RSSI=%d)," - "with reason code %d [%s] from " MAC_ADDRESS_STR, + "with reason code %d [%s] from " QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(pHdr->da), lim_mlm_state_str(pe_session->limMlmState), pe_session->limSmeState, frame_rssi, reasonCode, @@ -179,7 +179,7 @@ lim_process_disassoc_frame(struct mac_context *mac, uint8_t *pRxPacketInfo, * Log error. */ pe_err("received Disassoc frame from STA that does not have context" - "reasonCode=%d, addr " MAC_ADDRESS_STR, + "reasonCode=%d, addr " QDF_MAC_ADDR_STR, reasonCode, QDF_MAC_ADDR_ARRAY(pHdr->sa)); return; } @@ -245,7 +245,7 @@ lim_process_disassoc_frame(struct mac_context *mac, uint8_t *pRxPacketInfo, default: /* Invalid reasonCode in received Disassociation frame */ - pe_warn("received Disassoc frame with invalid reasonCode: %d from " MAC_ADDRESS_STR, + pe_warn("received Disassoc frame with invalid reasonCode: %d from " QDF_MAC_ADDR_STR, reasonCode, QDF_MAC_ADDR_ARRAY(pHdr->sa)); break; } @@ -261,7 +261,7 @@ lim_process_disassoc_frame(struct mac_context *mac, uint8_t *pRxPacketInfo, /* as long as we're not about to channel switch */ if (pe_session->gLimChannelSwitch.state != eLIM_CHANNEL_SWITCH_IDLE) { - pe_err("Ignoring disassoc frame due to upcoming channel switch, from "MAC_ADDRESS_STR, + pe_err("Ignoring disassoc frame due to upcoming channel switch, from "QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(pHdr->sa)); return; } @@ -274,7 +274,7 @@ lim_process_disassoc_frame(struct mac_context *mac, uint8_t *pRxPacketInfo, /* Received Disassociation frame in either IBSS */ /* or un-known role. Log and ignore it */ pe_err("received Disassoc frame with invalid reasonCode: %d in role:" - "%d in sme state: %d from " MAC_ADDRESS_STR, reasonCode, + "%d in sme state: %d from " QDF_MAC_ADDR_STR, reasonCode, GET_LIM_SYSTEM_ROLE(pe_session), pe_session->limSmeState, QDF_MAC_ADDR_ARRAY(pHdr->sa)); @@ -304,7 +304,7 @@ lim_process_disassoc_frame(struct mac_context *mac, uint8_t *pRxPacketInfo, eLIM_MLM_WT_ASSOC_CNF_STATE) sta->mlmStaContext.updateContext = 1; - pe_err("received Disassoc frame from peer that is in state: %X, addr "MAC_ADDRESS_STR, + pe_err("received Disassoc frame from peer that is in state: %X, addr "QDF_MAC_ADDR_STR, sta->mlmStaContext.mlmState, QDF_MAC_ADDR_ARRAY(pHdr->sa)); diff --git a/core/mac/src/pe/lim/lim_process_message_queue.c b/core/mac/src/pe/lim/lim_process_message_queue.c index 53677f589a2a..4dad389cf303 100644 --- a/core/mac/src/pe/lim/lim_process_message_queue.c +++ b/core/mac/src/pe/lim/lim_process_message_queue.c @@ -1754,7 +1754,7 @@ static void lim_process_messages(struct mac_context *mac_ctx, msg->bodyptr, sizeof(tSirP2PNoaAttr)); pe_debug("bssId" - MAC_ADDRESS_STR + QDF_MAC_ADDR_STR " ctWin=%d oppPsFlag=%d", QDF_MAC_ADDR_ARRAY( session_entry->bssId), diff --git a/core/mac/src/pe/lim/lim_process_mlm_host_roam.c b/core/mac/src/pe/lim/lim_process_mlm_host_roam.c index 9439116a26c1..a372ac7a6daf 100644 --- a/core/mac/src/pe/lim/lim_process_mlm_host_roam.c +++ b/core/mac/src/pe/lim/lim_process_mlm_host_roam.c @@ -72,7 +72,7 @@ void lim_process_mlm_reassoc_req(struct mac_context *mac_ctx, return; } - pe_debug("ReAssoc Req on session: %d role: %d mlm: %d " MAC_ADDRESS_STR, + pe_debug("ReAssoc Req on session: %d role: %d mlm: %d " QDF_MAC_ADDR_STR, reassoc_req->sessionId, GET_LIM_SYSTEM_ROLE(session), session->limMlmState, QDF_MAC_ADDR_ARRAY(reassoc_req->peerMacAddr)); @@ -86,7 +86,7 @@ void lim_process_mlm_reassoc_req(struct mac_context *mac_ctx, * parameters code. */ - pe_warn("unexpect msg state: %X role: %d MAC" MAC_ADDRESS_STR, + pe_warn("unexpect msg state: %X role: %d MAC" QDF_MAC_ADDR_STR, session->limMlmState, GET_LIM_SYSTEM_ROLE(session), QDF_MAC_ADDR_ARRAY(reassoc_req->peerMacAddr)); lim_print_mlm_state(mac_ctx, LOGW, session->limMlmState); diff --git a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c index 0a569320135b..171aa8414cba 100644 --- a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c +++ b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c @@ -891,7 +891,7 @@ static QDF_STATUS lim_process_mlm_auth_req_sae(struct mac_context *mac_ctx, session->ssId.ssId, session->ssId.length); - pe_debug("vdev_id %d ssid %.*s "MAC_ADDRESS_STR"", + pe_debug("vdev_id %d ssid %.*s "QDF_MAC_ADDR_STR, sae_info->vdev_id, sae_info->ssid.length, sae_info->ssid.ssId, @@ -970,7 +970,7 @@ static void lim_process_mlm_auth_req(struct mac_context *mac_ctx, uint32_t *msg) } pe_debug("Process Auth Req sessionID %d Systemrole %d" - "mlmstate %d from: " MAC_ADDRESS_STR + "mlmstate %d from: " QDF_MAC_ADDR_STR " with authtype %d", session_id, GET_LIM_SYSTEM_ROLE(session), session->limMlmState, QDF_MAC_ADDR_ARRAY(mac_ctx->lim.gpLimMlmAuthReq->peerMacAddr), @@ -996,7 +996,7 @@ static void lim_process_mlm_auth_req(struct mac_context *mac_ctx, uint32_t *msg) */ if (lim_is_preauth_ctx_exists(mac_ctx, session, &preauth_node)) { pe_debug("Already have pre-auth context with peer: " - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(mac_ctx->lim.gpLimMlmAuthReq->peerMacAddr)); mlm_auth_cnf.resultCode = (tSirResultCodes) eSIR_MAC_SUCCESS_STATUS; @@ -1154,7 +1154,7 @@ static void lim_process_mlm_assoc_req(struct mac_context *mac_ctx, uint32_t *msg * Return Assoc confirm with Invalid parameters code. */ pe_warn("received unexpected MLM_ASSOC_CNF in state %X for role=%d, MAC addr= " - MAC_ADDRESS_STR, session_entry->limMlmState, + QDF_MAC_ADDR_STR, session_entry->limMlmState, GET_LIM_SYSTEM_ROLE(session_entry), QDF_MAC_ADDR_ARRAY(mlm_assoc_req->peerMacAddr)); lim_print_mlm_state(mac_ctx, LOGW, session_entry->limMlmState); @@ -1252,7 +1252,7 @@ lim_process_mlm_disassoc_req_ntf(struct mac_context *mac_ctx, } pe_debug("Process DisAssoc Req on sessionID %d Systemrole %d" - "mlmstate %d from: " MAC_ADDRESS_STR, + "mlmstate %d from: " QDF_MAC_ADDR_STR, mlm_disassocreq->sessionId, GET_LIM_SYSTEM_ROLE(session), session->limMlmState, QDF_MAC_ADDR_ARRAY(mlm_disassocreq->peer_macaddr.bytes)); @@ -1278,7 +1278,7 @@ lim_process_mlm_disassoc_req_ntf(struct mac_context *mac_ctx, return; } - pe_debug("send disassoc rsp with ret code %d for" MAC_ADDRESS_STR, + pe_debug("send disassoc rsp with ret code %d for" QDF_MAC_ADDR_STR, eSIR_SME_DEAUTH_STATUS, QDF_MAC_ADDR_ARRAY( mlm_disassocreq->peer_macaddr.bytes)); @@ -1334,7 +1334,7 @@ lim_process_mlm_disassoc_req_ntf(struct mac_context *mac_ctx, * Received LIM_MLM_DISASSOC_REQ for STA that does not * have context or in some transit state. */ - pe_warn("Invalid MLM_DISASSOC_REQ, Addr= " MAC_ADDRESS_STR, + pe_warn("Invalid MLM_DISASSOC_REQ, Addr= " QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(mlm_disassocreq->peer_macaddr.bytes)); if (stads) pe_err("Sta MlmState: %d", stads->mlmStaContext.mlmState); @@ -1541,7 +1541,7 @@ lim_process_mlm_disassoc_req(struct mac_context *mac_ctx, uint32_t *msg_buf) } mlm_disassoc_req = (tLimMlmDisassocReq *) msg_buf; - pe_debug("Process disassoc req, sessionID %d from: "MAC_ADDRESS_STR, + pe_debug("Process disassoc req, sessionID %d from: "QDF_MAC_ADDR_STR, mlm_disassoc_req->sessionId, QDF_MAC_ADDR_ARRAY(mlm_disassoc_req->peer_macaddr.bytes)); @@ -1588,7 +1588,7 @@ lim_process_mlm_deauth_req_ntf(struct mac_context *mac_ctx, return; } pe_debug("Process Deauth Req on sessionID %d Systemrole %d" - "mlmstate %d from: " MAC_ADDRESS_STR, + "mlmstate %d from: " QDF_MAC_ADDR_STR, mlm_deauth_req->sessionId, GET_LIM_SYSTEM_ROLE(session), session->limMlmState, @@ -1611,8 +1611,8 @@ lim_process_mlm_deauth_req_ntf(struct mac_context *mac_ctx, if (qdf_mem_cmp(mlm_deauth_req->peer_macaddr.bytes, curr_bssId, QDF_MAC_ADDR_SIZE)) { pe_err("received MLM_DEAUTH_REQ with invalid BSS id " - "Peer MAC: "MAC_ADDRESS_STR - " CFG BSSID Addr : "MAC_ADDRESS_STR, + "Peer MAC: "QDF_MAC_ADDR_STR + " CFG BSSID Addr : "QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY( mlm_deauth_req->peer_macaddr.bytes), QDF_MAC_ADDR_ARRAY(curr_bssId)); @@ -1627,7 +1627,7 @@ lim_process_mlm_deauth_req_ntf(struct mac_context *mac_ctx, return; } - pe_debug("send deauth rsp with ret code %d for" MAC_ADDRESS_STR, + pe_debug("send deauth rsp with ret code %d for" QDF_MAC_ADDR_STR, eSIR_SME_DEAUTH_STATUS, QDF_MAC_ADDR_ARRAY( mlm_deauth_req->peer_macaddr.bytes)); @@ -1673,7 +1673,7 @@ lim_process_mlm_deauth_req_ntf(struct mac_context *mac_ctx, break; default: pe_warn("received MLM_DEAUTH_REQ with in state %d for peer " - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, session->limMlmState, QDF_MAC_ADDR_ARRAY( mlm_deauth_req->peer_macaddr.bytes)); @@ -1724,7 +1724,7 @@ lim_process_mlm_deauth_req_ntf(struct mac_context *mac_ctx, */ pe_warn("received MLM_DEAUTH_REQ in mlme state %d for STA that " "does not have context, Addr=" - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, session->limMlmState, QDF_MAC_ADDR_ARRAY( mlm_deauth_req->peer_macaddr.bytes)); @@ -1750,7 +1750,7 @@ lim_process_mlm_deauth_req_ntf(struct mac_context *mac_ctx, * received MLM_DEAUTH_REQ for STA that either has no context or * in some transit state */ - pe_warn("Invalid MLM_DEAUTH_REQ, Addr="MAC_ADDRESS_STR, + pe_warn("Invalid MLM_DEAUTH_REQ, Addr="QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(mlm_deauth_req->peer_macaddr.bytes)); /* Prepare and Send LIM_MLM_DEAUTH_CNF */ mlm_deauth_cnf.resultCode = eSIR_SME_INVALID_PARAMETERS; @@ -1833,7 +1833,7 @@ void lim_process_mlm_deauth_req(struct mac_context *mac_ctx, uint32_t *msg_buf) mlm_deauth_req = (tLimMlmDeauthReq *) msg_buf; pe_debug("Process Deauth Req on sessionID %d from: " - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, mlm_deauth_req->sessionId, QDF_MAC_ADDR_ARRAY(mlm_deauth_req->peer_macaddr.bytes)); @@ -1917,7 +1917,7 @@ lim_process_mlm_set_keys_req(struct mac_context *mac_ctx, uint32_t *msg_buf) (!qdf_is_macaddr_equal(&mlm_set_keys_req->peer_macaddr, &curr_bssid))) { pe_debug("Received MLM_SETKEYS_REQ with invalid BSSID" - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(mlm_set_keys_req-> peer_macaddr.bytes)); /* @@ -1985,7 +1985,7 @@ lim_process_mlm_set_keys_req(struct mac_context *mac_ctx, uint32_t *msg_buf) * have context or in some transit state. */ pe_debug("Invalid MLM_SETKEYS_REQ, Addr = " - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(mlm_set_keys_req-> peer_macaddr.bytes)); /* Prepare and Send LIM_MLM_SETKEYS_CNF */ @@ -2079,7 +2079,7 @@ void lim_process_join_failure_timeout(struct mac_context *mac_ctx) eLIM_PERIODIC_JOIN_PROBE_REQ_TIMER); /* Issue MLM join confirm with timeout reason code */ pe_err("Join Failure Timeout, In eLIM_MLM_WT_JOIN_BEACON_STATE session:%d " - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, session->peSessionId, QDF_MAC_ADDR_ARRAY(session->bssId)); @@ -2319,13 +2319,13 @@ lim_process_auth_rsp_timeout(struct mac_context *mac_ctx, uint32_t auth_idx) if (LIM_IS_AP_ROLE(session) || LIM_IS_IBSS_ROLE(session)) { if (auth_node->mlmState != eLIM_MLM_WT_AUTH_FRAME3_STATE) { pe_err("received AUTH rsp timeout in unexpected " - "state for MAC address: " MAC_ADDRESS_STR, + "state for MAC address: " QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(auth_node->peerMacAddr)); } else { auth_node->mlmState = eLIM_MLM_AUTH_RSP_TIMEOUT_STATE; auth_node->fTimerStarted = 0; pe_debug("AUTH rsp timedout for MAC address " - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(auth_node->peerMacAddr)); /* Change timer to reactivate it in future */ lim_deactivate_and_change_per_sta_id_timer(mac_ctx, @@ -2383,7 +2383,7 @@ void lim_process_assoc_failure_timeout(struct mac_context *mac_ctx, * By sending deauth try to clear the session created on peer device. */ pe_debug("Sessionid: %d try sending deauth on channel %d to BSSID: " - MAC_ADDRESS_STR, session->peSessionId, + QDF_MAC_ADDR_STR, session->peSessionId, session->currentOperChannel, QDF_MAC_ADDR_ARRAY(session->bssId)); lim_send_deauth_mgmt_frame(mac_ctx, eSIR_MAC_UNSPEC_FAILURE_REASON, @@ -2422,7 +2422,7 @@ void lim_process_assoc_failure_timeout(struct mac_context *mac_ctx, } /* To remove the preauth node in case of fail to associate */ if (lim_search_pre_auth_list(mac_ctx, session->bssId)) { - pe_debug("delete pre auth node for "MAC_ADDRESS_STR, + pe_debug("delete pre auth node for "QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(session->bssId)); lim_delete_pre_auth_node(mac_ctx, session->bssId); diff --git a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c index 2b36331728c2..e49303f09554 100644 --- a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c +++ b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c @@ -996,7 +996,7 @@ static void lim_process_mlm_deauth_ind(struct mac_context *mac_ctx, deauth_ind->peerMacAddr, &session_id); if (!session) { - pe_err("session does not exist for Addr:" MAC_ADDRESS_STR, + pe_err("session does not exist for Addr:" QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(deauth_ind->peerMacAddr)); return; } @@ -3144,7 +3144,7 @@ static void lim_process_switch_channel_join_req( mac_ctx->lim.gLimHeartBeatApMac[apCount], sizeof(tSirMacAddr))) { pe_err("Index %d Sessionid: %d Send deauth on " - "channel %d to BSSID: "MAC_ADDRESS_STR, apCount, + "channel %d to BSSID: "QDF_MAC_ADDR_STR, apCount, session_entry->peSessionId, session_entry->currentOperChannel, QDF_MAC_ADDR_ARRAY(session_entry->pLimMlmJoinReq->bssDescription. bssId)); @@ -3187,7 +3187,7 @@ static void lim_process_switch_channel_join_req( mac_ctx->lim.limTimers.gLimPeriodicJoinProbeReqTimer.sessionId = session_entry->peSessionId; pe_debug("Sessionid: %d Send Probe req on channel %d ssid:%.*s " - "BSSID: " MAC_ADDRESS_STR, session_entry->peSessionId, + "BSSID: " QDF_MAC_ADDR_STR, session_entry->peSessionId, session_entry->currentOperChannel, ssId.length, ssId.ssId, QDF_MAC_ADDR_ARRAY( session_entry->pLimMlmJoinReq->bssDescription.bssId)); diff --git a/core/mac/src/pe/lim/lim_process_probe_req_frame.c b/core/mac/src/pe/lim/lim_process_probe_req_frame.c index ecac1021897d..2dbe756fa016 100644 --- a/core/mac/src/pe/lim/lim_process_probe_req_frame.c +++ b/core/mac/src/pe/lim/lim_process_probe_req_frame.c @@ -283,7 +283,7 @@ lim_process_probe_req_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_info, if (sir_convert_probe_req_frame2_struct(mac_ctx, body_ptr, frame_len, &probe_req) == QDF_STATUS_E_FAILURE) { pe_err("Parse error ProbeReq, length: %d, SA is: " - MAC_ADDRESS_STR, frame_len, + QDF_MAC_ADDR_STR, frame_len, QDF_MAC_ADDR_ARRAY(mac_hdr->sa)); return; } diff --git a/core/mac/src/pe/lim/lim_process_probe_rsp_frame.c b/core/mac/src/pe/lim/lim_process_probe_rsp_frame.c index f6adcd47a2c2..5610bbcc7097 100644 --- a/core/mac/src/pe/lim/lim_process_probe_rsp_frame.c +++ b/core/mac/src/pe/lim/lim_process_probe_rsp_frame.c @@ -127,7 +127,7 @@ lim_process_probe_rsp_frame(struct mac_context *mac_ctx, uint8_t *rx_Packet_info header = WMA_GET_RX_MAC_HEADER(rx_Packet_info); - pe_debug("Rx Probe Response with length = %d from "MAC_ADDRESS_STR, + pe_debug("Rx Probe Response with length = %d from "QDF_MAC_ADDR_STR, WMA_GET_RX_MPDU_LEN(rx_Packet_info), QDF_MAC_ADDR_ARRAY(header->sa)); @@ -143,7 +143,7 @@ lim_process_probe_rsp_frame(struct mac_context *mac_ctx, uint8_t *rx_Packet_info frame_len = WMA_GET_RX_PAYLOAD_LEN(rx_Packet_info); QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG, FL("Probe Resp Frame Received: BSSID " - MAC_ADDRESS_STR " (RSSI %d)"), + QDF_MAC_ADDR_STR " (RSSI %d)"), QDF_MAC_ADDR_ARRAY(header->bssId), (uint) abs((int8_t)WMA_GET_RX_RSSI_NORMALIZED(rx_Packet_info))); /* Get pointer to Probe Response frame body */ diff --git a/core/mac/src/pe/lim/lim_process_sme_req_messages.c b/core/mac/src/pe/lim/lim_process_sme_req_messages.c index 43acba5d1997..07aef4f77ee5 100644 --- a/core/mac/src/pe/lim/lim_process_sme_req_messages.c +++ b/core/mac/src/pe/lim/lim_process_sme_req_messages.c @@ -1025,7 +1025,7 @@ static void lim_update_sae_config(struct pe_session *session, { session->sae_pmk_cached = sme_join_req->sae_pmk_cached; - pe_debug("pmk_cached %d for BSSID=" MAC_ADDRESS_STR, + pe_debug("pmk_cached %d for BSSID=" QDF_MAC_ADDR_STR, session->sae_pmk_cached, QDF_MAC_ADDR_ARRAY(sme_join_req->bssDescription.bssId)); } @@ -1296,7 +1296,7 @@ __lim_process_sme_join_req(struct mac_context *mac_ctx, void *msg_buf) if (session) { pe_err("Session(%d) Already exists for BSSID: " - MAC_ADDRESS_STR " in limSmeState = %X", + QDF_MAC_ADDR_STR " in limSmeState = %X", session_id, QDF_MAC_ADDR_ARRAY(bss_desc->bssId), session->limSmeState); @@ -2065,14 +2065,14 @@ static void __lim_process_sme_disassoc_req(struct mac_context *mac, &sessionId); if (!pe_session) { pe_err("session does not exist for given bssId " - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(smeDisassocReq.bssid.bytes)); retCode = eSIR_SME_INVALID_PARAMETERS; disassocTrigger = eLIM_HOST_DISASSOC; goto sendDisassoc; } pe_debug("received DISASSOC_REQ message on sessionid %d Systemrole %d Reason: %u SmeState: %d from: " - MAC_ADDRESS_STR, smesessionId, + QDF_MAC_ADDR_STR, smesessionId, GET_LIM_SYSTEM_ROLE(pe_session), smeDisassocReq.reasonCode, mac->lim.gLimSmeState, QDF_MAC_ADDR_ARRAY(smeDisassocReq.peer_macaddr.bytes)); @@ -2336,7 +2336,7 @@ void __lim_process_sme_disassoc_cnf(struct mac_context *mac, uint32_t *pMsgBuf) &pe_session->dph.dphHashTable); if (!sta) { pe_err("DISASSOC_CNF for a STA with no context, addr= " - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(smeDisassocCnf.peer_macaddr.bytes)); status = lim_prepare_disconnect_done_ind(mac, &msg, pe_session->smeSessionId, @@ -2353,7 +2353,7 @@ void __lim_process_sme_disassoc_cnf(struct mac_context *mac, uint32_t *pMsgBuf) eLIM_MLM_WT_DEL_STA_RSP_STATE) || (sta->mlmStaContext.mlmState == eLIM_MLM_WT_DEL_BSS_RSP_STATE)) { - pe_err("No need of cleanup for addr:" MAC_ADDRESS_STR "as MLM state is %d", + pe_err("No need of cleanup for addr:" QDF_MAC_ADDR_STR "as MLM state is %d", QDF_MAC_ADDR_ARRAY(smeDisassocCnf.peer_macaddr.bytes), sta->mlmStaContext.mlmState); status = lim_prepare_disconnect_done_ind(mac, &msg, @@ -2427,7 +2427,7 @@ static void __lim_process_sme_deauth_req(struct mac_context *mac_ctx, goto send_deauth; } pe_debug("received DEAUTH_REQ sessionid %d Systemrole %d reasoncode %u limSmestate %d from " - MAC_ADDRESS_STR, sme_session_id, + QDF_MAC_ADDR_STR, sme_session_id, GET_LIM_SYSTEM_ROLE(session_entry), sme_deauth_req.reasonCode, session_entry->limSmeState, QDF_MAC_ADDR_ARRAY(sme_deauth_req.peer_macaddr.bytes)); @@ -3333,7 +3333,7 @@ static void __lim_process_sme_delts_req(struct mac_context *mac, uint32_t *pMsgB } pe_debug("Sent DELTS request to station with assocId = %d MacAddr = " - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, pDeltsReq->aid, QDF_MAC_ADDR_ARRAY(peerMacAddr)); lim_send_delts_req_action_frame(mac, peerMacAddr, @@ -4267,12 +4267,12 @@ static void __lim_process_send_disassoc_frame(struct mac_context *mac_ctx, req->session_id); if (!session_entry) { pe_err("session does not exist for given bssId " - MAC_ADDRESS_STR, QDF_MAC_ADDR_ARRAY(req->peer_mac)); + QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(req->peer_mac)); return; } pe_debug("msg_type->%d len->%d sess_id->%d mac->" - MAC_ADDRESS_STR " reason->%d wait_for_ack->%d", + QDF_MAC_ADDR_STR " reason->%d wait_for_ack->%d", req->msg_type, req->length, req->session_id, QDF_MAC_ADDR_ARRAY(req->peer_mac), req->reason, req->wait_for_ack); @@ -5379,7 +5379,7 @@ static void lim_process_modify_add_ies(struct mac_context *mac_ctx, if (!session_entry) { pe_err("Session not found for given bssid" - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(modify_add_ies->modifyIE.bssid.bytes)); goto end; } @@ -5470,7 +5470,7 @@ static void lim_process_update_add_ies(struct mac_context *mac_ctx, if (!session_entry) { pe_debug("Session not found for given bssid" - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(update_ie->bssid.bytes)); goto end; } @@ -5700,7 +5700,7 @@ static void lim_process_sme_dfs_csa_ie_request(struct mac_context *mac_ctx, session_entry = pe_find_session_by_bssid(mac_ctx, dfs_csa_ie_req->bssid, &session_id); if (!session_entry) { - pe_err("Session not found for given BSSID" MAC_ADDRESS_STR, + pe_err("Session not found for given BSSID" QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(dfs_csa_ie_req->bssid)); return; } diff --git a/core/mac/src/pe/lim/lim_process_tdls.c b/core/mac/src/pe/lim/lim_process_tdls.c index 6355ae14df9d..918029805022 100644 --- a/core/mac/src/pe/lim/lim_process_tdls.c +++ b/core/mac/src/pe/lim/lim_process_tdls.c @@ -423,8 +423,8 @@ static uint32_t lim_prepare_tdls_frame_header(struct mac_context *mac, uint8_t * (uint8_t *) (addr3), sizeof(tSirMacAddr)); pe_debug("Preparing TDLS frame header to %s A1:" - MAC_ADDRESS_STR", A2:"MAC_ADDRESS_STR", A3:" - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR", A2:"QDF_MAC_ADDR_STR", A3:" + QDF_MAC_ADDR_STR, (tdlsLinkType == TDLS_LINK_AP) ? "AP" : "DIRECT", QDF_MAC_ADDR_ARRAY(pMacHdr->addr1), QDF_MAC_ADDR_ARRAY(pMacHdr->addr2), @@ -635,7 +635,7 @@ static QDF_STATUS lim_send_tdls_dis_req_frame(struct mac_context *mac, } #endif - pe_debug("[TDLS] action: %d (%s) -AP-> OTA peer="MAC_ADDRESS_STR, + pe_debug("[TDLS] action: %d (%s) -AP-> OTA peer="QDF_MAC_ADDR_STR, SIR_MAC_TDLS_DIS_REQ, lim_trace_tdls_action_string(SIR_MAC_TDLS_DIS_REQ), QDF_MAC_ADDR_ARRAY(peer_mac.bytes)); @@ -938,7 +938,7 @@ static QDF_STATUS lim_send_tdls_dis_rsp_frame(struct mac_context *mac, qdf_mem_copy(pFrame + sizeof(tSirMacMgmtHdr) + nPayload, addIe, addIeLen); } - pe_debug("[TDLS] action: %d (%s) -DIRECT-> OTA peer="MAC_ADDRESS_STR, + pe_debug("[TDLS] action: %d (%s) -DIRECT-> OTA peer="QDF_MAC_ADDR_STR, SIR_MAC_TDLS_DIS_RSP, lim_trace_tdls_action_string(SIR_MAC_TDLS_DIS_RSP), QDF_MAC_ADDR_ARRAY(peer_mac.bytes)); @@ -1002,7 +1002,7 @@ static void populate_dotf_tdls_vht_aid(struct mac_context *mac, uint32_t selfDot } else { Aid->present = 0; pe_err("sta is NULL for " - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(peerMac.bytes)); } } @@ -1312,7 +1312,7 @@ QDF_STATUS lim_send_tdls_link_setup_req_frame(struct mac_context *mac, addIeLen); } - pe_debug("[TDLS] action: %d (%s) -AP-> OTA peer="MAC_ADDRESS_STR, + pe_debug("[TDLS] action: %d (%s) -AP-> OTA peer="QDF_MAC_ADDR_STR, SIR_MAC_TDLS_SETUP_REQ, lim_trace_tdls_action_string(SIR_MAC_TDLS_SETUP_REQ), QDF_MAC_ADDR_ARRAY(peer_mac.bytes)); @@ -1503,7 +1503,7 @@ QDF_STATUS lim_send_tdls_teardown_frame(struct mac_context *mac, padLen - MIN_VENDOR_SPECIFIC_IE_SIZE); } #endif - pe_debug("[TDLS] action: %d (%s) -%s-> OTA peer="MAC_ADDRESS_STR, + pe_debug("[TDLS] action: %d (%s) -%s-> OTA peer="QDF_MAC_ADDR_STR, SIR_MAC_TDLS_TEARDOWN, lim_trace_tdls_action_string(SIR_MAC_TDLS_TEARDOWN), ((reason == eSIR_MAC_TDLS_TEARDOWN_PEER_UNREACHABLE) ? "AP" : @@ -1764,7 +1764,7 @@ static QDF_STATUS lim_send_tdls_setup_rsp_frame(struct mac_context *mac, addIeLen); } - pe_debug("[TDLS] action: %d (%s) -AP-> OTA peer="MAC_ADDRESS_STR, + pe_debug("[TDLS] action: %d (%s) -AP-> OTA peer="QDF_MAC_ADDR_STR, SIR_MAC_TDLS_SETUP_RSP, lim_trace_tdls_action_string(SIR_MAC_TDLS_SETUP_RSP), QDF_MAC_ADDR_ARRAY(peer_mac.bytes)); @@ -1971,7 +1971,7 @@ QDF_STATUS lim_send_tdls_link_setup_cnf_frame(struct mac_context *mac, } #endif - pe_debug("[TDLS] action: %d (%s) -AP-> OTA peer="MAC_ADDRESS_STR, + pe_debug("[TDLS] action: %d (%s) -AP-> OTA peer="QDF_MAC_ADDR_STR, SIR_MAC_TDLS_SETUP_CNF, lim_trace_tdls_action_string(SIR_MAC_TDLS_SETUP_CNF), QDF_MAC_ADDR_ARRAY(peer_mac.bytes)); @@ -2554,13 +2554,13 @@ static QDF_STATUS lim_tdls_setup_add_sta(struct mac_context *mac, &pe_session->dph.dphHashTable); if (sta && pAddStaReq->tdls_oper == TDLS_OPER_ADD) { - pe_err("TDLS entry for peer: "MAC_ADDRESS_STR " already exist, cannot add new entry", + pe_err("TDLS entry for peer: "QDF_MAC_ADDR_STR " already exist, cannot add new entry", QDF_MAC_ADDR_ARRAY(pAddStaReq->peermac.bytes)); return QDF_STATUS_E_FAILURE; } if (sta && sta->staType != STA_ENTRY_TDLS_PEER) { - pe_err("Non TDLS entry for peer: "MAC_ADDRESS_STR " already exist", + pe_err("Non TDLS entry for peer: "QDF_MAC_ADDR_STR " already exist", QDF_MAC_ADDR_ARRAY(pAddStaReq->peermac.bytes)); return QDF_STATUS_E_FAILURE; } @@ -2569,7 +2569,7 @@ static QDF_STATUS lim_tdls_setup_add_sta(struct mac_context *mac, aid = lim_assign_peer_idx(mac, pe_session); if (!aid) { - pe_err("No more free AID for peer: "MAC_ADDRESS_STR, + pe_err("No more free AID for peer: "QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(pAddStaReq->peermac.bytes)); return QDF_STATUS_E_FAILURE; } @@ -2577,7 +2577,7 @@ static QDF_STATUS lim_tdls_setup_add_sta(struct mac_context *mac, /* Set the aid in peerAIDBitmap as it has been assigned to TDLS peer */ SET_PEER_AID_BITMAP(pe_session->peerAIDBitmap, aid); - pe_debug("Aid: %d, for peer: " MAC_ADDRESS_STR, + pe_debug("Aid: %d, for peer: " QDF_MAC_ADDR_STR, aid, QDF_MAC_ADDR_ARRAY(pAddStaReq->peermac.bytes)); sta = dph_get_hash_entry(mac, aid, @@ -2632,7 +2632,7 @@ static QDF_STATUS lim_tdls_del_sta(struct mac_context *mac, &pe_session->dph.dphHashTable); if (sta) { - pe_debug("DEL STA peer MAC: "MAC_ADDRESS_STR, + pe_debug("DEL STA peer MAC: "QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(sta->staAddr)); pe_debug("STA type: %x, sta idx: %x resp_reqd: %d", @@ -2642,7 +2642,7 @@ static QDF_STATUS lim_tdls_del_sta(struct mac_context *mac, status = lim_del_sta(mac, sta, resp_reqd, pe_session); } else { - pe_debug("DEL STA peer MAC: "MAC_ADDRESS_STR" not found", + pe_debug("DEL STA peer MAC: "QDF_MAC_ADDR_STR" not found", QDF_MAC_ADDR_ARRAY(peerMac.bytes)); } @@ -2709,7 +2709,7 @@ QDF_STATUS lim_process_tdls_add_sta_rsp(struct mac_context *mac, void *msg, uint16_t aid = 0; SET_LIM_PROCESS_DEFD_MESGS(mac, true); - pe_debug("staIdx: %d, staMac: "MAC_ADDRESS_STR, + pe_debug("staIdx: %d, staMac: "QDF_MAC_ADDR_STR, pAddStaParams->staIdx, QDF_MAC_ADDR_ARRAY(pAddStaParams->staMac)); @@ -3110,7 +3110,7 @@ static void lim_check_aid_and_delete_peer(struct mac_context *p_mac, if (!stads) goto skip; - pe_debug("Deleting "MAC_ADDRESS_STR, + pe_debug("Deleting "QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(stads->staAddr)); if (!lim_is_roam_synch_in_progress(session_entry)) { @@ -3125,7 +3125,7 @@ static void lim_check_aid_and_delete_peer(struct mac_context *p_mac, status = lim_tdls_del_sta(p_mac, mac_addr, session_entry, false); if (status != QDF_STATUS_SUCCESS) - pe_debug("peer "MAC_ADDRESS_STR" not found", + pe_debug("peer "QDF_MAC_ADDR_STR" not found", QDF_MAC_ADDR_ARRAY(stads->staAddr)); } diff --git a/core/mac/src/pe/lim/lim_scan_result_utils.c b/core/mac/src/pe/lim/lim_scan_result_utils.c index 9af426bd23de..0193fa2d071e 100644 --- a/core/mac/src/pe/lim/lim_scan_result_utils.c +++ b/core/mac/src/pe/lim/lim_scan_result_utils.c @@ -115,7 +115,7 @@ lim_collect_bss_description(struct mac_context *mac, if (!pBssDescr->beaconInterval) { pe_warn("Beacon Interval is ZERO, making it to default 100 " - MAC_ADDRESS_STR, QDF_MAC_ADDR_ARRAY(pHdr->bssId)); + QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(pHdr->bssId)); pBssDescr->beaconInterval = 100; } /* @@ -147,7 +147,7 @@ lim_collect_bss_description(struct mac_context *mac, /* SINR no longer reported by HW */ pBssDescr->sinr = 0; - pe_debug(MAC_ADDRESS_STR " rssi: normalized: %d, absolute: %d", + pe_debug(QDF_MAC_ADDR_STR " rssi: normalized: %d, absolute: %d", QDF_MAC_ADDR_ARRAY(pHdr->bssId), pBssDescr->rssi, pBssDescr->rssi_raw); diff --git a/core/mac/src/pe/lim/lim_send_management_frames.c b/core/mac/src/pe/lim/lim_send_management_frames.c index 4fe354c4925c..7e55067287fc 100644 --- a/core/mac/src/pe/lim/lim_send_management_frames.c +++ b/core/mac/src/pe/lim/lim_send_management_frames.c @@ -2244,7 +2244,7 @@ lim_send_auth_mgmt_frame(struct mac_context *mac_ctx, * status code, 128 bytes for challenge text and * 4 bytes each for IV & ICV. */ - pe_debug("Sending encrypted auth frame to " MAC_ADDRESS_STR, + pe_debug("Sending encrypted auth frame to " QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(peer_addr)); body_len = wep_challenge_len + LIM_ENCR_AUTH_INFO_LEN; @@ -2254,7 +2254,7 @@ lim_send_auth_mgmt_frame(struct mac_context *mac_ctx, } pe_debug("Sending Auth seq# %d status %d (%d) to " - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, auth_frame->authTransactionSeqNumber, auth_frame->authStatusCode, (auth_frame->authStatusCode == eSIR_MAC_SUCCESS_STATUS), @@ -2393,7 +2393,7 @@ alloc_packet: if (wep_challenge_len) { qdf_mem_copy(body, (uint8_t *) auth_frame, body_len); - pe_debug("Sending Auth seq# 3 to " MAC_ADDRESS_STR, + pe_debug("Sending Auth seq# 3 to " QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(mac_hdr->da)); } else { @@ -2480,7 +2480,7 @@ alloc_packet: } pe_debug("*** Sending Auth seq# %d status %d (%d) to " - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, auth_frame->authTransactionSeqNumber, auth_frame->authStatusCode, (auth_frame->authStatusCode == @@ -2890,8 +2890,8 @@ lim_send_disassoc_mgmt_frame(struct mac_context *mac, } pe_debug("***Sessionid %d Sending Disassociation frame with " - "reason %u and waitForAck %d to " MAC_ADDRESS_STR " ,From " - MAC_ADDRESS_STR, pe_session->peSessionId, nReason, + "reason %u and waitForAck %d to " QDF_MAC_ADDR_STR " ,From " + QDF_MAC_ADDR_STR, pe_session->peSessionId, nReason, waitForAck, QDF_MAC_ADDR_ARRAY(pMacHdr->da), QDF_MAC_ADDR_ARRAY(pe_session->selfMacAddr)); @@ -3065,8 +3065,8 @@ lim_send_deauth_mgmt_frame(struct mac_context *mac, nStatus); } pe_debug("***Sessionid %d Sending Deauth frame with " - "reason %u and waitForAck %d to " MAC_ADDRESS_STR - " ,From " MAC_ADDRESS_STR, + "reason %u and waitForAck %d to " QDF_MAC_ADDR_STR + " ,From " QDF_MAC_ADDR_STR, pe_session->peSessionId, nReason, waitForAck, QDF_MAC_ADDR_ARRAY(pMacHdr->da), QDF_MAC_ADDR_ARRAY(pe_session->selfMacAddr)); @@ -3652,7 +3652,7 @@ lim_send_extended_chan_switch_action_frame(struct mac_context *mac_ctx, txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME; } - pe_debug("Send Ext channel Switch to :"MAC_ADDRESS_STR" with swcount %d, swmode %d , newchannel %d newops %d", + pe_debug("Send Ext channel Switch to :"QDF_MAC_ADDR_STR" with swcount %d, swmode %d , newchannel %d newops %d", QDF_MAC_ADDR_ARRAY(mac_hdr->da), frm.ext_chan_switch_ann_action.switch_count, frm.ext_chan_switch_ann_action.switch_mode, @@ -3806,7 +3806,7 @@ lim_p2p_oper_chan_change_confirm_action_frame(struct mac_context *mac_ctx, tx_flag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME; } pe_debug("Send frame on channel %d to mac " - MAC_ADDRESS_STR, session_entry->currentOperChannel, + QDF_MAC_ADDR_STR, session_entry->currentOperChannel, QDF_MAC_ADDR_ARRAY(peer)); MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, diff --git a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c index 4c91a7286cb4..377691017219 100644 --- a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c +++ b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c @@ -658,7 +658,7 @@ void lim_send_sme_disassoc_ntf(struct mac_context *mac, * Duplicate entry is removed at LIM. * Initiate new entry for other session */ - pe_debug("Rcvd eLIM_DUPLICATE_ENTRY for " MAC_ADDRESS_STR, + pe_debug("Rcvd eLIM_DUPLICATE_ENTRY for " QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(peerMacAddr)); for (i = 0; i < mac->lim.maxBssId; i++) { @@ -705,7 +705,7 @@ void lim_send_sme_disassoc_ntf(struct mac_context *mac, goto error; } pe_debug("send eWNI_SME_DISASSOC_RSP with retCode: %d for " - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, reasonCode, QDF_MAC_ADDR_ARRAY(peerMacAddr)); pSirSmeDisassocRsp->messageType = eWNI_SME_DISASSOC_RSP; pSirSmeDisassocRsp->length = sizeof(struct disassoc_rsp); @@ -746,7 +746,7 @@ void lim_send_sme_disassoc_ntf(struct mac_context *mac, goto error; } pe_debug("send eWNI_SME_DISASSOC_IND with retCode: %d for " - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, reasonCode, QDF_MAC_ADDR_ARRAY(peerMacAddr)); pSirSmeDisassocInd->messageType = eWNI_SME_DISASSOC_IND; pSirSmeDisassocInd->length = sizeof(*pSirSmeDisassocInd); @@ -918,7 +918,7 @@ lim_send_sme_tdls_del_sta_ind(struct mac_context *mac, tpDphHashNode sta, { struct tdls_event_info info; - pe_debug("Delete TDLS Peer "MAC_ADDRESS_STR "with reason code: %d", + pe_debug("Delete TDLS Peer "QDF_MAC_ADDR_STR "with reason code: %d", QDF_MAC_ADDR_ARRAY(sta->staAddr), reasonCode); info.vdev_id = pe_session->smeSessionId; qdf_mem_copy(info.peermac.bytes, sta->staAddr, QDF_MAC_ADDR_SIZE); @@ -1045,7 +1045,7 @@ void lim_send_sme_deauth_ntf(struct mac_context *mac, tSirMacAddr peerMacAddr, if (!pSirSmeDeauthRsp) return; pe_debug("send eWNI_SME_DEAUTH_RSP with retCode: %d for " - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, reasonCode, QDF_MAC_ADDR_ARRAY(peerMacAddr)); pSirSmeDeauthRsp->messageType = eWNI_SME_DEAUTH_RSP; pSirSmeDeauthRsp->length = sizeof(*pSirSmeDeauthRsp); @@ -1083,7 +1083,7 @@ void lim_send_sme_deauth_ntf(struct mac_context *mac, tSirMacAddr peerMacAddr, if (!pSirSmeDeauthInd) return; pe_debug("send eWNI_SME_DEAUTH_IND with retCode: %d for " - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, reasonCode, QDF_MAC_ADDR_ARRAY(peerMacAddr)); pSirSmeDeauthInd->messageType = eWNI_SME_DEAUTH_IND; pSirSmeDeauthInd->length = sizeof(*pSirSmeDeauthInd); @@ -1960,7 +1960,7 @@ void lim_send_sme_max_assoc_exceeded_ntf(struct mac_context *mac, tSirMacAddr pe pSmeMaxAssocInd->sessionId = smesessionId; mmhMsg.type = pSmeMaxAssocInd->mesgType; mmhMsg.bodyptr = pSmeMaxAssocInd; - pe_debug("msgType: %s peerMacAddr "MAC_ADDRESS_STR "sme session id %d", + pe_debug("msgType: %s peerMacAddr "QDF_MAC_ADDR_STR "sme session id %d", "eWNI_SME_MAX_ASSOC_EXCEEDED", QDF_MAC_ADDR_ARRAY(peerMacAddr), pSmeMaxAssocInd->sessionId); MTRACE(mac_trace(mac, TRACE_CODE_TX_SME_MSG, diff --git a/core/mac/src/pe/lim/lim_session.c b/core/mac/src/pe/lim/lim_session.c index 4976c54844fe..35d594efec20 100644 --- a/core/mac/src/pe/lim/lim_session.c +++ b/core/mac/src/pe/lim/lim_session.c @@ -442,7 +442,7 @@ void lim_set_bcn_probe_filter(struct mac_context *mac_ctx, if (eSIR_INFRASTRUCTURE_MODE == bss_type) { filter->num_sta_sessions++; sir_copy_mac_addr(filter->sta_bssid[session_id], *bssid); - pe_debug("Set filter for STA Session %d bssid "MAC_ADDRESS_STR, + pe_debug("Set filter for STA Session %d bssid "QDF_MAC_ADDR_STR, session_id, QDF_MAC_ADDR_ARRAY(*bssid)); } else if (eSIR_IBSS_MODE == bss_type) { if (!ibss_ssid) { @@ -639,7 +639,7 @@ struct pe_session *pe_create_session(struct mac_context *mac, session_ptr->is_session_obss_color_collision_det_enabled = mac->mlme_cfg->obss_ht40.obss_color_collision_offload_enabled; - pe_debug("Create a new PE session: %d BSSID: "MAC_ADDRESS_STR" Max No of STA: %d", + pe_debug("Create a new PE session: %d BSSID: "QDF_MAC_ADDR_STR" Max No of STA: %d", *sessionId, QDF_MAC_ADDR_ARRAY(bssid), numSta); if (eSIR_INFRA_AP_MODE == bssType || eSIR_IBSS_MODE == bssType) { @@ -876,7 +876,7 @@ void pe_delete_session(struct mac_context *mac_ctx, struct pe_session *session) return; } - pe_debug("Trying to delete PE session: %d Opmode: %d BssIdx: %d BSSID: "MAC_ADDRESS_STR, + pe_debug("Trying to delete PE session: %d Opmode: %d BssIdx: %d BSSID: "QDF_MAC_ADDR_STR, session->peSessionId, session->operMode, session->bssIdx, QDF_MAC_ADDR_ARRAY(session->bssId)); diff --git a/core/mac/src/pe/lim/lim_utils.c b/core/mac/src/pe/lim/lim_utils.c index 7c9376546050..ace152adf075 100644 --- a/core/mac/src/pe/lim/lim_utils.c +++ b/core/mac/src/pe/lim/lim_utils.c @@ -636,7 +636,7 @@ void lim_cleanup_mlm(struct mac_context *mac_ctx) void lim_print_mac_addr(struct mac_context *mac, tSirMacAddr macAddr, uint8_t logLevel) { - pe_debug(MAC_ADDRESS_STR, QDF_MAC_ADDR_ARRAY(macAddr)); + pe_debug(QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(macAddr)); } /****** end lim_print_mac_addr() ******/ /* @@ -6612,7 +6612,7 @@ bool lim_is_valid_frame(last_processed_msg *last_processed_frm, if (last_processed_frm->seq_num == seq_num && qdf_mem_cmp(last_processed_frm->sa, pHdr->sa, ETH_ALEN) == 0) { - pe_err("Duplicate frame from "MAC_ADDRESS_STR " Seq Number %d", + pe_err("Duplicate frame from "QDF_MAC_ADDR_STR " Seq Number %d", QDF_MAC_ADDR_ARRAY(pHdr->sa), seq_num); return false; } @@ -7586,7 +7586,7 @@ struct csr_roam_session *lim_get_session_by_macaddr(struct mac_context *mac_ctx, QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO, FL("session %d exists with mac address " - MAC_ADDRESS_STR), session->sessionId, + QDF_MAC_ADDR_STR), session->sessionId, QDF_MAC_ADDR_ARRAY(self_mac)); return session; diff --git a/core/mac/src/pe/nan/nan_datapath.c b/core/mac/src/pe/nan/nan_datapath.c index b9f014efc46c..289c836fa776 100644 --- a/core/mac/src/pe/nan/nan_datapath.c +++ b/core/mac/src/pe/nan/nan_datapath.c @@ -72,7 +72,7 @@ static QDF_STATUS lim_add_ndi_peer(struct mac_context *mac_ctx, pe_err("NDI Peer already exists!!"); return QDF_STATUS_SUCCESS; } - pe_info("Need to create NDI Peer :" MAC_ADDRESS_STR, + pe_info("Need to create NDI Peer :" QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(peer_mac_addr.bytes)); peer_idx = lim_assign_peer_idx(mac_ctx, session); @@ -136,7 +136,7 @@ static void lim_ndp_delete_peer_by_addr(struct mac_context *mac_ctx, uint8_t vde return; } - pe_info("deleting peer: "MAC_ADDRESS_STR" confirm rejected", + pe_info("deleting peer: "QDF_MAC_ADDR_STR" confirm rejected", QDF_MAC_ADDR_ARRAY(peer_ndi_mac_addr.bytes)); session = pe_find_session_by_sme_session_id(mac_ctx, vdev_id); @@ -200,7 +200,7 @@ static void lim_ndp_delete_peers(struct mac_context *mac_ctx, return; for (i = 0; i < num_peers; i++) { - pe_info("ndp_map[%d]: MAC: " MAC_ADDRESS_STR " num_active %d", + pe_info("ndp_map[%d]: MAC: " QDF_MAC_ADDR_STR " num_active %d", i, QDF_MAC_ADDR_ARRAY(ndp_map[i].peer_ndi_mac_addr.bytes), ndp_map[i].num_active_ndp_sessions); @@ -305,7 +305,7 @@ void lim_process_ndi_del_sta_rsp(struct mac_context *mac_ctx, pe_err("DEL STA failed!"); goto skip_event; } - pe_info("Deleted STA AssocID %d staId %d MAC " MAC_ADDRESS_STR, + pe_info("Deleted STA AssocID %d staId %d MAC " QDF_MAC_ADDR_STR, sta_ds->assocId, sta_ds->staIndex, QDF_MAC_ADDR_ARRAY(sta_ds->staAddr)); @@ -508,7 +508,7 @@ void lim_ndp_add_sta_rsp(struct mac_context *mac_ctx, struct pe_session *session &session->dph.dphHashTable); if (!sta_ds) { pe_err("NAN: ADD_STA_RSP for unknown MAC addr " - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(add_sta_rsp->staMac)); qdf_mem_free(add_sta_rsp); return; diff --git a/core/mac/src/pe/sch/sch_beacon_process.c b/core/mac/src/pe/sch/sch_beacon_process.c index 2dab9780efc0..997a8c241a66 100644 --- a/core/mac/src/pe/sch/sch_beacon_process.c +++ b/core/mac/src/pe/sch/sch_beacon_process.c @@ -1501,7 +1501,7 @@ QDF_STATUS lim_process_obss_detection_ind(struct mac_context *mac_ctx, enum band_info rf_band = BAND_UNKNOWN; struct obss_detection_cfg *cur_detect; - pe_debug("obss detect ind id %d, reason %d, msk 0x%x, " MAC_ADDRESS_STR, + pe_debug("obss detect ind id %d, reason %d, msk 0x%x, " QDF_MAC_ADDR_STR, obss_detection->vdev_id, obss_detection->reason, obss_detection->matched_detection_masks, QDF_MAC_ADDR_ARRAY(obss_detection->matched_bssid_addr)); diff --git a/core/mac/src/sys/legacy/src/system/src/sys_entry_func.c b/core/mac/src/sys/legacy/src/system/src/sys_entry_func.c index 1c3f3f48bfe1..acff9e12003c 100644 --- a/core/mac/src/sys/legacy/src/system/src/sys_entry_func.c +++ b/core/mac/src/sys/legacy/src/system/src/sys_entry_func.c @@ -116,21 +116,21 @@ QDF_STATUS sys_bbt_process_message_core(struct mac_context *mac_ctx, mac_hdr = WMA_GET_RX_MAC_HEADER(bd_ptr); if (subtype == SIR_MAC_MGMT_ASSOC_REQ) { - pe_debug("ASSOC REQ frame allowed: da: " MAC_ADDRESS_STR ", sa: " MAC_ADDRESS_STR ", bssid: " MAC_ADDRESS_STR ", Assoc Req count so far: %d", + pe_debug("ASSOC REQ frame allowed: da: " QDF_MAC_ADDR_STR ", sa: " QDF_MAC_ADDR_STR ", bssid: " QDF_MAC_ADDR_STR ", Assoc Req count so far: %d", QDF_MAC_ADDR_ARRAY(mac_hdr->da), QDF_MAC_ADDR_ARRAY(mac_hdr->sa), QDF_MAC_ADDR_ARRAY(mac_hdr->bssId), mac_ctx->sys.gSysFrameCount[type][subtype]); } if (subtype == SIR_MAC_MGMT_DEAUTH) { - pe_debug("DEAUTH frame allowed: da: " MAC_ADDRESS_STR ", sa: " MAC_ADDRESS_STR ", bssid: " MAC_ADDRESS_STR ", DEAUTH count so far: %d", + pe_debug("DEAUTH frame allowed: da: " QDF_MAC_ADDR_STR ", sa: " QDF_MAC_ADDR_STR ", bssid: " QDF_MAC_ADDR_STR ", DEAUTH count so far: %d", QDF_MAC_ADDR_ARRAY(mac_hdr->da), QDF_MAC_ADDR_ARRAY(mac_hdr->sa), QDF_MAC_ADDR_ARRAY(mac_hdr->bssId), mac_ctx->sys.gSysFrameCount[type][subtype]); } if (subtype == SIR_MAC_MGMT_DISASSOC) { - pe_debug("DISASSOC frame allowed: da: " MAC_ADDRESS_STR ", sa: " MAC_ADDRESS_STR ", bssid: " MAC_ADDRESS_STR ", DISASSOC count so far: %d", + pe_debug("DISASSOC frame allowed: da: " QDF_MAC_ADDR_STR ", sa: " QDF_MAC_ADDR_STR ", bssid: " QDF_MAC_ADDR_STR ", DISASSOC count so far: %d", QDF_MAC_ADDR_ARRAY(mac_hdr->da), QDF_MAC_ADDR_ARRAY(mac_hdr->sa), QDF_MAC_ADDR_ARRAY(mac_hdr->bssId), diff --git a/core/sap/src/sap_api_link_cntl.c b/core/sap/src/sap_api_link_cntl.c index f60196bb4a7c..9a990c03e6ff 100644 --- a/core/sap/src/sap_api_link_cntl.c +++ b/core/sap/src/sap_api_link_cntl.c @@ -689,14 +689,14 @@ wlansap_roam_process_infra_assoc_ind(struct sap_context *sap_ctx, (void *) eSAP_STATUS_SUCCESS); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, - FL("CSR roam_result = (%d) MAC ("MAC_ADDRESS_STR") fail"), + FL("CSR roam_result = (%d) MAC ("QDF_MAC_ADDR_STR") fail"), roam_result, QDF_MAC_ADDR_ARRAY( csr_roam_info->peerMac.bytes)); *ret_status = QDF_STATUS_E_FAILURE; } } else { QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_WARN, - FL("CSR roam_result = (%d) MAC ("MAC_ADDRESS_STR") not allowed"), + FL("CSR roam_result = (%d) MAC ("QDF_MAC_ADDR_STR") not allowed"), roam_result, QDF_MAC_ADDR_ARRAY(csr_roam_info->peerMac.bytes)); *ret_status = QDF_STATUS_E_FAILURE; diff --git a/core/sap/src/sap_fsm.c b/core/sap/src/sap_fsm.c index 8ac3f009d7bb..6234b9a5e04d 100644 --- a/core/sap/src/sap_fsm.c +++ b/core/sap/src/sap_fsm.c @@ -3366,7 +3366,7 @@ void sap_print_acl(struct qdf_mac_addr *macList, uint8_t size) for (i = 0; i < size; i++) { macArray = (macList + i)->bytes; QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - "** ACL entry %i - " MAC_ADDRESS_STR, i, + "** ACL entry %i - " QDF_MAC_ADDR_STR, i, QDF_MAC_ADDR_ARRAY(macArray)); } return; @@ -3385,7 +3385,7 @@ QDF_STATUS sap_is_peer_mac_allowed(struct sap_context *sap_ctx, if (sap_search_mac_list (sap_ctx->denyMacList, sap_ctx->nDenyMac, peerMac, NULL)) { QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - "In %s, Peer " MAC_ADDRESS_STR " in deny list", + "In %s, Peer " QDF_MAC_ADDR_STR " in deny list", __func__, QDF_MAC_ADDR_ARRAY(peerMac)); return QDF_STATUS_E_FAILURE; } @@ -3396,7 +3396,7 @@ QDF_STATUS sap_is_peer_mac_allowed(struct sap_context *sap_ctx, /* A new station CANNOT associate, unless in accept list. More stringent mode */ if (eSAP_DENY_UNLESS_ACCEPTED == sap_ctx->eSapMacAddrAclMode) { QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - "In %s, Peer " MAC_ADDRESS_STR + "In %s, Peer " QDF_MAC_ADDR_STR " denied, Mac filter mode is eSAP_DENY_UNLESS_ACCEPTED", __func__, QDF_MAC_ADDR_ARRAY(peerMac)); return QDF_STATUS_E_FAILURE; @@ -3409,7 +3409,7 @@ QDF_STATUS sap_is_peer_mac_allowed(struct sap_context *sap_ctx, sap_signal_hdd_event(sap_ctx, NULL, eSAP_UNKNOWN_STA_JOIN, (void *) peerMac); QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - "In %s, Peer " MAC_ADDRESS_STR + "In %s, Peer " QDF_MAC_ADDR_STR " denied, Mac filter mode is eSAP_SUPPORT_ACCEPT_AND_DENY", __func__, QDF_MAC_ADDR_ARRAY(peerMac)); return QDF_STATUS_E_FAILURE; diff --git a/core/sap/src/sap_module.c b/core/sap/src/sap_module.c index 44c892ea26f5..d80b90933fd1 100644 --- a/core/sap/src/sap_module.c +++ b/core/sap/src/sap_module.c @@ -975,7 +975,7 @@ QDF_STATUS wlansap_modify_acl(struct sap_context *sap_ctx, if (qdf_mem_cmp(sap_ctx->bssid.bytes, peer_sta_mac, QDF_MAC_ADDR_SIZE) == 0) { QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, - "requested peer mac is" MAC_ADDRESS_STR + "requested peer mac is" QDF_MAC_ADDR_STR "our own SAP BSSID. Do not blacklist or whitelist this BSSID", QDF_MAC_ADDR_ARRAY(peer_sta_mac)); return QDF_STATUS_E_FAULT; @@ -1004,7 +1004,7 @@ QDF_STATUS wlansap_modify_acl(struct sap_context *sap_ctx, if (sta_white_list && sta_black_list) { QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, - "Peer mac " MAC_ADDRESS_STR + "Peer mac " QDF_MAC_ADDR_STR " found in white and black lists." "Initial lists passed incorrect. Cannot execute this command.", QDF_MAC_ADDR_ARRAY(peer_sta_mac)); @@ -1023,7 +1023,7 @@ QDF_STATUS wlansap_modify_acl(struct sap_context *sap_ctx, QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "White list is already maxed out. Cannot accept " - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(peer_sta_mac)); return QDF_STATUS_E_FAILURE; } @@ -1032,7 +1032,7 @@ QDF_STATUS wlansap_modify_acl(struct sap_context *sap_ctx, QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_WARN, "MAC address already present in white list " - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(peer_sta_mac)); return QDF_STATUS_SUCCESS; } @@ -1082,7 +1082,7 @@ QDF_STATUS wlansap_modify_acl(struct sap_context *sap_ctx, QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_WARN, "MAC address to be deleted is not present in the white list " - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(peer_sta_mac)); return QDF_STATUS_E_FAILURE; } @@ -1103,7 +1103,7 @@ QDF_STATUS wlansap_modify_acl(struct sap_context *sap_ctx, QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "Black list is already maxed out. Cannot accept " - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(peer_sta_mac)); return QDF_STATUS_E_FAILURE; } @@ -1112,7 +1112,7 @@ QDF_STATUS wlansap_modify_acl(struct sap_context *sap_ctx, QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_WARN, "MAC address already present in black list " - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(peer_sta_mac)); return QDF_STATUS_SUCCESS; } @@ -1158,7 +1158,7 @@ QDF_STATUS wlansap_modify_acl(struct sap_context *sap_ctx, QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_WARN, "MAC address to be deleted is not present in the black list " - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(peer_sta_mac)); return QDF_STATUS_E_FAILURE; } @@ -1598,7 +1598,7 @@ QDF_STATUS wlan_sap_getstation_ie_information(struct sap_context *sap_ctx, sap_ctx->pStaWpaRsnReqIE, sap_ctx->nStaWPARSnReqIeLength); QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, - FL("WPAIE: %02x:%02x:%02x:%02x:%02x:%02x"), + FL("WPAIE: "QDF_MAC_ADDR_STR""), buf[0], buf[1], buf[2], buf[3], buf[4], buf[5]); qdf_status = QDF_STATUS_SUCCESS; @@ -2362,7 +2362,7 @@ void wlansap_populate_del_sta_params(const uint8_t *mac, QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_DEBUG, FL("Delete STA with RC:%hu subtype:%hhu MAC::" - MAC_ADDRESS_STR), + QDF_MAC_ADDR_STR), params->reason_code, params->subtype, QDF_MAC_ADDR_ARRAY(params->peerMacAddr.bytes)); } diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c index 4384d9c7ff99..344e5278bb4f 100644 --- a/core/sme/src/common/sme_api.c +++ b/core/sme/src/common/sme_api.c @@ -11640,7 +11640,7 @@ int sme_send_he_om_ctrl_update(mac_handle_t mac_handle, uint8_t session_id) omi_data.ch_bw, omi_data.tx_nsts, omi_data.rx_nss, omi_data.ul_mu_dis, omi_data.omi_in_vht, omi_data.omi_in_he); qdf_mem_copy(¶m_val, &omi_data, sizeof(omi_data)); - sme_debug("param val %08X, bssid:"MAC_ADDRESS_STR, param_val, + sme_debug("param val %08X, bssid:"QDF_MAC_ADDR_STR, param_val, QDF_MAC_ADDR_ARRAY(session->connectedProfile.bssid.bytes)); status = wma_set_peer_param(wma_handle, session->connectedProfile.bssid.bytes, @@ -14468,7 +14468,7 @@ static bool sme_get_status_for_candidate(mac_handle_t mac_handle, */ if ((bss_desc->rssi < mbo_cfg->mbo_candidate_rssi_thres) && (conn_bss_desc->rssi > mbo_cfg->mbo_current_rssi_thres)) { - sme_err("Candidate BSS "MAC_ADDRESS_STR" has LOW RSSI(%d), hence reject", + sme_err("Candidate BSS "QDF_MAC_ADDR_STR" has LOW RSSI(%d), hence reject", QDF_MAC_ADDR_ARRAY(bss_desc->bssId), bss_desc->rssi); info->status = QCA_STATUS_REJECT_LOW_RSSI; return true; @@ -14486,7 +14486,7 @@ static bool sme_get_status_for_candidate(mac_handle_t mac_handle, current_rssi_mcc_thres = mbo_cfg->mbo_current_rssi_mcc_thres; if ((conn_bss_desc->rssi > current_rssi_mcc_thres) && csr_is_mcc_channel(mac_ctx, bss_desc->channelId)) { - sme_err("Candidate BSS "MAC_ADDRESS_STR" causes MCC, hence reject", + sme_err("Candidate BSS "QDF_MAC_ADDR_STR" causes MCC, hence reject", QDF_MAC_ADDR_ARRAY(bss_desc->bssId)); info->status = QCA_STATUS_REJECT_INSUFFICIENT_QOS_CAPACITY; @@ -14504,7 +14504,7 @@ static bool sme_get_status_for_candidate(mac_handle_t mac_handle, WLAN_REG_IS_24GHZ_CH(bss_desc->channelId) && is_bt_in_progress && (bss_desc->rssi < mbo_cfg->mbo_candidate_rssi_btc_thres)) { - sme_err("Candidate BSS "MAC_ADDRESS_STR" causes BT coex, hence reject", + sme_err("Candidate BSS "QDF_MAC_ADDR_STR" causes BT coex, hence reject", QDF_MAC_ADDR_ARRAY(bss_desc->bssId)); info->status = QCA_STATUS_REJECT_EXCESSIVE_DELAY_EXPECTED; @@ -14521,7 +14521,7 @@ static bool sme_get_status_for_candidate(mac_handle_t mac_handle, !(policy_mgr_is_safe_channel(mac_ctx->psoc, bss_desc->channelId))) { sme_err("High interference expected if transitioned to BSS " - MAC_ADDRESS_STR" hence reject", + QDF_MAC_ADDR_STR" hence reject", QDF_MAC_ADDR_ARRAY(bss_desc->bssId)); info->status = QCA_STATUS_REJECT_HIGH_INTERFERENCE; @@ -14573,7 +14573,7 @@ QDF_STATUS sme_get_bss_transition_status(mac_handle_t mac_handle, &info[i].bssid, res); if (!QDF_IS_STATUS_SUCCESS(status)) { - sme_err("BSS "MAC_ADDRESS_STR" not present in scan list", + sme_err("BSS "QDF_MAC_ADDR_STR" not present in scan list", QDF_MAC_ADDR_ARRAY(info[i].bssid.bytes)); info[i].status = QCA_STATUS_REJECT_UNKNOWN; continue; @@ -14741,7 +14741,7 @@ QDF_STATUS sme_handle_sae_msg(mac_handle_t mac_handle, peer_mac_addr.bytes, QDF_MAC_ADDR_SIZE); sme_debug("SAE: sae_status %d session_id %d Peer: " - MAC_ADDRESS_STR, sae_msg->sae_status, + QDF_MAC_ADDR_STR, sae_msg->sae_status, sae_msg->session_id, QDF_MAC_ADDR_ARRAY(sae_msg->peer_mac_addr)); diff --git a/core/sme/src/common/sme_ft_api.c b/core/sme/src/common/sme_ft_api.c index 877fbfddbbde..d93470c7a7ac 100644 --- a/core/sme/src/common/sme_ft_api.c +++ b/core/sme/src/common/sme_ft_api.c @@ -276,7 +276,7 @@ QDF_STATUS sme_ft_send_update_key_ind(struct mac_context *mac, uint32_t session_ qdf_copy_macaddr(&msg->bssid, &ftkey_info->peerMac); msg->smeSessionId = session_id; - sme_debug("BSSID = " MAC_ADDRESS_STR, + sme_debug("BSSID = " QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(msg->bssid.bytes)); status = umac_send_mb_message_to_mac(msg); diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index 13defcf374ac..a527b2f88a0c 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -171,7 +171,7 @@ static QDF_STATUS csr_sae_callback(struct mac_context *mac_ctx, return QDF_STATUS_E_FAILURE; } - sme_debug("vdev_id %d "MAC_ADDRESS_STR"", + sme_debug("vdev_id %d "QDF_MAC_ADDR_STR"", sae_info->vdev_id, QDF_MAC_ADDR_ARRAY(sae_info->peer_mac_addr.bytes)); @@ -1975,7 +1975,7 @@ static void csr_send_ese_adjacent_ap_rep_ind(struct mac_context *mac, return; roamTS2 = qdf_mc_timer_get_system_time(); roam_info->tsmRoamDelay = roamTS2 - pSession->roamTS1; - sme_debug("Bssid(" MAC_ADDRESS_STR ") Roaming Delay(%u ms)", + sme_debug("Bssid(" QDF_MAC_ADDR_STR ") Roaming Delay(%u ms)", QDF_MAC_ADDR_ARRAY(pSession->connectedProfile.bssid.bytes), roam_info->tsmRoamDelay); @@ -3643,7 +3643,7 @@ QDF_STATUS csr_roam_issue_disassociate(struct mac_context *mac, uint32_t session sizeof(struct qdf_mac_addr)); } - sme_debug("CSR Attempting to Disassociate Bssid=" MAC_ADDRESS_STR + sme_debug("CSR Attempting to Disassociate Bssid=" QDF_MAC_ADDR_STR " subState: %s reason: %d", QDF_MAC_ADDR_ARRAY(bssId.bytes), mac_trace_getcsr_roam_sub_state(NewSubstate), reasonCode); @@ -3769,7 +3769,7 @@ QDF_STATUS csr_roam_issue_deauth(struct mac_context *mac, uint32_t sessionId, qdf_mem_copy(bssId.bytes, pSession->pConnectBssDesc->bssId, sizeof(struct qdf_mac_addr)); } - sme_debug("CSR Attempting to Deauth Bssid= " MAC_ADDRESS_STR, + sme_debug("CSR Attempting to Deauth Bssid= " QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(bssId.bytes)); csr_roam_substate_change(mac, NewSubstate, sessionId); @@ -3780,7 +3780,7 @@ QDF_STATUS csr_roam_issue_deauth(struct mac_context *mac, uint32_t sessionId, csr_roam_link_down(mac, sessionId); else { sme_err("csr_send_mb_deauth_req_msg failed with status %d Session ID: %d" - MAC_ADDRESS_STR, status, sessionId, + QDF_MAC_ADDR_STR, status, sessionId, QDF_MAC_ADDR_ARRAY(bssId.bytes)); } @@ -7990,7 +7990,7 @@ static void csr_roam_print_candidate_aps(tScanResultHandle results) while (entry) { bss_desc = GET_BASE_ADDR(entry, struct tag_csrscan_result, Link); - sme_debug("BSSID" MAC_ADDRESS_STR "score is %d", + sme_debug("BSSID" QDF_MAC_ADDR_STR "score is %d", QDF_MAC_ADDR_ARRAY(bss_desc->Result.BssDescriptor.bssId), bss_desc->bss_score); @@ -8853,7 +8853,7 @@ static QDF_STATUS csr_roam_issue_join(struct mac_context *mac, uint32_t sessionI { QDF_STATUS status; - sme_debug("Attempting to Join Bssid= " MAC_ADDRESS_STR, + sme_debug("Attempting to Join Bssid= " QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(pSirBssDesc->bssId)); /* Set the roaming substate to 'join attempt'... */ @@ -9553,7 +9553,7 @@ void csr_handle_disassoc_ho(struct mac_context *mac, uint32_t session_id) } QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, "LFR2DBG: preauthed bss_node->pBssDescription BSSID"\ - MAC_ADDRESS_STR",Ch:%d", + QDF_MAC_ADDR_STR",Ch:%d", QDF_MAC_ADDR_ARRAY(bss_node->pBssDescription->bssId), (int)bss_node->pBssDescription->channelId); @@ -10932,7 +10932,7 @@ static QDF_STATUS csr_send_reset_ap_caps_changed(struct mac_context *mac, pMsg->length = len; qdf_copy_macaddr(&pMsg->bssId, bssId); sme_debug( - "CSR reset caps change for Bssid= " MAC_ADDRESS_STR, + "CSR reset caps change for Bssid= " QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(pMsg->bssId.bytes)); status = umac_send_mb_message_to_mac(pMsg); } else { @@ -11344,7 +11344,7 @@ csr_roam_chk_lnk_disassoc_ind(struct mac_context *mac_ctx, tSirSmeRsp *msg_ptr) status = csr_roam_get_session_id_from_bssid(mac_ctx, &pDisassocInd->bssid, &sessionId); if (!QDF_IS_STATUS_SUCCESS(status)) { - sme_err("Session Id not found for BSSID "MAC_ADDRESS_STR, + sme_err("Session Id not found for BSSID "QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(pDisassocInd->bssid.bytes)); qdf_mem_free(cmd); return; @@ -11356,7 +11356,7 @@ csr_roam_chk_lnk_disassoc_ind(struct mac_context *mac_ctx, tSirSmeRsp *msg_ptr) return; } - sme_err("DISASSOCIATION from peer =" MAC_ADDRESS_STR "reason: %d status: %d session: %d", + sme_err("DISASSOCIATION from peer =" QDF_MAC_ADDR_STR "reason: %d status: %d session: %d", QDF_MAC_ADDR_ARRAY(pDisassocInd->peer_macaddr.bytes), pDisassocInd->reasonCode, pDisassocInd->statusCode, sessionId); @@ -12188,7 +12188,7 @@ csr_roam_chk_lnk_set_ctx_rsp(struct mac_context *mac_ctx, tSirSmeRsp *msg_ptr) result = eCSR_ROAM_RESULT_FAILURE; sme_err( "CSR: setkey command failed(err=%d) PeerMac " - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, pRsp->statusCode, QDF_MAC_ADDR_ARRAY(pRsp->peer_macaddr.bytes)); } @@ -14824,7 +14824,7 @@ static void csr_update_sae_config(struct join_req *csr_join_req, csr_join_req->sae_pmk_cached = csr_lookup_pmkid_using_bssid(mac, session, &pmkid_cache, &index); - sme_debug("pmk_cached %d for BSSID=" MAC_ADDRESS_STR, + sme_debug("pmk_cached %d for BSSID=" QDF_MAC_ADDR_STR, csr_join_req->sae_pmk_cached, QDF_MAC_ADDR_ARRAY(csr_join_req->bssDescription.bssId)); } @@ -15117,7 +15117,7 @@ QDF_STATUS csr_send_join_req_msg(struct mac_context *mac, uint32_t sessionId, } qdf_mem_copy(&csr_join_req->selfMacAddr, &pSession->selfMacAddr, sizeof(tSirMacAddr)); - sme_info("Connecting to ssid:%.*s bssid: "MAC_ADDRESS_STR" rssi: %d channel: %d country_code: %c%c", + sme_info("Connecting to ssid:%.*s bssid: "QDF_MAC_ADDR_STR" rssi: %d channel: %d country_code: %c%c", csr_join_req->ssId.length, csr_join_req->ssId.ssId, QDF_MAC_ADDR_ARRAY(pBssDescription->bssId), pBssDescription->rssi, pBssDescription->channelId, @@ -15993,7 +15993,7 @@ QDF_STATUS csr_send_chng_mcc_beacon_interval(struct mac_context *mac, qdf_copy_macaddr(&pMsg->bssid, &pSession->selfMacAddr); sme_debug("CSR Attempting to change BI for Bssid= " - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(pMsg->bssid.bytes)); pMsg->sessionId = sessionId; sme_debug("session %d BeaconInterval %d", @@ -16036,7 +16036,7 @@ QDF_STATUS csr_set_ht2040_mode(struct mac_context *mac, uint32_t sessionId, qdf_copy_macaddr(&pMsg->bssid, &pSession->selfMacAddr); sme_debug( "CSR Attempting to set HT20/40 mode for Bssid= " - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(pMsg->bssid.bytes)); pMsg->sessionId = sessionId; sme_debug(" session %d HT20/40 mode %d", @@ -16674,7 +16674,7 @@ QDF_STATUS csr_issue_add_sta_for_session_req(struct mac_context *mac, msg.bodyval = 0; sme_debug( - "Send WMA_ADD_STA_SELF_REQ for selfMac=" MAC_ADDRESS_STR, + "Send WMA_ADD_STA_SELF_REQ for selfMac=" QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(add_sta_self_req->self_mac_addr)); status = scheduler_post_message(QDF_MODULE_ID_SME, QDF_MODULE_ID_WMA, @@ -16708,7 +16708,7 @@ QDF_STATUS csr_roam_open_session(struct mac_context *mac_ctx, (struct qdf_mac_addr *)session_param->self_mac_addr, &existing_session_id); if (QDF_IS_STATUS_SUCCESS(status)) { - sme_err("Session %d exists with mac address " MAC_ADDRESS_STR, + sme_err("Session %d exists with mac address " QDF_MAC_ADDR_STR, existing_session_id, QDF_MAC_ADDR_ARRAY(session_param->self_mac_addr)); return QDF_STATUS_E_FAILURE; @@ -17059,7 +17059,7 @@ static void csr_roam_link_up(struct mac_context *mac, struct qdf_mac_addr bssid) * profile info from pmac global structure */ - sme_debug("WLAN link UP with AP= " MAC_ADDRESS_STR, + sme_debug("WLAN link UP with AP= " QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(bssid.bytes)); /* Indicate the neighbor roal algorithm about the connect indication */ csr_roam_get_session_id_from_bssid(mac, &bssid, @@ -19455,7 +19455,7 @@ csr_roam_offload_scan(struct mac_context *mac_ctx, uint8_t session_id, for (i = 0; i < roam_params_dst->num_bssid_avoid_list; i++) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, - "Blacklist Bssid:"MAC_ADDRESS_STR")", + "Blacklist Bssid:"QDF_MAC_ADDR_STR")", QDF_MAC_ADDR_ARRAY(roam_params_dst->bssid_avoid_list[i]. bytes)); } @@ -19467,7 +19467,7 @@ csr_roam_offload_scan(struct mac_context *mac_ctx, uint8_t session_id, } for (i = 0; i < roam_params_dst->num_bssid_favored; i++) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, - "Preferred Bssid:"MAC_ADDRESS_STR") score: %d", + "Preferred Bssid:"QDF_MAC_ADDR_STR") score: %d", QDF_MAC_ADDR_ARRAY(roam_params_dst->bssid_favored[i].bytes), roam_params_dst->bssid_favored_factor[i]); } diff --git a/core/sme/src/csr/csr_api_scan.c b/core/sme/src/csr/csr_api_scan.c index a0997acb96a4..9f2f2ef6b241 100644 --- a/core/sme/src/csr/csr_api_scan.c +++ b/core/sme/src/csr/csr_api_scan.c @@ -479,7 +479,7 @@ static bool csr_scan_save_bss_description(struct mac_context *mac, pCsrBssDescription->AgingCount = (int32_t) mac->roam.configParam.agingCount; sme_debug( - "Set Aging Count = %d for BSS " MAC_ADDRESS_STR " ", + "Set Aging Count = %d for BSS " QDF_MAC_ADDR_STR " ", pCsrBssDescription->AgingCount, QDF_MAC_ADDR_ARRAY(pCsrBssDescription->Result.BssDescriptor. bssId)); @@ -1788,9 +1788,9 @@ QDF_STATUS csr_scan_create_entry_in_scan_cache(struct mac_context *mac, if (!pSession) { return QDF_STATUS_E_FAILURE; } - sme_debug("Current bssid::"MAC_ADDRESS_STR, + sme_debug("Current bssid::"QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(pSession->pConnectBssDesc->bssId)); - sme_debug("My bssid::"MAC_ADDRESS_STR" channel %d", + sme_debug("My bssid::"QDF_MAC_ADDR_STR" channel %d", QDF_MAC_ADDR_ARRAY(bssid.bytes), channel); size = pSession->pConnectBssDesc->length + @@ -1855,7 +1855,7 @@ csr_rso_save_ap_to_scan_cache(struct mac_context *mac, bss_desc_ptr, (sizeof(tSirBssDescription) + length)); - sme_debug("LFR3:Add BSSID to scan cache" MAC_ADDRESS_STR, + sme_debug("LFR3:Add BSSID to scan cache" QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(scan_res_ptr->Result.BssDescriptor.bssId)); csr_scan_add_result(mac, scan_res_ptr); csr_free_scan_result_entry(mac, scan_res_ptr); diff --git a/core/sme/src/csr/csr_host_scan_roam.c b/core/sme/src/csr/csr_host_scan_roam.c index 86145bb17cdd..06842bce8b04 100644 --- a/core/sme/src/csr/csr_host_scan_roam.c +++ b/core/sme/src/csr/csr_host_scan_roam.c @@ -201,7 +201,7 @@ void csr_neighbor_roam_process_scan_results(struct mac_context *mac_ctx, break; descr = &scan_result->BssDescriptor; QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, - FL("Scan result: BSSID " MAC_ADDRESS_STR + FL("Scan result: BSSID " QDF_MAC_ADDR_STR " (Rssi %d, Ch:%d)"), QDF_MAC_ADDR_ARRAY(descr->bssId), (int)abs(descr->rssi), descr->channelId); @@ -282,14 +282,14 @@ void csr_neighbor_roam_process_scan_results(struct mac_context *mac_ctx, (qavail < n_roam_info->MinQBssLoadRequired)) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, - "BSSID:" MAC_ADDRESS_STR "has no BW", + "BSSID:" QDF_MAC_ADDR_STR "has no BW", QDF_MAC_ADDR_ARRAY(descr->bssId)); continue; } if (voadmitted && !qpresent) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, - "BSSID:" MAC_ADDRESS_STR "no LOAD IE", + "BSSID:" QDF_MAC_ADDR_STR "no LOAD IE", QDF_MAC_ADDR_ARRAY(descr->bssId)); continue; } @@ -631,7 +631,7 @@ void csr_neighbor_roam_request_handoff(struct mac_context *mac_ctx, return; } QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, - FL("HANDOFF CANDIDATE BSSID "MAC_ADDRESS_STR), + FL("HANDOFF CANDIDATE BSSID "QDF_MAC_ADDR_STR), QDF_MAC_ADDR_ARRAY(handoff_node.pBssDescription->bssId)); roam_info = qdf_mem_malloc(sizeof(*roam_info)); diff --git a/core/sme/src/csr/csr_neighbor_roam.c b/core/sme/src/csr/csr_neighbor_roam.c index c1776846822d..6abf546ead89 100644 --- a/core/sme/src/csr/csr_neighbor_roam.c +++ b/core/sme/src/csr/csr_neighbor_roam.c @@ -816,7 +816,7 @@ QDF_STATUS csr_neighbor_roam_indicate_disconnect(struct mac_context *mac, } QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, FL("Disconn ind on session %d in state %d from bss :" - MAC_ADDRESS_STR), sessionId, + QDF_MAC_ADDR_STR), sessionId, pNeighborRoamInfo->neighborRoamState, QDF_MAC_ADDR_ARRAY(pSession->connectedProfile.bssid.bytes)); /* diff --git a/core/sme/src/csr/csr_roam_preauth.c b/core/sme/src/csr/csr_roam_preauth.c index 5a4606e8b98b..729ffecb5443 100644 --- a/core/sme/src/csr/csr_roam_preauth.c +++ b/core/sme/src/csr/csr_roam_preauth.c @@ -241,7 +241,7 @@ QDF_STATUS csr_neighbor_roam_preauth_rsp_handler(struct mac_context *mac_ctx, if ((QDF_STATUS_SUCCESS == lim_status) && (preauth_rsp_node)) { sme_debug("Preauth completed successfully after %d tries", neighbor_roam_info->FTRoamInfo.numPreAuthRetries); - sme_debug("After Pre-Auth: BSSID " MAC_ADDRESS_STR ", Ch:%d", + sme_debug("After Pre-Auth: BSSID " QDF_MAC_ADDR_STR ", Ch:%d", QDF_MAC_ADDR_ARRAY( preauth_rsp_node->pBssDescription->bssId), (int)preauth_rsp_node->pBssDescription->channelId); @@ -374,7 +374,7 @@ static QDF_STATUS csr_neighbor_roam_add_preauth_fail(struct mac_context *mac_ctx uint8_t num_mac_addr = neighbor_roam_info->FTRoamInfo.preAuthFailList. numMACAddress; - sme_warn("Added BSSID " MAC_ADDRESS_STR " to Preauth failed list", + sme_warn("Added BSSID " QDF_MAC_ADDR_STR " to Preauth failed list", QDF_MAC_ADDR_ARRAY(bssid)); for (i = 0; @@ -383,7 +383,7 @@ static QDF_STATUS csr_neighbor_roam_add_preauth_fail(struct mac_context *mac_ctx if (!qdf_mem_cmp( neighbor_roam_info->FTRoamInfo.preAuthFailList.macAddress[i], bssid, sizeof(tSirMacAddr))) { - sme_warn("BSSID "MAC_ADDRESS_STR" already fail list", + sme_warn("BSSID "QDF_MAC_ADDR_STR" already fail list", QDF_MAC_ADDR_ARRAY(bssid)); return QDF_STATUS_SUCCESS; } @@ -429,7 +429,7 @@ bool csr_neighbor_roam_is_preauth_candidate(struct mac_context *mac, if (!qdf_mem_cmp(pNeighborRoamInfo->FTRoamInfo. preAuthFailList.macAddress[i], bssId, sizeof(tSirMacAddr))) { - sme_err("BSSID exists in fail list" MAC_ADDRESS_STR, + sme_err("BSSID exists in fail list" QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(bssId)); return false; } @@ -761,7 +761,7 @@ QDF_STATUS csr_neighbor_roam_issue_preauth_req(struct mac_context *mac_ctx, neighbor_bss_node->pBssDescription, eCsrPerformPreauth, true); - sme_debug("Before Pre-Auth: BSSID " MAC_ADDRESS_STR ", Ch:%d", + sme_debug("Before Pre-Auth: BSSID " QDF_MAC_ADDR_STR ", Ch:%d", QDF_MAC_ADDR_ARRAY( neighbor_bss_node->pBssDescription->bssId), (int)neighbor_bss_node->pBssDescription->channelId); diff --git a/core/sme/src/csr/csr_util.c b/core/sme/src/csr/csr_util.c index 2ddcec2f0aa9..c369e708a412 100644 --- a/core/sme/src/csr/csr_util.c +++ b/core/sme/src/csr/csr_util.c @@ -3693,8 +3693,8 @@ bool csr_lookup_pmkid_using_bssid(struct mac_context *mac, for (i = 0; i < session->NumPmkidCache; i++) { session_pmk = &session->PmkidCacheInfo[i]; - sme_debug("Matching BSSID: " MAC_ADDRESS_STR " to cached BSSID:" - MAC_ADDRESS_STR, QDF_MAC_ADDR_ARRAY(pmk_cache->BSSID.bytes), + sme_debug("Matching BSSID: " QDF_MAC_ADDR_STR " to cached BSSID:" + QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(pmk_cache->BSSID.bytes), QDF_MAC_ADDR_ARRAY(session_pmk->BSSID.bytes)); if (qdf_is_macaddr_equal(&pmk_cache->BSSID, &session_pmk->BSSID)) { @@ -4274,7 +4274,7 @@ static bool csr_lookup_bkid(struct mac_context *mac, uint32_t sessionId, do { for (Index = 0; Index < pSession->NumBkidCache; Index++) { - sme_debug("match BKID " MAC_ADDRESS_STR " to ", + sme_debug("match BKID " QDF_MAC_ADDR_STR " to ", QDF_MAC_ADDR_ARRAY(pBSSId)); if (!qdf_mem_cmp (pBSSId, pSession->BkidCacheInfo[Index].BSSID.bytes, diff --git a/core/sme/src/rrm/sme_rrm.c b/core/sme/src/rrm/sme_rrm.c index 1d03c61a6df2..95fbbab8b45d 100644 --- a/core/sme/src/rrm/sme_rrm.c +++ b/core/sme/src/rrm/sme_rrm.c @@ -209,7 +209,7 @@ sme_rrm_send_beacon_report_xmit_ind(struct mac_context *mac_ctx, bss_desc, size); tmp_bss_desc[i] = beacon_rep->pBssDescription[i]; - sme_debug("RRM Result Bssid = " MAC_ADDRESS_STR + sme_debug("RRM Result Bssid = " QDF_MAC_ADDR_STR " chan= %d, rssi = -%d", QDF_MAC_ADDR_ARRAY( beacon_rep->pBssDescription[i]->bssId), @@ -357,7 +357,7 @@ static QDF_STATUS sme_ese_send_beacon_req_scan_results( continue; bcn_report->bcnRepBssInfo[j].ieLen = out_ie_len; - sme_debug("Bssid"MAC_ADDRESS_STR" Channel: %d Rssi: %d", + sme_debug("Bssid"QDF_MAC_ADDR_STR" Channel: %d Rssi: %d", QDF_MAC_ADDR_ARRAY(bss_desc->bssId), bss_desc->channelId, (-1) * bss_desc->rssi); bcn_report->numBss++; @@ -765,7 +765,7 @@ static QDF_STATUS sme_rrm_issue_scan_req(struct mac_context *mac_ctx) status = csr_roam_get_session_id_from_bssid(mac_ctx, &sme_rrm_ctx->sessionBssId, &session_id); if (status != QDF_STATUS_SUCCESS) { - sme_err("sme session ID not found for bssid= "MAC_ADDRESS_STR, + sme_err("sme session ID not found for bssid= "QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(sme_rrm_ctx->sessionBssId.bytes)); status = QDF_STATUS_E_FAILURE; goto free_ch_lst; @@ -1339,7 +1339,7 @@ static QDF_STATUS sme_rrm_process_neighbor_report(struct mac_context *mac, sizeof(tSirNeighborBssDescription)); sme_debug("Received neighbor report with Neighbor BSSID: " - MAC_ADDRESS_STR, + QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY( neighbor_rpt->sNeighborBssDescription[i].bssId)); @@ -1349,7 +1349,7 @@ static QDF_STATUS sme_rrm_process_neighbor_report(struct mac_context *mac, rrm_store_neighbor_rpt_by_roam_score(mac, neighbor_rpt_desc); } else { - sme_err("Roam score of BSSID " MAC_ADDRESS_STR + sme_err("Roam score of BSSID " QDF_MAC_ADDR_STR " is 0, Ignoring..", QDF_MAC_ADDR_ARRAY(neighbor_rpt-> sNeighborBssDescription[i]. diff --git a/core/wma/src/wma_data.c b/core/wma/src/wma_data.c index 23fcf2ca8991..3a6ae892433d 100644 --- a/core/wma/src/wma_data.c +++ b/core/wma/src/wma_data.c @@ -2202,7 +2202,7 @@ int wma_ibss_peer_info_event_handler(void *handle, uint8_t *data, pSmeRsp->txRate = peer_info->data_rate; - WMA_LOGE("peer " MAC_ADDRESS_STR "rssi %d txRate %d", + wma_err("peer " QDF_MAC_ADDR_STR "rssi %d txRate %d", QDF_MAC_ADDR_ARRAY(peer_mac), pSmeRsp->rssi, pSmeRsp->txRate); @@ -3221,13 +3221,8 @@ wma_indicate_err( vdev_id = err_info->u.mic_err.vdev_id; qdf_copy_macaddr(&mic_err_ind->bssId, (struct qdf_mac_addr *) &wma->interfaces[vdev_id].bssid); - WMA_LOGE("MIC error: BSSID:%02x:%02x:%02x:%02x:%02x:%02x\n", - mic_err_ind->bssId.bytes[0], - mic_err_ind->bssId.bytes[1], - mic_err_ind->bssId.bytes[2], - mic_err_ind->bssId.bytes[3], - mic_err_ind->bssId.bytes[4], - mic_err_ind->bssId.bytes[5]); + wma_err("MIC error: BSSID:"QDF_MAC_ADDR_STR, + QDF_MAC_ADDR_ARRAY(mic_err_ind->bssId.bytes)); qdf_mem_copy(mic_err_ind->info.taMacAddr, (struct qdf_mac_addr *) err_info->u.mic_err.ta, sizeof(tSirMacAddr)); @@ -3276,20 +3271,10 @@ void wma_rx_mic_error_ind(void *scn_handle, uint16_t vdev_id, void *wh) qdf_mem_copy(err_info.u.mic_err.ta, w->i_addr2, QDF_MAC_ADDR_SIZE); WMA_LOGD("MIC vdev_id %d\n", vdev_id); - WMA_LOGD("MIC DA: %02x:%02x:%02x:%02x:%02x:%02x\n", - err_info.u.mic_err.da[0], - err_info.u.mic_err.da[1], - err_info.u.mic_err.da[2], - err_info.u.mic_err.da[3], - err_info.u.mic_err.da[4], - err_info.u.mic_err.da[5]); - WMA_LOGD("MIC TA: %02x:%02x:%02x:%02x:%02x:%02x\n", - err_info.u.mic_err.ta[0], - err_info.u.mic_err.ta[1], - err_info.u.mic_err.ta[2], - err_info.u.mic_err.ta[3], - err_info.u.mic_err.ta[4], - err_info.u.mic_err.ta[5]); + wma_debug("MIC DA: "QDF_MAC_ADDR_STR, + QDF_MAC_ADDR_ARRAY(err_info.u.mic_err.da)); + wma_debug("MIC TA: "QDF_MAC_ADDR_STR, + QDF_MAC_ADDR_ARRAY(err_info.u.mic_err.ta)); wma_indicate_err(OL_RX_ERR_TKIP_MIC, &err_info); } @@ -3309,12 +3294,10 @@ uint8_t wma_rx_invalid_peer_ind(uint8_t vdev_id, void *wh) qdf_mem_copy(rx_inv_msg->ta, wh_l->i_addr2, QDF_MAC_ADDR_SIZE); WMA_LOGD("%s: vdev_id %d", __func__, vdev_id); - WMA_LOGD("%s: RA:" MAC_ADDRESS_STR, - __func__, - QDF_MAC_ADDR_ARRAY(rx_inv_msg->ra)); - WMA_LOGD("%s: TA:" MAC_ADDRESS_STR, - __func__, - QDF_MAC_ADDR_ARRAY(rx_inv_msg->ta)); + wma_debug("RA:"QDF_MAC_ADDR_STR, + QDF_MAC_ADDR_ARRAY(rx_inv_msg->ra)); + wma_debug("TA:"QDF_MAC_ADDR_STR, + QDF_MAC_ADDR_ARRAY(rx_inv_msg->ta)); wma_send_msg(wma, SIR_LIM_RX_INVALID_PEER, (void *)rx_inv_msg, 0); diff --git a/core/wma/src/wma_dev_if.c b/core/wma/src/wma_dev_if.c index 4a1c58d52c38..7cc1adb61b59 100644 --- a/core/wma/src/wma_dev_if.c +++ b/core/wma/src/wma_dev_if.c @@ -4532,7 +4532,7 @@ static void wma_add_bss_ap_mode(tp_wma_handle wma, tpAddBssParams add_bss) vdev = wma_find_vdev_by_addr(wma, add_bss->bssId, &vdev_id); if (!vdev) { - wma_err("Failed to get vdev handle:"MAC_ADDRESS_STR, + wma_err("Failed to get vdev handle:"QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(add_bss->bssId)); goto send_fail_resp; diff --git a/core/wma/src/wma_features.c b/core/wma/src/wma_features.c index 470d4cb1df5c..8f00786865dd 100644 --- a/core/wma/src/wma_features.c +++ b/core/wma/src/wma_features.c @@ -597,7 +597,7 @@ QDF_STATUS wma_process_dhcp_ind(WMA_HANDLE handle, return QDF_STATUS_E_FAILURE; } - wma_debug("WMA --> WMI_PEER_SET_PARAM triggered by DHCP, msgType=%s, device_mode=%d, macAddr=" MAC_ADDRESS_STR, + wma_debug("WMA --> WMI_PEER_SET_PARAM triggered by DHCP, msgType=%s, device_mode=%d, macAddr=" QDF_MAC_ADDR_STR, ta_dhcp_ind->msgType == WMA_DHCP_START_IND ? "WMA_DHCP_START_IND" : "WMA_DHCP_STOP_IND", ta_dhcp_ind->device_mode, @@ -2323,7 +2323,7 @@ static void wma_wow_parse_data_pkt(t_wma_handle *wma, src_mac = data + QDF_NBUF_SRC_MAC_OFFSET; dest_mac = data + QDF_NBUF_DEST_MAC_OFFSET; - wma_info("Src_mac: " MAC_ADDRESS_STR ", Dst_mac: " MAC_ADDRESS_STR, + wma_info("Src_mac: " QDF_MAC_ADDR_STR ", Dst_mac: " QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(src_mac), QDF_MAC_ADDR_ARRAY(dest_mac)); wma_wow_inc_wake_lock_stats_by_dst_addr(wma, vdev_id, dest_mac); @@ -2414,7 +2414,7 @@ static void wma_wow_dump_mgmt_buffer(uint8_t *wow_packet_buffer, uint8_t to_from_ds, frag_num; uint32_t seq_num; - wma_err("RA: " MAC_ADDRESS_STR " TA: " MAC_ADDRESS_STR, + wma_err("RA: " QDF_MAC_ADDR_STR " TA: " QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(wh->i_addr1), QDF_MAC_ADDR_ARRAY(wh->i_addr2)); @@ -2426,21 +2426,21 @@ static void wma_wow_dump_mgmt_buffer(uint8_t *wow_packet_buffer, switch (to_from_ds) { case IEEE80211_FC1_DIR_NODS: - wma_err("BSSID: " MAC_ADDRESS_STR, + wma_err("BSSID: " QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(wh->i_addr3)); break; case IEEE80211_FC1_DIR_TODS: - wma_err("DA: " MAC_ADDRESS_STR, + wma_err("DA: " QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(wh->i_addr3)); break; case IEEE80211_FC1_DIR_FROMDS: - wma_err("SA: " MAC_ADDRESS_STR, + wma_err("SA: " QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(wh->i_addr3)); break; case IEEE80211_FC1_DIR_DSTODS: if (buf_len >= sizeof(struct ieee80211_frame_addr4)) - wma_err("DA: " MAC_ADDRESS_STR " SA: " - MAC_ADDRESS_STR, + wma_err("DA: " QDF_MAC_ADDR_STR " SA: " + QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(wh->i_addr3), QDF_MAC_ADDR_ARRAY(wh->i_addr4)); break; @@ -4079,7 +4079,7 @@ int wma_update_tdls_peer_state(WMA_HANDLE handle, restore_last_peer = cdp_peer_is_vdev_restore_last_peer( soc, peer); - wma_debug("calling wma_remove_peer for peer " MAC_ADDRESS_STR + wma_debug("calling wma_remove_peer for peer " QDF_MAC_ADDR_STR " vdevId: %d", QDF_MAC_ADDR_ARRAY(peer_mac_addr), peer_state->vdev_id); @@ -5479,7 +5479,7 @@ int wma_pdev_div_info_evt_handler(void *handle, u_int8_t *event_buf, qdf_mem_zero(&chain_rssi_result, sizeof(chain_rssi_result)); WMI_MAC_ADDR_TO_CHAR_ARRAY(&event->macaddr, macaddr); - wma_debug("macaddr: " MAC_ADDRESS_STR, QDF_MAC_ADDR_ARRAY(macaddr)); + wma_debug("macaddr: " QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(macaddr)); WMA_LOGD(FL("num_chains_valid: %d"), event->num_chains_valid); chain_rssi_result.num_chains_valid = event->num_chains_valid; diff --git a/core/wma/src/wma_main.c b/core/wma/src/wma_main.c index 8555a97c573d..0bfafadfdd9f 100644 --- a/core/wma/src/wma_main.c +++ b/core/wma/src/wma_main.c @@ -641,7 +641,7 @@ static void wma_process_send_addba_req(tp_wma_handle wma_handle, if (QDF_STATUS_SUCCESS != status) { WMA_LOGE(FL("Failed to process WMA_SEND_ADDBA_REQ")); } - wma_debug("sent ADDBA req to" MAC_ADDRESS_STR "tid %d buff_size %d", + wma_debug("sent ADDBA req to" QDF_MAC_ADDR_STR "tid %d buff_size %d", QDF_MAC_ADDR_ARRAY(send_addba->mac_addr), send_addba->param.tidno, send_addba->param.buffersize); @@ -3838,7 +3838,7 @@ static int wma_set_base_macaddr_indicate(tp_wma_handle wma_handle, (uint8_t *)customAddr); if (err) return -EIO; - wma_debug("Base MAC Addr: " MAC_ADDRESS_STR, + wma_debug("Base MAC Addr: " QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY((*customAddr))); return 0; diff --git a/core/wma/src/wma_mgmt.c b/core/wma/src/wma_mgmt.c index 1ad71f99e19f..ad01c5bdc722 100644 --- a/core/wma/src/wma_mgmt.c +++ b/core/wma/src/wma_mgmt.c @@ -3992,7 +3992,7 @@ int wma_process_rmf_frame(tp_wma_handle wma_handle, rx_pkt->pkt_meta.mpdu_data_ptr = rx_pkt->pkt_meta.mpdu_hdr_ptr + rx_pkt->pkt_meta.mpdu_hdr_len; - wma_debug("BSSID: "MAC_ADDRESS_STR" tsf_delta: %u", + wma_debug("BSSID: "QDF_MAC_ADDR_STR" tsf_delta: %u", QDF_MAC_ADDR_ARRAY(wh->i_addr3), rx_pkt->pkt_meta.tsf_delta); } else { @@ -4177,7 +4177,7 @@ int wma_form_rx_packet(qdf_nbuf_t buf, * If the mpdu_data_len is greater than Max (2k), drop the frame */ if (rx_pkt->pkt_meta.mpdu_data_len > WMA_MAX_MGMT_MPDU_LEN) { - wma_err("Data Len %d greater than max, dropping frame from "MAC_ADDRESS_STR, + wma_err("Data Len %d greater than max, dropping frame from "QDF_MAC_ADDR_STR, rx_pkt->pkt_meta.mpdu_data_len, QDF_MAC_ADDR_ARRAY(wh->i_addr3)); qdf_nbuf_free(buf); @@ -4226,7 +4226,7 @@ int wma_form_rx_packet(qdf_nbuf_t buf, if (mgmt_rx_params->buf_len <= (sizeof(struct ieee80211_frame) + offsetof(struct wlan_bcn_frame, ie))) { - wma_debug("Dropping frame from "MAC_ADDRESS_STR, + wma_debug("Dropping frame from "QDF_MAC_ADDR_STR, QDF_MAC_ADDR_ARRAY(wh->i_addr3)); cds_pkt_return_packet(rx_pkt); return -EINVAL; diff --git a/core/wma/src/wma_nan_datapath.c b/core/wma/src/wma_nan_datapath.c index b7a5275f7c4c..1e3944d0d6a4 100644 --- a/core/wma/src/wma_nan_datapath.c +++ b/core/wma/src/wma_nan_datapath.c @@ -161,7 +161,7 @@ void wma_add_sta_ndi_mode(tp_wma_handle wma, tpAddStaParams add_sta) } iface = &wma->interfaces[cdp_get_vdev_id(soc, vdev)]; - wma_debug("vdev: %d, peer_mac_addr: "MAC_ADDRESS_STR, + wma_debug("vdev: %d, peer_mac_addr: "QDF_MAC_ADDR_STR, add_sta->smesessionId, QDF_MAC_ADDR_ARRAY(add_sta->staMac)); peer = cdp_peer_find_by_addr_and_vdev(soc, diff --git a/core/wma/src/wma_power.c b/core/wma/src/wma_power.c index 0df09617d22e..36d61b5b8d06 100644 --- a/core/wma/src/wma_power.c +++ b/core/wma/src/wma_power.c @@ -1503,11 +1503,9 @@ void wma_process_set_mimops_req(tp_wma_handle wma_handle, else if (mimops->htMIMOPSState == eSIR_HT_MIMO_PS_NO_LIMIT) mimops->htMIMOPSState = WMI_PEER_MIMO_PS_NONE; - WMA_LOGD("%s: htMIMOPSState = %d, sessionId = %d peerMac <%02x:%02x:%02x:%02x:%02x:%02x>", - __func__, - mimops->htMIMOPSState, mimops->sessionId, mimops->peerMac[0], - mimops->peerMac[1], mimops->peerMac[2], mimops->peerMac[3], - mimops->peerMac[4], mimops->peerMac[5]); + wma_debug("htMIMOPSState = %d, sessionId = %d peerMac <"QDF_MAC_ADDR_STR">", + mimops->htMIMOPSState, mimops->sessionId, + QDF_MAC_ADDR_ARRAY(mimops->peerMac)); wma_set_peer_param(wma_handle, mimops->peerMac, WMI_PEER_MIMO_PS_STATE, mimops->htMIMOPSState,