From 2751b6d2b388ef26c8661259f4621085de0b7915 Mon Sep 17 00:00:00 2001 From: Srinivas Girigowda Date: Wed, 27 Feb 2019 12:28:13 -0800 Subject: [PATCH] qcacmn: Consolidate multiple MAC_ADDR_LEN to QDF_MAC_ADDR_SIZE Consolidate multiple (redundant) MAC_ADDR_LEN to QDF_MAC_ADDR_SIZE CDP_MAC_ADDR_LEN OL_TXRX_MAC_ADDR_LEN DP_MAC_ADDR_LEN HTT_MAC_ADDR_LEN IEEE80211_ADDR_LEN DEFRAG_IEEE80211_ADDR_LEN ETHER_ADDR_LEN HAL_MAC_ADDR_LEN WLAN_MACADDR_LEN CRs-Fixed: 2406591 Change-Id: I4a87f8ff556920c7b341bdbba99ec43c97b873f4 --- dp/inc/cdp_txrx_cmn_struct.h | 6 +-- dp/inc/cdp_txrx_mob_def.h | 12 ++--- dp/wifi3.0/dp_htt.c | 12 ++--- dp/wifi3.0/dp_htt.h | 4 -- dp/wifi3.0/dp_internal.h | 2 +- dp/wifi3.0/dp_main.c | 24 ++++----- dp/wifi3.0/dp_peer.c | 14 +++--- dp/wifi3.0/dp_rx.c | 10 ++-- dp/wifi3.0/dp_rx.h | 12 ++--- dp/wifi3.0/dp_rx_defrag.c | 26 +++++----- dp/wifi3.0/dp_rx_defrag.h | 3 +- dp/wifi3.0/dp_rx_err.c | 12 ++--- dp/wifi3.0/dp_rx_mon_status.c | 4 +- dp/wifi3.0/dp_tx.c | 46 ++++++++--------- dp/wifi3.0/dp_types.h | 6 +-- hal/wifi3.0/hal_api_mon.h | 4 +- .../cp_stats/src/wlan_cfg80211_mc_cp_stats.c | 6 +-- .../cp_stats/src/target_if_mc_cp_stats.c | 2 +- target_if/crypto/src/target_if_crypto.c | 2 +- target_if/spectral/target_if_spectral.c | 2 +- umac/cmn_services/inc/wlan_cmn.h | 2 - .../core/src/wlan_mgmt_txrx_main_i.h | 13 +++-- .../dispatcher/src/wlan_mgmt_txrx_tgt_api.c | 4 +- .../dispatcher/inc/wlan_cp_stats_mc_defs.h | 6 +-- .../dispatcher/src/wlan_cp_stats_mc_tgt_api.c | 8 +-- utils/pktlog/pktlog_internal.c | 50 +++++++++---------- wmi/inc/wmi_unified_api.h | 26 +++++----- wmi/inc/wmi_unified_param.h | 43 ++++++++-------- wmi/inc/wmi_unified_priv.h | 36 ++++++------- wmi/inc/wmi_unified_roam_param.h | 2 +- wmi/inc/wmi_unified_twt_param.h | 18 +++---- wmi/src/wmi_unified_api.c | 26 +++++----- wmi/src/wmi_unified_ocb_ut.c | 4 +- wmi/src/wmi_unified_tlv.c | 20 ++++---- 34 files changed, 225 insertions(+), 242 deletions(-) diff --git a/dp/inc/cdp_txrx_cmn_struct.h b/dp/inc/cdp_txrx_cmn_struct.h index 5185f019cc..2bc6ae1338 100644 --- a/dp/inc/cdp_txrx_cmn_struct.h +++ b/dp/inc/cdp_txrx_cmn_struct.h @@ -353,8 +353,6 @@ typedef void (*txrx_ast_free_cb)(void *ctrl_soc, void *cookie, enum cdp_ast_free_status); -#define CDP_MAC_ADDR_LEN 6 - /** * struct cdp_ast_entry_info - AST entry information * @peer_mac_addr: mac address of peer on which AST entry is added @@ -367,7 +365,7 @@ typedef void (*txrx_ast_free_cb)(void *ctrl_soc, * */ struct cdp_ast_entry_info { - uint8_t peer_mac_addr[CDP_MAC_ADDR_LEN]; + uint8_t peer_mac_addr[QDF_MAC_ADDR_SIZE]; enum cdp_txrx_ast_entry_type type; uint8_t vdev_id; uint8_t pdev_id; @@ -1526,7 +1524,7 @@ enum cdp_dp_cfg { */ struct cdp_peer_cookie { uint8_t peer_id; - uint8_t mac_addr[CDP_MAC_ADDR_LEN]; + uint8_t mac_addr[QDF_MAC_ADDR_SIZE]; uint8_t cookie; struct cdp_stats_cookie *ctx; }; diff --git a/dp/inc/cdp_txrx_mob_def.h b/dp/inc/cdp_txrx_mob_def.h index 66217fb13f..ba7e994ae7 100644 --- a/dp/inc/cdp_txrx_mob_def.h +++ b/dp/inc/cdp_txrx_mob_def.h @@ -31,8 +31,6 @@ #define OL_TXRX_INVALID_NUM_PEERS (-1) -#define OL_TXRX_MAC_ADDR_LEN 6 - /* Maximum number of station supported by data path, including BC. */ #define WLAN_MAX_STA_COUNT (HAL_NUM_STA) @@ -349,9 +347,9 @@ struct ol_mic_error_info { uint8_t vdev_id; uint32_t key_id; uint64_t pn; - uint8_t sa[OL_TXRX_MAC_ADDR_LEN]; - uint8_t da[OL_TXRX_MAC_ADDR_LEN]; - uint8_t ta[OL_TXRX_MAC_ADDR_LEN]; + uint8_t sa[QDF_MAC_ADDR_SIZE]; + uint8_t da[QDF_MAC_ADDR_SIZE]; + uint8_t ta[QDF_MAC_ADDR_SIZE]; }; /** @@ -452,8 +450,8 @@ typedef void (*ipa_uc_op_cb_type)(uint8_t *op_msg, */ struct ol_rx_inv_peer_params { uint8_t vdev_id; - uint8_t ra[OL_TXRX_MAC_ADDR_LEN]; - uint8_t ta[OL_TXRX_MAC_ADDR_LEN]; + uint8_t ra[QDF_MAC_ADDR_SIZE]; + uint8_t ta[QDF_MAC_ADDR_SIZE]; }; #endif /* __CDP_TXRX_MOB_DEF_H */ diff --git a/dp/wifi3.0/dp_htt.c b/dp/wifi3.0/dp_htt.c index 7fe6e7d9a2..388f6b8c4b 100644 --- a/dp/wifi3.0/dp_htt.c +++ b/dp/wifi3.0/dp_htt.c @@ -1987,13 +1987,13 @@ static void dp_process_ppdu_stats_user_rate_tlv(struct dp_pdev *pdev, if (!vdev) return; qdf_mem_copy(ppdu_user_desc->mac_addr, vdev->mac_addr.raw, - DP_MAC_ADDR_LEN); + QDF_MAC_ADDR_SIZE); } else { peer = dp_peer_find_by_id(pdev->soc, peer_id); if (!peer) return; qdf_mem_copy(ppdu_user_desc->mac_addr, - peer->mac_addr.raw, DP_MAC_ADDR_LEN); + peer->mac_addr.raw, QDF_MAC_ADDR_SIZE); dp_peer_unref_del_find_by_id(peer); } @@ -3081,7 +3081,7 @@ static void dp_htt_t2h_msg_handler(void *context, HTC_PACKET *pkt) switch (msg_type) { case HTT_T2H_MSG_TYPE_PEER_MAP: { - u_int8_t mac_addr_deswizzle_buf[HTT_MAC_ADDR_LEN]; + u_int8_t mac_addr_deswizzle_buf[QDF_MAC_ADDR_SIZE]; u_int8_t *peer_mac_addr; u_int16_t peer_id; u_int16_t hw_peer_id; @@ -3118,7 +3118,7 @@ static void dp_htt_t2h_msg_handler(void *context, HTC_PACKET *pkt) { u_int16_t peer_id; u_int8_t vdev_id; - u_int8_t mac_addr[HTT_MAC_ADDR_LEN] = {0}; + u_int8_t mac_addr[QDF_MAC_ADDR_SIZE] = {0}; peer_id = HTT_RX_PEER_UNMAP_PEER_ID_GET(*msg_word); vdev_id = HTT_RX_PEER_UNMAP_VDEV_ID_GET(*msg_word); @@ -3233,7 +3233,7 @@ static void dp_htt_t2h_msg_handler(void *context, HTC_PACKET *pkt) } case HTT_T2H_MSG_TYPE_PEER_MAP_V2: { - u_int8_t mac_addr_deswizzle_buf[HTT_MAC_ADDR_LEN]; + u_int8_t mac_addr_deswizzle_buf[QDF_MAC_ADDR_SIZE]; u_int8_t *peer_mac_addr; u_int16_t peer_id; u_int16_t hw_peer_id; @@ -3265,7 +3265,7 @@ static void dp_htt_t2h_msg_handler(void *context, HTC_PACKET *pkt) } case HTT_T2H_MSG_TYPE_PEER_UNMAP_V2: { - u_int8_t mac_addr_deswizzle_buf[HTT_MAC_ADDR_LEN]; + u_int8_t mac_addr_deswizzle_buf[QDF_MAC_ADDR_SIZE]; u_int8_t *mac_addr; u_int16_t peer_id; u_int8_t vdev_id; diff --git a/dp/wifi3.0/dp_htt.h b/dp/wifi3.0/dp_htt.h index c0737b2dd5..87a14928a7 100644 --- a/dp/wifi3.0/dp_htt.h +++ b/dp/wifi3.0/dp_htt.h @@ -40,10 +40,6 @@ #define DP_HTT_MAX_SEND_QUEUE_DEPTH 64 -#ifndef HTT_MAC_ADDR_LEN -#define HTT_MAC_ADDR_LEN 6 -#endif - #define DP_HTT_HTC_PKT_MISCLIST_SIZE 256 #define HTT_T2H_EXT_STATS_TLV_START_OFFSET 3 diff --git a/dp/wifi3.0/dp_internal.h b/dp/wifi3.0/dp_internal.h index efc687af61..3bb881ca63 100644 --- a/dp/wifi3.0/dp_internal.h +++ b/dp/wifi3.0/dp_internal.h @@ -746,7 +746,7 @@ void dp_rx_tid_stats_cb(struct dp_soc *soc, void *cb_ctxt, void dp_rx_bar_stats_cb(struct dp_soc *soc, void *cb_ctxt, union hal_reo_status *reo_status); uint16_t dp_tx_me_send_convert_ucast(struct cdp_vdev *vdev_handle, - qdf_nbuf_t nbuf, uint8_t newmac[][DP_MAC_ADDR_LEN], + qdf_nbuf_t nbuf, uint8_t newmac[][QDF_MAC_ADDR_SIZE], uint8_t new_mac_cnt); void dp_tx_me_alloc_descriptor(struct cdp_pdev *pdev); diff --git a/dp/wifi3.0/dp_main.c b/dp/wifi3.0/dp_main.c index 871ffa494d..2cc57e9b78 100644 --- a/dp/wifi3.0/dp_main.c +++ b/dp/wifi3.0/dp_main.c @@ -741,7 +741,7 @@ static bool dp_peer_get_ast_info_by_soc_wifi3 ast_entry_info->peer_id = ast_entry->peer->peer_ids[0]; qdf_mem_copy(&ast_entry_info->peer_mac_addr[0], &ast_entry->peer->mac_addr.raw[0], - DP_MAC_ADDR_LEN); + QDF_MAC_ADDR_SIZE); qdf_spin_unlock_bh(&soc->ast_lock); return true; } @@ -786,7 +786,7 @@ static bool dp_peer_get_ast_info_by_pdevid_wifi3 ast_entry_info->peer_id = ast_entry->peer->peer_ids[0]; qdf_mem_copy(&ast_entry_info->peer_mac_addr[0], &ast_entry->peer->mac_addr.raw[0], - DP_MAC_ADDR_LEN); + QDF_MAC_ADDR_SIZE); qdf_spin_unlock_bh(&soc->ast_lock); return true; } @@ -4471,7 +4471,7 @@ static struct cdp_vdev *dp_vdev_attach_wifi3(struct cdp_pdev *txrx_pdev, #endif qdf_mem_copy( - &vdev->mac_addr.raw[0], vdev_mac_addr, OL_TXRX_MAC_ADDR_LEN); + &vdev->mac_addr.raw[0], vdev_mac_addr, QDF_MAC_ADDR_SIZE); /* TODO: Initialize default HTT meta data that will be used in * TCL descriptors for packets transmitted from this VDEV @@ -4854,7 +4854,7 @@ static void *dp_peer_create_wifi3(struct cdp_vdev *vdev_handle, if ((vdev->opmode == wlan_op_mode_sta) && !qdf_mem_cmp(peer_mac_addr, &vdev->mac_addr.raw[0], - DP_MAC_ADDR_LEN)) { + QDF_MAC_ADDR_SIZE)) { ast_type = CDP_TXRX_AST_TYPE_SELF; } @@ -4909,7 +4909,7 @@ static void *dp_peer_create_wifi3(struct cdp_vdev *vdev_handle, if ((vdev->opmode == wlan_op_mode_sta) && !qdf_mem_cmp(peer_mac_addr, &vdev->mac_addr.raw[0], - DP_MAC_ADDR_LEN)) { + QDF_MAC_ADDR_SIZE)) { ast_type = CDP_TXRX_AST_TYPE_SELF; } @@ -4918,7 +4918,7 @@ static void *dp_peer_create_wifi3(struct cdp_vdev *vdev_handle, qdf_spinlock_create(&peer->peer_info_lock); qdf_mem_copy( - &peer->mac_addr.raw[0], peer_mac_addr, OL_TXRX_MAC_ADDR_LEN); + &peer->mac_addr.raw[0], peer_mac_addr, QDF_MAC_ADDR_SIZE); /* TODO: See of rx_opt_proc is really required */ peer->rx_opt_proc = soc->rx_opt_proc; @@ -4968,7 +4968,7 @@ static void *dp_peer_create_wifi3(struct cdp_vdev *vdev_handle, DP_STATS_INIT(peer); qdf_mem_copy(peer_cookie.mac_addr, peer->mac_addr.raw, - CDP_MAC_ADDR_LEN); + QDF_MAC_ADDR_SIZE); peer_cookie.ctx = NULL; peer_cookie.cookie = pdev->next_peer_cookie++; #if defined(FEATURE_PERPKT_INFO) && WDI_EVENT_ENABLE @@ -5281,7 +5281,7 @@ static int dp_update_filter_neighbour_peers(struct cdp_vdev *vdev_handle, } qdf_mem_copy(&peer->neighbour_peers_macaddr.raw[0], - macaddr, DP_MAC_ADDR_LEN); + macaddr, QDF_MAC_ADDR_SIZE); peer->vdev = vdev; qdf_spin_lock_bh(&pdev->neighbour_peer_mutex); @@ -5303,7 +5303,7 @@ static int dp_update_filter_neighbour_peers(struct cdp_vdev *vdev_handle, TAILQ_FOREACH(peer, &pdev->neighbour_peers_list, neighbour_peer_list_elem) { if (!qdf_mem_cmp(&peer->neighbour_peers_macaddr.raw[0], - macaddr, DP_MAC_ADDR_LEN)) { + macaddr, QDF_MAC_ADDR_SIZE)) { /* delete this peer from the list */ TAILQ_REMOVE(&pdev->neighbour_peers_list, peer, neighbour_peer_list_elem); @@ -5518,7 +5518,7 @@ void dp_peer_unref_delete(void *peer_handle) /* send peer destroy event to upper layer */ qdf_mem_copy(peer_cookie.mac_addr, peer->mac_addr.raw, - CDP_MAC_ADDR_LEN); + QDF_MAC_ADDR_SIZE); peer_cookie.ctx = NULL; peer_cookie.ctx = (void *)peer->wlanstats_ctx; #if defined(FEATURE_PERPKT_INFO) && WDI_EVENT_ENABLE @@ -5823,7 +5823,7 @@ static void dp_get_peer_mac_from_peer_id(struct cdp_pdev *pdev_handle, peer = dp_peer_find_by_id(pdev->soc, (uint16_t)peer_id); if (peer) { qdf_mem_copy(peer_mac, peer->mac_addr.raw, - DP_MAC_ADDR_LEN); + QDF_MAC_ADDR_SIZE); dp_peer_unref_del_find_by_id(peer); } } @@ -9278,7 +9278,7 @@ static QDF_STATUS dp_vdev_get_neighbour_rssi(struct cdp_vdev *vdev_hdl, TAILQ_FOREACH(peer, &pdev->neighbour_peers_list, neighbour_peer_list_elem) { if (qdf_mem_cmp(&peer->neighbour_peers_macaddr.raw[0], - mac_addr, DP_MAC_ADDR_LEN) == 0) { + mac_addr, QDF_MAC_ADDR_SIZE) == 0) { *rssi = peer->rssi; status = QDF_STATUS_SUCCESS; break; diff --git a/dp/wifi3.0/dp_peer.c b/dp/wifi3.0/dp_peer.c index 026d6c16aa..e3bd2ae3bb 100644 --- a/dp/wifi3.0/dp_peer.c +++ b/dp/wifi3.0/dp_peer.c @@ -418,7 +418,7 @@ struct dp_ast_entry *dp_peer_ast_hash_find_by_pdevid(struct dp_soc *soc, struct dp_ast_entry *ase; qdf_mem_copy(&local_mac_addr_aligned.raw[0], - ast_mac_addr, DP_MAC_ADDR_LEN); + ast_mac_addr, QDF_MAC_ADDR_SIZE); mac_addr = &local_mac_addr_aligned; index = dp_peer_ast_hash_index(soc, mac_addr); @@ -449,7 +449,7 @@ struct dp_ast_entry *dp_peer_ast_hash_find_soc(struct dp_soc *soc, struct dp_ast_entry *ase; qdf_mem_copy(&local_mac_addr_aligned.raw[0], - ast_mac_addr, DP_MAC_ADDR_LEN); + ast_mac_addr, QDF_MAC_ADDR_SIZE); mac_addr = &local_mac_addr_aligned; index = dp_peer_ast_hash_index(soc, mac_addr); @@ -669,10 +669,10 @@ int dp_peer_add_ast(struct dp_soc *soc, } qdf_mem_copy(¶m->mac_addr.raw[0], mac_addr, - DP_MAC_ADDR_LEN); + QDF_MAC_ADDR_SIZE); qdf_mem_copy(¶m->peer_mac_addr.raw[0], &peer->mac_addr.raw[0], - DP_MAC_ADDR_LEN); + QDF_MAC_ADDR_SIZE); param->type = type; param->flags = flags; param->vdev_id = vdev->vdev_id; @@ -723,7 +723,7 @@ add_ast_entry: return ret; } - qdf_mem_copy(&ast_entry->mac_addr.raw[0], mac_addr, DP_MAC_ADDR_LEN); + qdf_mem_copy(&ast_entry->mac_addr.raw[0], mac_addr, QDF_MAC_ADDR_SIZE); ast_entry->pdev_id = vdev->pdev->pdev_id; ast_entry->vdev_id = vdev->vdev_id; ast_entry->is_mapped = false; @@ -1096,7 +1096,7 @@ struct dp_peer *dp_peer_find_hash_find(struct dp_soc *soc, } else { qdf_mem_copy( &local_mac_addr_aligned.raw[0], - peer_mac_addr, DP_MAC_ADDR_LEN); + peer_mac_addr, QDF_MAC_ADDR_SIZE); mac_addr = &local_mac_addr_aligned; } index = dp_peer_find_hash_index(soc, mac_addr); @@ -1413,7 +1413,7 @@ dp_rx_peer_map_handler(void *soc_handle, uint16_t peer_id, */ if (!(qdf_mem_cmp(peer->mac_addr.raw, peer->vdev->mac_addr.raw, - DP_MAC_ADDR_LEN))) { + QDF_MAC_ADDR_SIZE))) { QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO_HIGH, "vdev bss_peer!!!!"); diff --git a/dp/wifi3.0/dp_rx.c b/dp/wifi3.0/dp_rx.c index 6a281bc109..94cdb5c56e 100644 --- a/dp/wifi3.0/dp_rx.c +++ b/dp/wifi3.0/dp_rx.c @@ -662,7 +662,7 @@ QDF_STATUS dp_rx_filter_mesh_packets(struct dp_vdev *vdev, qdf_nbuf_t nbuf, if (!qdf_mem_cmp(&mac_addr.raw[0], &vdev->mac_addr.raw[0], - DP_MAC_ADDR_LEN)) + QDF_MAC_ADDR_SIZE)) return QDF_STATUS_SUCCESS; } @@ -673,7 +673,7 @@ QDF_STATUS dp_rx_filter_mesh_packets(struct dp_vdev *vdev, qdf_nbuf_t nbuf, if (!qdf_mem_cmp(&mac_addr.raw[0], &vdev->mac_addr.raw[0], - DP_MAC_ADDR_LEN)) + QDF_MAC_ADDR_SIZE)) return QDF_STATUS_SUCCESS; } } @@ -720,7 +720,7 @@ struct dp_vdev *dp_rx_nac_filter(struct dp_pdev *pdev, TAILQ_FOREACH(peer, &pdev->neighbour_peers_list, neighbour_peer_list_elem) { if (qdf_mem_cmp(&peer->neighbour_peers_macaddr.raw[0], - wh->i_addr2, DP_MAC_ADDR_LEN) == 0) { + wh->i_addr2, QDF_MAC_ADDR_SIZE) == 0) { QDF_TRACE( QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG, FL("NAC configuration matched for mac-%2x:%2x:%2x:%2x:%2x:%2x"), @@ -807,7 +807,7 @@ uint8_t dp_rx_process_invalid_peer(struct dp_soc *soc, qdf_nbuf_t mpdu) TAILQ_FOREACH(vdev, &pdev->vdev_list, vdev_list_elem) { if (qdf_mem_cmp(wh->i_addr1, vdev->mac_addr.raw, - DP_MAC_ADDR_LEN) == 0) { + QDF_MAC_ADDR_SIZE) == 0) { goto out; } } @@ -892,7 +892,7 @@ uint8_t dp_rx_process_invalid_peer(struct dp_soc *soc, qdf_nbuf_t mpdu) qdf_spin_lock_bh(&pdev->vdev_list_lock); DP_PDEV_ITERATE_VDEV_LIST(pdev, vdev) { if (qdf_mem_cmp(wh->i_addr1, vdev->mac_addr.raw, - DP_MAC_ADDR_LEN) == 0) { + QDF_MAC_ADDR_SIZE) == 0) { qdf_spin_unlock_bh(&pdev->vdev_list_lock); goto out; } diff --git a/dp/wifi3.0/dp_rx.h b/dp/wifi3.0/dp_rx.h index 02c8145335..752ad98599 100644 --- a/dp/wifi3.0/dp_rx.h +++ b/dp/wifi3.0/dp_rx.h @@ -499,7 +499,7 @@ dp_rx_wds_add_or_update_ast(struct dp_soc *soc, struct dp_peer *ta_peer, neighbour_peer_list_elem) { if (!qdf_mem_cmp(&neighbour_peer->neighbour_peers_macaddr, wds_src_mac, - DP_MAC_ADDR_LEN)) { + QDF_MAC_ADDR_SIZE)) { ret = dp_peer_add_ast(soc, ta_peer, wds_src_mac, @@ -605,7 +605,7 @@ dp_rx_wds_srcport_learn(struct dp_soc *soc, { uint16_t sa_sw_peer_id = hal_rx_msdu_end_sa_sw_peer_id_get(rx_tlv_hdr); uint8_t sa_is_valid = hal_rx_msdu_end_sa_is_valid_get(rx_tlv_hdr); - uint8_t wds_src_mac[IEEE80211_ADDR_LEN]; + uint8_t wds_src_mac[QDF_MAC_ADDR_SIZE]; uint16_t sa_idx; uint8_t is_chfrag_start = 0; uint8_t is_ad4_valid = 0; @@ -617,8 +617,8 @@ dp_rx_wds_srcport_learn(struct dp_soc *soc, if (is_chfrag_start) is_ad4_valid = hal_rx_get_mpdu_mac_ad4_valid(rx_tlv_hdr); - memcpy(wds_src_mac, (qdf_nbuf_data(nbuf) + IEEE80211_ADDR_LEN), - IEEE80211_ADDR_LEN); + memcpy(wds_src_mac, (qdf_nbuf_data(nbuf) + QDF_MAC_ADDR_SIZE), + QDF_MAC_ADDR_SIZE); /* * Get the AST entry from HW SA index and mark it as active @@ -901,8 +901,8 @@ static inline bool check_qwrap_multicast_loopback(struct dp_vdev *vdev, TAILQ_FOREACH(psta_vdev, &pdev->vdev_list, vdev_list_elem) { if (qdf_unlikely(psta_vdev->proxysta_vdev && !qdf_mem_cmp(psta_vdev->mac_addr.raw, - &data[DP_MAC_ADDR_LEN], - DP_MAC_ADDR_LEN))) { + &data[QDF_MAC_ADDR_SIZE], + QDF_MAC_ADDR_SIZE))) { /* Drop packet if source address is equal to * any of the vdev addresses. */ diff --git a/dp/wifi3.0/dp_rx_defrag.c b/dp/wifi3.0/dp_rx_defrag.c index 6d89bff506..e82564b155 100644 --- a/dp/wifi3.0/dp_rx_defrag.c +++ b/dp/wifi3.0/dp_rx_defrag.c @@ -535,7 +535,7 @@ static uint16_t dp_rx_defrag_hdrsize(qdf_nbuf_t nbuf) frm_ctrl_field = hal_rx_get_frame_ctrl_field(rx_tlv_hdr); if (to_ds && fr_ds) - size += IEEE80211_ADDR_LEN; + size += QDF_MAC_ADDR_SIZE; if (frm_ctrl_valid) { fc = frm_ctrl_field; @@ -570,22 +570,22 @@ static void dp_rx_defrag_michdr(const struct ieee80211_frame *wh0, switch (wh->i_fc[1] & IEEE80211_FC1_DIR_MASK) { case IEEE80211_FC1_DIR_NODS: DP_RX_DEFRAG_IEEE80211_ADDR_COPY(hdr, wh->i_addr1); /* DA */ - DP_RX_DEFRAG_IEEE80211_ADDR_COPY(hdr + IEEE80211_ADDR_LEN, + DP_RX_DEFRAG_IEEE80211_ADDR_COPY(hdr + QDF_MAC_ADDR_SIZE, wh->i_addr2); break; case IEEE80211_FC1_DIR_TODS: DP_RX_DEFRAG_IEEE80211_ADDR_COPY(hdr, wh->i_addr3); /* DA */ - DP_RX_DEFRAG_IEEE80211_ADDR_COPY(hdr + IEEE80211_ADDR_LEN, + DP_RX_DEFRAG_IEEE80211_ADDR_COPY(hdr + QDF_MAC_ADDR_SIZE, wh->i_addr2); break; case IEEE80211_FC1_DIR_FROMDS: DP_RX_DEFRAG_IEEE80211_ADDR_COPY(hdr, wh->i_addr1); /* DA */ - DP_RX_DEFRAG_IEEE80211_ADDR_COPY(hdr + IEEE80211_ADDR_LEN, + DP_RX_DEFRAG_IEEE80211_ADDR_COPY(hdr + QDF_MAC_ADDR_SIZE, wh->i_addr3); break; case IEEE80211_FC1_DIR_DSTODS: DP_RX_DEFRAG_IEEE80211_ADDR_COPY(hdr, wh->i_addr3); /* DA */ - DP_RX_DEFRAG_IEEE80211_ADDR_COPY(hdr + IEEE80211_ADDR_LEN, + DP_RX_DEFRAG_IEEE80211_ADDR_COPY(hdr + QDF_MAC_ADDR_SIZE, wh->i_addr4); break; } @@ -924,42 +924,42 @@ dp_rx_defrag_nwifi_to_8023(qdf_nbuf_t nbuf, uint16_t hdrsize) hal_rx_mpdu_get_addr1(rx_desc_info, &mac_addr.raw[0]); qdf_mem_copy(eth_hdr->dest_addr, &mac_addr.raw[0], - IEEE80211_ADDR_LEN); + QDF_MAC_ADDR_SIZE); hal_rx_mpdu_get_addr2(rx_desc_info, &mac_addr.raw[0]); qdf_mem_copy(eth_hdr->src_addr, &mac_addr.raw[0], - IEEE80211_ADDR_LEN); + QDF_MAC_ADDR_SIZE); break; case IEEE80211_FC1_DIR_TODS: hal_rx_mpdu_get_addr3(rx_desc_info, &mac_addr.raw[0]); qdf_mem_copy(eth_hdr->dest_addr, &mac_addr.raw[0], - IEEE80211_ADDR_LEN); + QDF_MAC_ADDR_SIZE); hal_rx_mpdu_get_addr2(rx_desc_info, &mac_addr.raw[0]); qdf_mem_copy(eth_hdr->src_addr, &mac_addr.raw[0], - IEEE80211_ADDR_LEN); + QDF_MAC_ADDR_SIZE); break; case IEEE80211_FC1_DIR_FROMDS: hal_rx_mpdu_get_addr1(rx_desc_info, &mac_addr.raw[0]); qdf_mem_copy(eth_hdr->dest_addr, &mac_addr.raw[0], - IEEE80211_ADDR_LEN); + QDF_MAC_ADDR_SIZE); hal_rx_mpdu_get_addr3(rx_desc_info, &mac_addr.raw[0]); qdf_mem_copy(eth_hdr->src_addr, &mac_addr.raw[0], - IEEE80211_ADDR_LEN); + QDF_MAC_ADDR_SIZE); break; case IEEE80211_FC1_DIR_DSTODS: hal_rx_mpdu_get_addr3(rx_desc_info, &mac_addr.raw[0]); qdf_mem_copy(eth_hdr->dest_addr, &mac_addr.raw[0], - IEEE80211_ADDR_LEN); + QDF_MAC_ADDR_SIZE); hal_rx_mpdu_get_addr4(rx_desc_info, &mac_addr.raw[0]); qdf_mem_copy(eth_hdr->src_addr, &mac_addr.raw[0], - IEEE80211_ADDR_LEN); + QDF_MAC_ADDR_SIZE); break; default: diff --git a/dp/wifi3.0/dp_rx_defrag.h b/dp/wifi3.0/dp_rx_defrag.h index f074c94392..bb99a4302c 100644 --- a/dp/wifi3.0/dp_rx_defrag.h +++ b/dp/wifi3.0/dp_rx_defrag.h @@ -27,12 +27,11 @@ #include #endif -#define DEFRAG_IEEE80211_ADDR_LEN 6 #define DEFRAG_IEEE80211_KEY_LEN 8 #define DEFRAG_IEEE80211_FCS_LEN 4 #define DP_RX_DEFRAG_IEEE80211_ADDR_COPY(dst, src) \ - qdf_mem_copy(dst, src, IEEE80211_ADDR_LEN) + qdf_mem_copy(dst, src, QDF_MAC_ADDR_SIZE) #define DP_RX_DEFRAG_IEEE80211_QOS_HAS_SEQ(wh) \ (((wh) & \ diff --git a/dp/wifi3.0/dp_rx_err.c b/dp/wifi3.0/dp_rx_err.c index 40c228acf1..d0c8925b8f 100644 --- a/dp/wifi3.0/dp_rx_err.c +++ b/dp/wifi3.0/dp_rx_err.c @@ -86,9 +86,9 @@ static inline bool dp_rx_mcast_echo_check(struct dp_soc *soc, * if the received pkts src mac addr matches with vdev * mac address then drop the pkt as it is looped back */ - if (!(qdf_mem_cmp(&data[DP_MAC_ADDR_LEN], + if (!(qdf_mem_cmp(&data[QDF_MAC_ADDR_SIZE], vdev->mac_addr.raw, - DP_MAC_ADDR_LEN))) + QDF_MAC_ADDR_SIZE))) return true; /* @@ -128,7 +128,7 @@ static inline bool dp_rx_mcast_echo_check(struct dp_soc *soc, * AST entry for STA's own mac_address. */ ase = dp_peer_ast_list_find(soc, peer, - &data[DP_MAC_ADDR_LEN]); + &data[QDF_MAC_ADDR_SIZE]); if (ase) { ase->ast_idx = sa_idx; soc->ast_table[sa_idx] = ase; @@ -137,7 +137,7 @@ static inline bool dp_rx_mcast_echo_check(struct dp_soc *soc, } } else ase = dp_peer_ast_hash_find_by_pdevid(soc, - &data[DP_MAC_ADDR_LEN], + &data[QDF_MAC_ADDR_SIZE], vdev->pdev->pdev_id); if (ase) { @@ -147,7 +147,7 @@ static inline bool dp_rx_mcast_echo_check(struct dp_soc *soc, QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO, "Detected DBDC Root AP %pM, %d %d", - &data[DP_MAC_ADDR_LEN], vdev->pdev->pdev_id, + &data[QDF_MAC_ADDR_SIZE], vdev->pdev->pdev_id, ase->pdev_id); return false; } @@ -158,7 +158,7 @@ static inline bool dp_rx_mcast_echo_check(struct dp_soc *soc, QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO, "received pkt with same src mac %pM", - &data[DP_MAC_ADDR_LEN]); + &data[QDF_MAC_ADDR_SIZE]); return true; } diff --git a/dp/wifi3.0/dp_rx_mon_status.c b/dp/wifi3.0/dp_rx_mon_status.c index 38dbf7af82..b2dd443fb2 100644 --- a/dp/wifi3.0/dp_rx_mon_status.c +++ b/dp/wifi3.0/dp_rx_mon_status.c @@ -115,7 +115,7 @@ dp_rx_populate_cdp_indication_ppdu(struct dp_pdev *pdev, } qdf_mem_copy(cdp_rx_ppdu->mac_addr, - peer->mac_addr.raw, DP_MAC_ADDR_LEN); + peer->mac_addr.raw, QDF_MAC_ADDR_SIZE); cdp_rx_ppdu->peer_id = peer->peer_ids[0]; cdp_rx_ppdu->vdev_id = peer->vdev->vdev_id; } @@ -412,7 +412,7 @@ dp_rx_handle_ppdu_stats(struct dp_soc *soc, struct dp_pdev *pdev, neighbour_peer_list_elem) { if (!qdf_mem_cmp(&peer->neighbour_peers_macaddr, &ppdu_info->nac_info.mac_addr2, - DP_MAC_ADDR_LEN)) { + QDF_MAC_ADDR_SIZE)) { peer->rssi = rssi; break; } diff --git a/dp/wifi3.0/dp_tx.c b/dp/wifi3.0/dp_tx.c index 3f51338b69..366d2ec49c 100644 --- a/dp/wifi3.0/dp_tx.c +++ b/dp/wifi3.0/dp_tx.c @@ -1152,7 +1152,7 @@ static bool dp_cce_classify(struct dp_vdev *vdev, qdf_nbuf_t nbuf) } if (qdf_unlikely(DP_FRAME_IS_SNAP(llcHdr))) { - ether_type = *(uint16_t *)(nbuf->data + 2*ETHER_ADDR_LEN + + ether_type = *(uint16_t *)(nbuf->data + 2*QDF_MAC_ADDR_SIZE + sizeof(*llcHdr)); nbuf_clone = qdf_nbuf_clone(nbuf); if (qdf_unlikely(nbuf_clone)) { @@ -1238,13 +1238,13 @@ static void dp_tx_get_tid(struct dp_vdev *vdev, qdf_nbuf_t nbuf, * Check if packet is dot3 or eth2 type. */ if (DP_FRAME_IS_LLC(ether_type) && DP_FRAME_IS_SNAP(llcHdr)) { - ether_type = (uint16_t)*(nbuf->data + 2*ETHER_ADDR_LEN + + ether_type = (uint16_t)*(nbuf->data + 2*QDF_MAC_ADDR_SIZE + sizeof(*llcHdr)); if (ether_type == htons(ETHERTYPE_VLAN)) { L3datap = hdr_ptr + sizeof(qdf_ethervlan_header_t) + sizeof(*llcHdr); - ether_type = (uint16_t)*(nbuf->data + 2*ETHER_ADDR_LEN + ether_type = (uint16_t)*(nbuf->data + 2*QDF_MAC_ADDR_SIZE + sizeof(*llcHdr) + sizeof(qdf_net_vlanhdr_t)); } else { @@ -2511,9 +2511,9 @@ dp_get_completion_indication_for_stack(struct dp_soc *soc, ppdu_hdr = (struct tx_capture_hdr *)qdf_nbuf_data(netbuf); qdf_mem_copy(ppdu_hdr->ta, peer->vdev->mac_addr.raw, - IEEE80211_ADDR_LEN); + QDF_MAC_ADDR_SIZE); qdf_mem_copy(ppdu_hdr->ra, peer->mac_addr.raw, - IEEE80211_ADDR_LEN); + QDF_MAC_ADDR_SIZE); ppdu_hdr->ppdu_id = ppdu_id; ppdu_hdr->peer_id = peer_id; ppdu_hdr->first_msdu = first_msdu; @@ -2624,7 +2624,7 @@ void dp_tx_mec_handler(struct dp_vdev *vdev, uint8_t *status) struct dp_soc *soc; uint32_t flags = IEEE80211_NODE_F_WDS_HM; struct dp_peer *peer; - uint8_t mac_addr[DP_MAC_ADDR_LEN], i; + uint8_t mac_addr[QDF_MAC_ADDR_SIZE], i; if (!vdev->mec_enabled) return; @@ -2648,11 +2648,11 @@ void dp_tx_mec_handler(struct dp_vdev *vdev, uint8_t *status) "%s Tx MEC Handler", __func__); - for (i = 0; i < DP_MAC_ADDR_LEN; i++) - mac_addr[(DP_MAC_ADDR_LEN - 1) - i] = - status[(DP_MAC_ADDR_LEN - 2) + i]; + for (i = 0; i < QDF_MAC_ADDR_SIZE; i++) + mac_addr[(QDF_MAC_ADDR_SIZE - 1) - i] = + status[(QDF_MAC_ADDR_SIZE - 2) + i]; - if (qdf_mem_cmp(mac_addr, vdev->mac_addr.raw, DP_MAC_ADDR_LEN)) + if (qdf_mem_cmp(mac_addr, vdev->mac_addr.raw, QDF_MAC_ADDR_SIZE)) dp_peer_add_ast(soc, peer, mac_addr, @@ -4044,7 +4044,7 @@ static void dp_tx_me_mem_free(struct dp_pdev *pdev, phy_addr = (phy_addr << 32) | seg_info_head->frags[0].paddr_lo; qdf_mem_unmap_nbytes_single(pdev->soc->osdev, phy_addr, - QDF_DMA_TO_DEVICE , DP_MAC_ADDR_LEN); + QDF_DMA_TO_DEVICE , QDF_MAC_ADDR_SIZE); dp_tx_me_free_buf(pdev, mc_uc_buf); qdf_nbuf_free(nbuf); seg_info_new = seg_info_head; @@ -4064,7 +4064,7 @@ static void dp_tx_me_mem_free(struct dp_pdev *pdev, */ uint16_t dp_tx_me_send_convert_ucast(struct cdp_vdev *vdev_handle, qdf_nbuf_t nbuf, - uint8_t newmac[][DP_MAC_ADDR_LEN], uint8_t new_mac_cnt) + uint8_t newmac[][QDF_MAC_ADDR_SIZE], uint8_t new_mac_cnt) { struct dp_vdev *vdev = (struct dp_vdev *) vdev_handle; struct dp_pdev *pdev = vdev->pdev; @@ -4075,7 +4075,7 @@ dp_tx_me_send_convert_ucast(struct cdp_vdev *vdev_handle, qdf_nbuf_t nbuf, /* reference to frame dst addr */ uint8_t *dstmac; /* copy of original frame src addr */ - uint8_t srcmac[DP_MAC_ADDR_LEN]; + uint8_t srcmac[QDF_MAC_ADDR_SIZE]; /* local index into newmac */ uint8_t new_mac_idx = 0; @@ -4088,7 +4088,7 @@ dp_tx_me_send_convert_ucast(struct cdp_vdev *vdev_handle, qdf_nbuf_t nbuf, struct dp_tx_frag_info_s data_frag; qdf_dma_addr_t paddr_data; qdf_dma_addr_t paddr_mcbuf = 0; - uint8_t empty_entry_mac[DP_MAC_ADDR_LEN] = {0}; + uint8_t empty_entry_mac[QDF_MAC_ADDR_SIZE] = {0}; QDF_STATUS status; qdf_mem_zero(&msdu_info, sizeof(msdu_info)); @@ -4096,7 +4096,7 @@ dp_tx_me_send_convert_ucast(struct cdp_vdev *vdev_handle, qdf_nbuf_t nbuf, dp_tx_get_queue(vdev, nbuf, &msdu_info.tx_queue); eh = (qdf_ether_header_t *)nbuf; - qdf_mem_copy(srcmac, eh->ether_shost, DP_MAC_ADDR_LEN); + qdf_mem_copy(srcmac, eh->ether_shost, QDF_MAC_ADDR_SIZE); len = qdf_nbuf_len(nbuf); @@ -4113,13 +4113,13 @@ dp_tx_me_send_convert_ucast(struct cdp_vdev *vdev_handle, qdf_nbuf_t nbuf, return 1; } - paddr_data = qdf_nbuf_get_frag_paddr(nbuf, 0) + IEEE80211_ADDR_LEN; + paddr_data = qdf_nbuf_get_frag_paddr(nbuf, 0) + QDF_MAC_ADDR_SIZE; /*preparing data fragment*/ - data_frag.vaddr = qdf_nbuf_data(nbuf) + IEEE80211_ADDR_LEN; + data_frag.vaddr = qdf_nbuf_data(nbuf) + QDF_MAC_ADDR_SIZE; data_frag.paddr_lo = (uint32_t)paddr_data; data_frag.paddr_hi = (((uint64_t) paddr_data) >> 32); - data_frag.len = len - DP_MAC_ADDR_LEN; + data_frag.len = len - QDF_MAC_ADDR_SIZE; for (new_mac_idx = 0; new_mac_idx < new_mac_cnt; new_mac_idx++) { dstmac = newmac[new_mac_idx]; @@ -4127,11 +4127,11 @@ dp_tx_me_send_convert_ucast(struct cdp_vdev *vdev_handle, qdf_nbuf_t nbuf, "added mac addr (%pM)", dstmac); /* Check for NULL Mac Address */ - if (!qdf_mem_cmp(dstmac, empty_entry_mac, DP_MAC_ADDR_LEN)) + if (!qdf_mem_cmp(dstmac, empty_entry_mac, QDF_MAC_ADDR_SIZE)) continue; /* frame to self mac. skip */ - if (!qdf_mem_cmp(dstmac, srcmac, DP_MAC_ADDR_LEN)) + if (!qdf_mem_cmp(dstmac, srcmac, QDF_MAC_ADDR_SIZE)) continue; /* @@ -4170,10 +4170,10 @@ dp_tx_me_send_convert_ucast(struct cdp_vdev *vdev_handle, qdf_nbuf_t nbuf, nbuf_clone = nbuf; } - qdf_mem_copy(mc_uc_buf->data, dstmac, DP_MAC_ADDR_LEN); + qdf_mem_copy(mc_uc_buf->data, dstmac, QDF_MAC_ADDR_SIZE); status = qdf_mem_map_nbytes_single(vdev->osdev, mc_uc_buf->data, - QDF_DMA_TO_DEVICE, DP_MAC_ADDR_LEN, + QDF_DMA_TO_DEVICE, QDF_MAC_ADDR_SIZE, &paddr_mcbuf); if (status) { @@ -4187,7 +4187,7 @@ dp_tx_me_send_convert_ucast(struct cdp_vdev *vdev_handle, qdf_nbuf_t nbuf, seg_info_new->frags[0].paddr_lo = (uint32_t) paddr_mcbuf; seg_info_new->frags[0].paddr_hi = ((uint64_t) paddr_mcbuf >> 32); - seg_info_new->frags[0].len = DP_MAC_ADDR_LEN; + seg_info_new->frags[0].len = QDF_MAC_ADDR_SIZE; seg_info_new->frags[1] = data_frag; seg_info_new->nbuf = nbuf_clone; diff --git a/dp/wifi3.0/dp_types.h b/dp/wifi3.0/dp_types.h index 5c0ae5a0b1..a01f47738c 100644 --- a/dp/wifi3.0/dp_types.h +++ b/dp/wifi3.0/dp_types.h @@ -153,7 +153,6 @@ struct cdp_soc_rate_stats_ctx; */ #define DP_SW2HW_MACID(id) ((id) + 1) #define DP_HW2SW_MACID(id) ((id) > 0 ? ((id) - 1) : 0) -#define DP_MAC_ADDR_LEN 6 /** * Number of Tx Queues @@ -635,9 +634,8 @@ struct dp_soc_stats { } rx; }; -#define DP_MAC_ADDR_LEN 6 union dp_align_mac_addr { - uint8_t raw[DP_MAC_ADDR_LEN]; + uint8_t raw[QDF_MAC_ADDR_SIZE]; struct { uint16_t bytes_ab; uint16_t bytes_cd; @@ -1719,7 +1717,7 @@ struct dp_tx_me_buf_t { /* Note: ME buf pool initialization logic expects next pointer to * be the first element. Dont add anything before next */ struct dp_tx_me_buf_t *next; - uint8_t data[DP_MAC_ADDR_LEN]; + uint8_t data[QDF_MAC_ADDR_SIZE]; }; #endif /* _DP_TYPES_H_ */ diff --git a/hal/wifi3.0/hal_api_mon.h b/hal/wifi3.0/hal_api_mon.h index 27a3661695..5ee053d99e 100644 --- a/hal/wifi3.0/hal_api_mon.h +++ b/hal/wifi3.0/hal_api_mon.h @@ -144,8 +144,6 @@ #define HAL_RX_GET_MSDU_AGGREGATION(rx_desc, rs) #endif -#define HAL_MAC_ADDR_LEN 6 - enum { DP_PPDU_STATUS_START, DP_PPDU_STATUS_DONE, @@ -415,7 +413,7 @@ struct hal_rx_nac_info { uint8_t fc_valid; uint8_t to_ds_flag; uint8_t mac_addr2_valid; - uint8_t mac_addr2[HAL_MAC_ADDR_LEN]; + uint8_t mac_addr2[QDF_MAC_ADDR_SIZE]; }; struct hal_rx_ppdu_info { diff --git a/os_if/linux/cp_stats/src/wlan_cfg80211_mc_cp_stats.c b/os_if/linux/cp_stats/src/wlan_cfg80211_mc_cp_stats.c index 8c20932aae..3b4d0e7e9c 100644 --- a/os_if/linux/cp_stats/src/wlan_cfg80211_mc_cp_stats.c +++ b/os_if/linux/cp_stats/src/wlan_cfg80211_mc_cp_stats.c @@ -259,7 +259,7 @@ int wlan_cfg80211_mc_cp_stats_get_tx_power(struct wlan_objmgr_vdev *vdev, ret = -EINVAL; goto peer_is_null; } - qdf_mem_copy(info.peer_mac_addr, peer->macaddr, WLAN_MACADDR_LEN); + qdf_mem_copy(info.peer_mac_addr, peer->macaddr, QDF_MAC_ADDR_SIZE); status = ucfg_mc_cp_stats_send_stats_request(vdev, TYPE_CONNECTION_TX_POWER, @@ -374,7 +374,7 @@ wlan_cfg80211_mc_cp_stats_get_peer_rssi(struct wlan_objmgr_vdev *vdev, info.u.get_peer_rssi_cb = get_peer_rssi_cb; info.vdev_id = wlan_vdev_get_id(vdev); info.pdev_id = wlan_objmgr_pdev_get_pdev_id(wlan_vdev_get_pdev(vdev)); - qdf_mem_copy(info.peer_mac_addr, mac_addr, WLAN_MACADDR_LEN); + qdf_mem_copy(info.peer_mac_addr, mac_addr, QDF_MAC_ADDR_SIZE); status = ucfg_mc_cp_stats_send_stats_request(vdev, TYPE_PEER_STATS, &info); if (QDF_IS_STATUS_ERROR(status)) { @@ -512,7 +512,7 @@ wlan_cfg80211_mc_cp_stats_get_station_stats(struct wlan_objmgr_vdev *vdev, *errno = -EINVAL; goto get_station_stats_fail; } - qdf_mem_copy(info.peer_mac_addr, peer->macaddr, WLAN_MACADDR_LEN); + qdf_mem_copy(info.peer_mac_addr, peer->macaddr, QDF_MAC_ADDR_SIZE); status = ucfg_mc_cp_stats_send_stats_request(vdev, TYPE_STATION_STATS, &info); diff --git a/target_if/cp_stats/src/target_if_mc_cp_stats.c b/target_if/cp_stats/src/target_if_mc_cp_stats.c index f125f8364b..6886b30517 100644 --- a/target_if/cp_stats/src/target_if_mc_cp_stats.c +++ b/target_if/cp_stats/src/target_if_mc_cp_stats.c @@ -156,7 +156,7 @@ static QDF_STATUS target_if_cp_stats_extract_peer_stats( for (i = 0; i < ev->num_peer_adv_stats; i++) { qdf_mem_copy(&ev->peer_adv_stats[i].peer_macaddr, &peer_adv_stats[i].peer_macaddr, - WLAN_MACADDR_LEN); + QDF_MAC_ADDR_SIZE); ev->peer_adv_stats[i].fcs_count = peer_adv_stats[i].fcs_count; ev->peer_adv_stats[i].rx_bytes = peer_adv_stats[i].rx_bytes; ev->peer_adv_stats[i].rx_count = peer_adv_stats[i].rx_count; diff --git a/target_if/crypto/src/target_if_crypto.c b/target_if/crypto/src/target_if_crypto.c index 074c33f88c..f549756f86 100644 --- a/target_if/crypto/src/target_if_crypto.c +++ b/target_if/crypto/src/target_if_crypto.c @@ -139,7 +139,7 @@ QDF_STATUS target_if_crypto_set_key(struct wlan_objmgr_vdev *vdev, } params.vdev_id = wlan_vdev_get_id(vdev); params.key_idx = req->keyix; - qdf_mem_copy(params.peer_mac, req->macaddr, IEEE80211_ADDR_LEN); + qdf_mem_copy(params.peer_mac, req->macaddr, QDF_MAC_ADDR_SIZE); pdev_wmi_handle = GET_WMI_HDL_FROM_PDEV(pdev); if (!pdev_wmi_handle) { target_if_err("Invalid PDEV WMI handle"); diff --git a/target_if/spectral/target_if_spectral.c b/target_if/spectral/target_if_spectral.c index 989e8b508f..3c8fed588b 100644 --- a/target_if/spectral/target_if_spectral.c +++ b/target_if/spectral/target_if_spectral.c @@ -1256,7 +1256,7 @@ target_if_spectral_get_macaddr(void *arg, char *addr) wlan_pdev_obj_lock(pdev); myaddr = wlan_pdev_get_hw_macaddr(pdev); wlan_pdev_obj_unlock(pdev); - qdf_mem_copy(addr, myaddr, IEEE80211_ADDR_LEN); + qdf_mem_copy(addr, myaddr, QDF_MAC_ADDR_SIZE); return 0; } diff --git a/umac/cmn_services/inc/wlan_cmn.h b/umac/cmn_services/inc/wlan_cmn.h index 95b1701671..62fe8d8000 100644 --- a/umac/cmn_services/inc/wlan_cmn.h +++ b/umac/cmn_services/inc/wlan_cmn.h @@ -605,8 +605,6 @@ struct wlan_ssid { uint8_t ssid[WLAN_SSID_MAX_LEN]; }; -/* depreciated; use QDF_MAC_ADDR_SIZE instead */ -#define WLAN_MACADDR_LEN QDF_MAC_ADDR_SIZE /* Util API to copy the MAC address */ #define WLAN_ADDR_COPY(dst, src) qdf_mem_copy(dst, src, QDF_MAC_ADDR_SIZE) /* Util API to compare the MAC address */ diff --git a/umac/cmn_services/mgmt_txrx/core/src/wlan_mgmt_txrx_main_i.h b/umac/cmn_services/mgmt_txrx/core/src/wlan_mgmt_txrx_main_i.h index e596d2537d..cdaa897233 100644 --- a/umac/cmn_services/mgmt_txrx/core/src/wlan_mgmt_txrx_main_i.h +++ b/umac/cmn_services/mgmt_txrx/core/src/wlan_mgmt_txrx_main_i.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2018 The Linux Foundation. All rights reserved. + * Copyright (c) 2016-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 @@ -31,7 +31,6 @@ #include "qdf_list.h" -#define IEEE80211_ADDR_LEN 6 /* size of 802.11 address */ #define IEEE80211_FC0_TYPE_MASK 0x0c #define IEEE80211_FC0_SUBTYPE_MASK 0xf0 #define IEEE80211_FC0_TYPE_MGT 0x00 @@ -55,14 +54,14 @@ struct ieee80211_frame { uint8_t i_dur[2]; union { struct { - uint8_t i_addr1[IEEE80211_ADDR_LEN]; - uint8_t i_addr2[IEEE80211_ADDR_LEN]; - uint8_t i_addr3[IEEE80211_ADDR_LEN]; + uint8_t i_addr1[QDF_MAC_ADDR_SIZE]; + uint8_t i_addr2[QDF_MAC_ADDR_SIZE]; + uint8_t i_addr3[QDF_MAC_ADDR_SIZE]; }; - uint8_t i_addr_all[3 * IEEE80211_ADDR_LEN]; + uint8_t i_addr_all[3 * QDF_MAC_ADDR_SIZE]; }; uint8_t i_seq[2]; - /* possibly followed by addr4[IEEE80211_ADDR_LEN]; */ + /* possibly followed by addr4[QDF_MAC_ADDR_SIZE]; */ /* see below */ } __packed; diff --git a/umac/cmn_services/mgmt_txrx/dispatcher/src/wlan_mgmt_txrx_tgt_api.c b/umac/cmn_services/mgmt_txrx/dispatcher/src/wlan_mgmt_txrx_tgt_api.c index 90e107fc7b..bb315429ba 100644 --- a/umac/cmn_services/mgmt_txrx/dispatcher/src/wlan_mgmt_txrx_tgt_api.c +++ b/umac/cmn_services/mgmt_txrx/dispatcher/src/wlan_mgmt_txrx_tgt_api.c @@ -911,10 +911,10 @@ QDF_STATUS tgt_mgmt_txrx_rx_frame_handler( wh->i_addr2, wh->i_addr3); if (!is_from_addr_valid) qdf_mem_copy(wh->i_addr2, wh->i_addr3, - IEEE80211_ADDR_LEN); + QDF_MAC_ADDR_SIZE); else qdf_mem_copy(wh->i_addr3, wh->i_addr2, - IEEE80211_ADDR_LEN); + QDF_MAC_ADDR_SIZE); } /* mpdu_data_ptr is pointer to action header */ diff --git a/umac/cp_stats/dispatcher/inc/wlan_cp_stats_mc_defs.h b/umac/cp_stats/dispatcher/inc/wlan_cp_stats_mc_defs.h index bfca991317..b5138e808d 100644 --- a/umac/cp_stats/dispatcher/inc/wlan_cp_stats_mc_defs.h +++ b/umac/cp_stats/dispatcher/inc/wlan_cp_stats_mc_defs.h @@ -148,7 +148,7 @@ struct request_info { } u; uint32_t vdev_id; uint32_t pdev_id; - uint8_t peer_mac_addr[WLAN_MACADDR_LEN]; + uint8_t peer_mac_addr[QDF_MAC_ADDR_SIZE]; }; /** @@ -248,7 +248,7 @@ struct peer_mc_cp_stats { uint32_t tx_rate; uint32_t rx_rate; int8_t peer_rssi; - uint8_t peer_macaddr[WLAN_MACADDR_LEN]; + uint8_t peer_macaddr[QDF_MAC_ADDR_SIZE]; }; /** @@ -259,7 +259,7 @@ struct peer_mc_cp_stats { * @rx_count: rx count */ struct peer_adv_mc_cp_stats { - uint8_t peer_macaddr[WLAN_MACADDR_LEN]; + uint8_t peer_macaddr[QDF_MAC_ADDR_SIZE]; uint32_t fcs_count; uint32_t rx_count; uint64_t rx_bytes; diff --git a/umac/cp_stats/dispatcher/src/wlan_cp_stats_mc_tgt_api.c b/umac/cp_stats/dispatcher/src/wlan_cp_stats_mc_tgt_api.c index 721f707411..b79bf5773c 100644 --- a/umac/cp_stats/dispatcher/src/wlan_cp_stats_mc_tgt_api.c +++ b/umac/cp_stats/dispatcher/src/wlan_cp_stats_mc_tgt_api.c @@ -244,7 +244,7 @@ tgt_mc_cp_stats_update_peer_adv_stats(struct wlan_objmgr_psoc *psoc, qdf_mem_copy(peer_adv_mc_stats->peer_macaddr, peer_adv_stats->peer_macaddr, - WLAN_MACADDR_LEN); + QDF_MAC_ADDR_SIZE); if (peer_adv_stats->fcs_count) peer_adv_mc_stats->fcs_count = peer_adv_stats->fcs_count; if (peer_adv_stats->rx_bytes) @@ -292,7 +292,7 @@ tgt_mc_cp_stats_update_peer_stats(struct wlan_objmgr_psoc *psoc, peer_mc_stats = peer_cp_stats_priv->peer_stats; qdf_mem_copy(peer_mc_stats->peer_macaddr, peer_stats->peer_macaddr, - WLAN_MACADDR_LEN); + QDF_MAC_ADDR_SIZE); if (peer_stats->tx_rate) peer_mc_stats->tx_rate = peer_stats->tx_rate; if (peer_stats->rx_rate) @@ -348,7 +348,7 @@ static void tgt_mc_cp_stats_extract_peer_stats(struct wlan_objmgr_psoc *psoc, if (!QDF_IS_ADDR_BROADCAST(last_req.peer_mac_addr) && !qdf_mem_cmp(ev->peer_stats[i].peer_macaddr, last_req.peer_mac_addr, - WLAN_MACADDR_LEN)) { + QDF_MAC_ADDR_SIZE)) { /* mac is specified, but failed to update the peer */ if (QDF_IS_STATUS_ERROR(status)) return; @@ -377,7 +377,7 @@ extd2_stats: if (!QDF_IS_ADDR_BROADCAST(last_req.peer_mac_addr) && !qdf_mem_cmp(ev->peer_adv_stats[i].peer_macaddr, last_req.peer_mac_addr, - WLAN_MACADDR_LEN)) { + QDF_MAC_ADDR_SIZE)) { /* mac is specified, but failed to update the peer */ if (QDF_IS_STATUS_ERROR(status)) return; diff --git a/utils/pktlog/pktlog_internal.c b/utils/pktlog/pktlog_internal.c index 2c0c4672bf..9e8ced8108 100644 --- a/utils/pktlog/pktlog_internal.c +++ b/utils/pktlog/pktlog_internal.c @@ -186,51 +186,51 @@ static void process_ieee_hdr(void *data) if (dir == IEEE80211_FC1_DIR_TODS) { frm_hdr.bssid_tail = - (wh->i_addr1[IEEE80211_ADDR_LEN - 2] << 8) | (wh-> + (wh->i_addr1[QDF_MAC_ADDR_SIZE - 2] << 8) | (wh-> i_addr1 - [IEEE80211_ADDR_LEN + [QDF_MAC_ADDR_SIZE - 1]); frm_hdr.sa_tail = - (wh->i_addr2[IEEE80211_ADDR_LEN - 2] << 8) | (wh-> + (wh->i_addr2[QDF_MAC_ADDR_SIZE - 2] << 8) | (wh-> i_addr2 - [IEEE80211_ADDR_LEN + [QDF_MAC_ADDR_SIZE - 1]); frm_hdr.da_tail = - (wh->i_addr3[IEEE80211_ADDR_LEN - 2] << 8) | (wh-> + (wh->i_addr3[QDF_MAC_ADDR_SIZE - 2] << 8) | (wh-> i_addr3 - [IEEE80211_ADDR_LEN + [QDF_MAC_ADDR_SIZE - 1]); } else if (dir == IEEE80211_FC1_DIR_FROMDS) { frm_hdr.bssid_tail = - (wh->i_addr2[IEEE80211_ADDR_LEN - 2] << 8) | (wh-> + (wh->i_addr2[QDF_MAC_ADDR_SIZE - 2] << 8) | (wh-> i_addr2 - [IEEE80211_ADDR_LEN + [QDF_MAC_ADDR_SIZE - 1]); frm_hdr.sa_tail = - (wh->i_addr3[IEEE80211_ADDR_LEN - 2] << 8) | (wh-> + (wh->i_addr3[QDF_MAC_ADDR_SIZE - 2] << 8) | (wh-> i_addr3 - [IEEE80211_ADDR_LEN + [QDF_MAC_ADDR_SIZE - 1]); frm_hdr.da_tail = - (wh->i_addr1[IEEE80211_ADDR_LEN - 2] << 8) | (wh-> + (wh->i_addr1[QDF_MAC_ADDR_SIZE - 2] << 8) | (wh-> i_addr1 - [IEEE80211_ADDR_LEN + [QDF_MAC_ADDR_SIZE - 1]); } else { frm_hdr.bssid_tail = - (wh->i_addr3[IEEE80211_ADDR_LEN - 2] << 8) | (wh-> + (wh->i_addr3[QDF_MAC_ADDR_SIZE - 2] << 8) | (wh-> i_addr3 - [IEEE80211_ADDR_LEN + [QDF_MAC_ADDR_SIZE - 1]); frm_hdr.sa_tail = - (wh->i_addr2[IEEE80211_ADDR_LEN - 2] << 8) | (wh-> + (wh->i_addr2[QDF_MAC_ADDR_SIZE - 2] << 8) | (wh-> i_addr2 - [IEEE80211_ADDR_LEN + [QDF_MAC_ADDR_SIZE - 1]); frm_hdr.da_tail = - (wh->i_addr1[IEEE80211_ADDR_LEN - 2] << 8) | (wh-> + (wh->i_addr1[QDF_MAC_ADDR_SIZE - 2] << 8) | (wh-> i_addr1 - [IEEE80211_ADDR_LEN + [QDF_MAC_ADDR_SIZE - 1]); } } @@ -303,7 +303,7 @@ fill_ieee80211_hdr_data(struct cdp_pdev *pdev, qdf_nbuf_peek_header(netbuf, &addr, &len); - if (len < (2 * IEEE80211_ADDR_LEN)) { + if (len < (2 * QDF_MAC_ADDR_SIZE)) { qdf_print("TX frame does not have a valid address"); return; } @@ -315,15 +315,15 @@ fill_ieee80211_hdr_data(struct cdp_pdev *pdev, vap_addr = wma_get_vdev_address_by_vdev_id(vdev_id); - frm_hdr.da_tail = (addr[IEEE80211_ADDR_LEN - 2] << 8) | - (addr[IEEE80211_ADDR_LEN - 1]); + frm_hdr.da_tail = (addr[QDF_MAC_ADDR_SIZE - 2] << 8) | + (addr[QDF_MAC_ADDR_SIZE - 1]); frm_hdr.sa_tail = - (addr[2 * IEEE80211_ADDR_LEN - 2] << 8) | - (addr[2 * IEEE80211_ADDR_LEN - 1]); + (addr[2 * QDF_MAC_ADDR_SIZE - 2] << 8) | + (addr[2 * QDF_MAC_ADDR_SIZE - 1]); if (vap_addr) { frm_hdr.bssid_tail = - (vap_addr[IEEE80211_ADDR_LEN - 2] << 8) | - (vap_addr[IEEE80211_ADDR_LEN - 1]); + (vap_addr[QDF_MAC_ADDR_SIZE - 2] << 8) | + (vap_addr[QDF_MAC_ADDR_SIZE - 1]); } else { frm_hdr.bssid_tail = 0x0000; } diff --git a/wmi/inc/wmi_unified_api.h b/wmi/inc/wmi_unified_api.h index 75125b6e47..1eaf716ad3 100644 --- a/wmi/inc/wmi_unified_api.h +++ b/wmi/inc/wmi_unified_api.h @@ -461,7 +461,7 @@ uint16_t wmi_get_max_msg_len(wmi_unified_t wmi_handle); QDF_STATUS wmi_unified_vdev_create_send(void *wmi_hdl, - uint8_t macaddr[IEEE80211_ADDR_LEN], + uint8_t macaddr[QDF_MAC_ADDR_SIZE], struct vdev_create_params *param); QDF_STATUS wmi_unified_vdev_delete_send(void *wmi_hdl, @@ -483,7 +483,7 @@ QDF_STATUS wmi_unified_vdev_stop_send(void *wmi_hdl, uint8_t vdev_id); QDF_STATUS wmi_unified_vdev_up_send(void *wmi_hdl, - uint8_t bssid[IEEE80211_ADDR_LEN], + uint8_t bssid[QDF_MAC_ADDR_SIZE], struct vdev_up_params *params); QDF_STATUS wmi_unified_vdev_down_send(void *wmi_hdl, @@ -512,22 +512,22 @@ QDF_STATUS wmi_unified_sifs_trigger_send(void *wmi_hdl, QDF_STATUS wmi_unified_peer_delete_send(void *wmi_hdl, uint8_t - peer_addr[IEEE80211_ADDR_LEN], + peer_addr[QDF_MAC_ADDR_SIZE], uint8_t vdev_id); QDF_STATUS wmi_unified_peer_flush_tids_send(void *wmi_hdl, - uint8_t peer_addr[IEEE80211_ADDR_LEN], + uint8_t peer_addr[QDF_MAC_ADDR_SIZE], struct peer_flush_params *param); QDF_STATUS wmi_set_peer_param_send(void *wmi_hdl, - uint8_t peer_addr[IEEE80211_ADDR_LEN], + uint8_t peer_addr[QDF_MAC_ADDR_SIZE], struct peer_set_params *param); QDF_STATUS wmi_unified_peer_create_send(void *wmi_hdl, struct peer_create_params *param); QDF_STATUS wmi_unified_stats_request_send(wmi_unified_t wmi_handle, - uint8_t macaddr[IEEE80211_ADDR_LEN], + uint8_t macaddr[QDF_MAC_ADDR_SIZE], struct stats_request_params *param); QDF_STATUS wmi_unified_green_ap_ps_send(void *wmi_hdl, @@ -569,7 +569,7 @@ QDF_STATUS wmi_unified_peer_based_pktlog_send(void *wmi_hdl, uint8_t enb_dsb); #else QDF_STATUS wmi_unified_packet_log_enable_send(void *wmi_hdl, - uint8_t macaddr[IEEE80211_ADDR_LEN], + uint8_t macaddr[QDF_MAC_ADDR_SIZE], struct packet_enable_params *param); #endif @@ -598,7 +598,7 @@ QDF_STATUS wmi_unified_sta_ps_cmd_send(void *wmi_hdl, struct sta_ps_params *param); QDF_STATUS wmi_unified_ap_ps_cmd_send(void *wmi_hdl, - uint8_t macaddr[IEEE80211_ADDR_LEN], + uint8_t macaddr[QDF_MAC_ADDR_SIZE], struct ap_ps_params *param); QDF_STATUS wmi_unified_scan_start_cmd_send(void *wmi_hdl, @@ -1006,23 +1006,23 @@ QDF_STATUS wmi_unified_remove_beacon_filter_cmd_send(void *wmi_hdl, struct remove_beacon_filter_params *param); QDF_STATUS wmi_unified_addba_clearresponse_cmd_send(void *wmi_hdl, - uint8_t macaddr[IEEE80211_ADDR_LEN], + uint8_t macaddr[QDF_MAC_ADDR_SIZE], struct addba_clearresponse_params *param); QDF_STATUS wmi_unified_addba_send_cmd_send(void *wmi_hdl, - uint8_t macaddr[IEEE80211_ADDR_LEN], + uint8_t macaddr[QDF_MAC_ADDR_SIZE], struct addba_send_params *param); QDF_STATUS wmi_unified_delba_send_cmd_send(void *wmi_hdl, - uint8_t macaddr[IEEE80211_ADDR_LEN], + uint8_t macaddr[QDF_MAC_ADDR_SIZE], struct delba_send_params *param); QDF_STATUS wmi_unified_addba_setresponse_cmd_send(void *wmi_hdl, - uint8_t macaddr[IEEE80211_ADDR_LEN], + uint8_t macaddr[QDF_MAC_ADDR_SIZE], struct addba_setresponse_params *param); QDF_STATUS wmi_unified_singleamsdu_cmd_send(void *wmi_hdl, - uint8_t macaddr[IEEE80211_ADDR_LEN], + uint8_t macaddr[QDF_MAC_ADDR_SIZE], struct singleamsdu_params *param); QDF_STATUS wmi_unified_mu_scan_cmd_send(void *wmi_hdl, diff --git a/wmi/inc/wmi_unified_param.h b/wmi/inc/wmi_unified_param.h index 86b01cee53..2aadc3cebc 100644 --- a/wmi/inc/wmi_unified_param.h +++ b/wmi/inc/wmi_unified_param.h @@ -35,7 +35,6 @@ #define MIN_MAC_HEADER_LEN 24 #define QOS_CONTROL_LEN 2 -#define IEEE80211_ADDR_LEN 6 /* size of 802.11 address */ #define WMI_MAC_MAX_SSID_LENGTH 32 #ifndef CONFIG_HL_SUPPORT #define mgmt_tx_dl_frm_len 64 @@ -715,7 +714,7 @@ struct vdev_up_params { uint16_t assoc_id; uint32_t profile_idx; uint32_t profile_num; - uint8_t trans_bssid[IEEE80211_ADDR_LEN]; + uint8_t trans_bssid[QDF_MAC_ADDR_SIZE]; }; /** @@ -796,8 +795,8 @@ struct vdev_start_params { */ struct vdev_scan_nac_rssi_params { uint32_t vdev_id; - uint8_t bssid_addr[IEEE80211_ADDR_LEN]; - uint8_t client_addr[IEEE80211_ADDR_LEN]; + uint8_t bssid_addr[QDF_MAC_ADDR_SIZE]; + uint8_t client_addr[QDF_MAC_ADDR_SIZE]; uint32_t chan_num; uint32_t action; /* WMI_FILTER_NAC_RSSI_ACTION */ }; @@ -1324,7 +1323,7 @@ struct peer_assoc_params { bool amsdu_disable; /* Use common structure */ #endif - uint8_t peer_mac[IEEE80211_ADDR_LEN]; + uint8_t peer_mac[QDF_MAC_ADDR_SIZE]; bool he_flag; bool twt_requester; bool twt_responder; @@ -1654,7 +1653,7 @@ struct sta_uapsd_params { */ struct sta_uapsd_trig_params { uint32_t vdevid; - uint8_t peer_addr[IEEE80211_ADDR_LEN]; + uint8_t peer_addr[QDF_MAC_ADDR_SIZE]; struct sta_uapsd_params *auto_triggerparam; uint32_t num_ac; }; @@ -1794,7 +1793,7 @@ struct set_key_params { uint8_t vdev_id; uint16_t key_len; uint32_t key_idx; - uint8_t peer_mac[IEEE80211_ADDR_LEN]; + uint8_t peer_mac[QDF_MAC_ADDR_SIZE]; uint32_t key_flags; uint32_t key_cipher; uint32_t key_txmic_len; @@ -2449,7 +2448,7 @@ struct delts_req_info { struct del_ts_params { uint16_t staIdx; uint16_t tspecIdx; - uint8_t bssId[IEEE80211_ADDR_LEN]; + uint8_t bssId[QDF_MAC_ADDR_SIZE]; uint8_t sessionId; uint8_t userPrio; #ifdef WLAN_FEATURE_ROAM_OFFLOAD @@ -3078,7 +3077,7 @@ typedef struct { struct set_qdepth_thresh_params { uint32_t pdev_id; uint32_t vdev_id; - uint8_t mac_addr[IEEE80211_ADDR_LEN]; + uint8_t mac_addr[QDF_MAC_ADDR_SIZE]; uint32_t num_of_msduq_updates; msduq_update_params update_params[QDEPTH_THRESH_MAX_UPDATES]; }; @@ -3091,7 +3090,7 @@ struct set_qdepth_thresh_params { */ struct peer_chan_width_switch_info { - uint8_t mac_addr[IEEE80211_ADDR_LEN]; + uint8_t mac_addr[QDF_MAC_ADDR_SIZE]; uint32_t chan_width; }; @@ -3935,7 +3934,7 @@ typedef struct { * @req_id: requested id */ struct rtt_meas_req_test_params { - uint8_t peer[IEEE80211_ADDR_LEN]; + uint8_t peer[QDF_MAC_ADDR_SIZE]; int req_frame_type; int req_bw; int req_preamble; @@ -4143,7 +4142,7 @@ typedef struct { * @rx_count: rx count */ struct wmi_host_peer_adv_stats { - uint8_t peer_macaddr[WLAN_MACADDR_LEN]; + uint8_t peer_macaddr[QDF_MAC_ADDR_SIZE]; uint32_t fcs_count; uint64_t rx_bytes; uint32_t rx_count; @@ -5498,8 +5497,8 @@ typedef struct { */ typedef struct { uint32_t event_type[4]; - u_int8_t peer_mac[IEEE80211_ADDR_LEN]; - u_int8_t dest_mac[IEEE80211_ADDR_LEN]; + u_int8_t peer_mac[QDF_MAC_ADDR_SIZE]; + u_int8_t dest_mac[QDF_MAC_ADDR_SIZE]; uint32_t vdev_id; } wds_addr_event_t; /** @@ -5905,7 +5904,7 @@ typedef struct { * @pdev_id: pdev_id */ typedef struct { - uint8_t peer_macaddr[IEEE80211_ADDR_LEN]; + uint8_t peer_macaddr[QDF_MAC_ADDR_SIZE]; uint32_t reason; uint32_t rssi; } wmi_host_peer_sta_kickout_event; @@ -5917,7 +5916,7 @@ typedef struct { * @pdev_id: pdev_id */ typedef struct { - uint8_t peer_macaddr[IEEE80211_ADDR_LEN]; + uint8_t peer_macaddr[QDF_MAC_ADDR_SIZE]; uint32_t peer_ps_state; } wmi_host_peer_sta_ps_statechange_event; @@ -6530,7 +6529,7 @@ typedef struct { v3_tm_start:1, num_ap:4; uint16_t result; - uint8_t dest_mac[IEEE80211_ADDR_LEN]; + uint8_t dest_mac[QDF_MAC_ADDR_SIZE]; } wmi_host_rtt_event_hdr; /** @@ -6962,7 +6961,7 @@ enum rcpi_measurement_type { struct rcpi_req { uint32_t vdev_id; enum rcpi_measurement_type measurement_type; - uint8_t mac_addr[IEEE80211_ADDR_LEN]; + uint8_t mac_addr[QDF_MAC_ADDR_SIZE]; }; /** @@ -6975,7 +6974,7 @@ struct rcpi_req { struct rcpi_res { uint32_t vdev_id; enum rcpi_measurement_type measurement_type; - uint8_t mac_addr[IEEE80211_ADDR_LEN]; + uint8_t mac_addr[QDF_MAC_ADDR_SIZE]; int32_t rcpi_value; }; @@ -7419,8 +7418,8 @@ struct wmi_host_obss_spatial_reuse_set_def_thresh { * @flags: flags */ struct wdsentry { - u_int8_t peer_mac[IEEE80211_ADDR_LEN]; - u_int8_t wds_mac[IEEE80211_ADDR_LEN]; + u_int8_t peer_mac[QDF_MAC_ADDR_SIZE]; + u_int8_t wds_mac[QDF_MAC_ADDR_SIZE]; uint32_t flags; }; @@ -7477,7 +7476,7 @@ struct wmi_obss_detect_info { uint32_t vdev_id; enum wmi_obss_detection_reason reason; uint32_t matched_detection_masks; - uint8_t matched_bssid_addr[IEEE80211_ADDR_LEN]; + uint8_t matched_bssid_addr[QDF_MAC_ADDR_SIZE]; }; #ifdef QCA_SUPPORT_CP_STATS diff --git a/wmi/inc/wmi_unified_priv.h b/wmi/inc/wmi_unified_priv.h index fac3760438..b3252ea13f 100644 --- a/wmi/inc/wmi_unified_priv.h +++ b/wmi/inc/wmi_unified_priv.h @@ -265,7 +265,7 @@ struct wmi_wq_dbg_info { struct wmi_ops { QDF_STATUS (*send_vdev_create_cmd)(wmi_unified_t wmi_handle, - uint8_t macaddr[IEEE80211_ADDR_LEN], + uint8_t macaddr[QDF_MAC_ADDR_SIZE], struct vdev_create_params *param); QDF_STATUS (*send_vdev_delete_cmd)(wmi_unified_t wmi_handle, @@ -291,11 +291,11 @@ QDF_STATUS (*send_hidden_ssid_vdev_restart_cmd)(wmi_unified_t wmi_handle, struct hidden_ssid_vdev_restart_params *restart_params); QDF_STATUS (*send_peer_flush_tids_cmd)(wmi_unified_t wmi, - uint8_t peer_addr[IEEE80211_ADDR_LEN], + uint8_t peer_addr[QDF_MAC_ADDR_SIZE], struct peer_flush_params *param); QDF_STATUS (*send_peer_delete_cmd)(wmi_unified_t wmi, - uint8_t peer_addr[IEEE80211_ADDR_LEN], + uint8_t peer_addr[QDF_MAC_ADDR_SIZE], uint8_t vdev_id); QDF_STATUS @@ -305,11 +305,11 @@ QDF_STATUS uint16_t *peer_id_list); QDF_STATUS (*send_peer_param_cmd)(wmi_unified_t wmi, - uint8_t peer_addr[IEEE80211_ADDR_LEN], + uint8_t peer_addr[QDF_MAC_ADDR_SIZE], struct peer_set_params *param); QDF_STATUS (*send_vdev_up_cmd)(wmi_unified_t wmi, - uint8_t bssid[IEEE80211_ADDR_LEN], + uint8_t bssid[QDF_MAC_ADDR_SIZE], struct vdev_up_params *params); QDF_STATUS (*send_peer_create_cmd)(wmi_unified_t wmi, @@ -373,7 +373,7 @@ QDF_STATUS (*send_vdev_sifs_trigger_cmd)(wmi_unified_t wmi_handle, struct sifs_trigger_param *param); QDF_STATUS (*send_stats_request_cmd)(wmi_unified_t wmi_handle, - uint8_t macaddr[IEEE80211_ADDR_LEN], + uint8_t macaddr[QDF_MAC_ADDR_SIZE], struct stats_request_params *param); #ifdef CONFIG_WIN @@ -381,7 +381,7 @@ QDF_STATUS (*send_packet_log_enable_cmd)(wmi_unified_t wmi_handle, WMI_HOST_PKTLOG_EVENT PKTLOG_EVENT, uint8_t mac_id); #else QDF_STATUS (*send_packet_log_enable_cmd)(wmi_unified_t wmi_handle, - uint8_t macaddr[IEEE80211_ADDR_LEN], + uint8_t macaddr[QDF_MAC_ADDR_SIZE], struct packet_enable_params *param); #endif @@ -1105,15 +1105,15 @@ QDF_STATUS (*send_smart_ant_set_rx_ant_cmd)(wmi_unified_t wmi_handle, struct smart_ant_rx_ant_params *param); QDF_STATUS (*send_smart_ant_set_tx_ant_cmd)(wmi_unified_t wmi_handle, - uint8_t macaddr[IEEE80211_ADDR_LEN], + uint8_t macaddr[QDF_MAC_ADDR_SIZE], struct smart_ant_tx_ant_params *param); QDF_STATUS (*send_smart_ant_set_training_info_cmd)(wmi_unified_t wmi_handle, - uint8_t macaddr[IEEE80211_ADDR_LEN], + uint8_t macaddr[QDF_MAC_ADDR_SIZE], struct smart_ant_training_info_params *param); QDF_STATUS (*send_smart_ant_set_node_config_cmd)(wmi_unified_t wmi_handle, - uint8_t macaddr[IEEE80211_ADDR_LEN], + uint8_t macaddr[QDF_MAC_ADDR_SIZE], struct smart_ant_node_config_params *param); #endif @@ -1133,7 +1133,7 @@ QDF_STATUS (*send_thermal_mitigation_param_cmd)(wmi_unified_t wmi_handle, struct thermal_mitigation_params *param); QDF_STATUS (*send_vdev_set_neighbour_rx_cmd)(wmi_unified_t wmi_handle, - uint8_t macaddr[IEEE80211_ADDR_LEN], + uint8_t macaddr[QDF_MAC_ADDR_SIZE], struct set_neighbour_rx_params *param); QDF_STATUS (*send_vdev_set_fwtest_param_cmd)(wmi_unified_t wmi_handle, @@ -1178,32 +1178,32 @@ QDF_STATUS (*send_remove_beacon_filter_cmd)(wmi_unified_t wmi_handle, struct remove_beacon_filter_params *param); /* QDF_STATUS (*send_mgmt_cmd)(wmi_unified_t wmi_handle, - uint8_t macaddr[IEEE80211_ADDR_LEN], + uint8_t macaddr[QDF_MAC_ADDR_SIZE], struct mgmt_params *param); */ QDF_STATUS (*send_addba_clearresponse_cmd)(wmi_unified_t wmi_handle, - uint8_t macaddr[IEEE80211_ADDR_LEN], + uint8_t macaddr[QDF_MAC_ADDR_SIZE], struct addba_clearresponse_params *param); QDF_STATUS (*send_addba_send_cmd)(wmi_unified_t wmi_handle, - uint8_t macaddr[IEEE80211_ADDR_LEN], + uint8_t macaddr[QDF_MAC_ADDR_SIZE], struct addba_send_params *param); QDF_STATUS (*send_delba_send_cmd)(wmi_unified_t wmi_handle, - uint8_t macaddr[IEEE80211_ADDR_LEN], + uint8_t macaddr[QDF_MAC_ADDR_SIZE], struct delba_send_params *param); QDF_STATUS (*send_addba_setresponse_cmd)(wmi_unified_t wmi_handle, - uint8_t macaddr[IEEE80211_ADDR_LEN], + uint8_t macaddr[QDF_MAC_ADDR_SIZE], struct addba_setresponse_params *param); QDF_STATUS (*send_singleamsdu_cmd)(wmi_unified_t wmi_handle, - uint8_t macaddr[IEEE80211_ADDR_LEN], + uint8_t macaddr[QDF_MAC_ADDR_SIZE], struct singleamsdu_params *param); QDF_STATUS (*send_set_qboost_param_cmd)(wmi_unified_t wmi_handle, - uint8_t macaddr[IEEE80211_ADDR_LEN], + uint8_t macaddr[QDF_MAC_ADDR_SIZE], struct set_qboost_params *param); QDF_STATUS (*send_mu_scan_cmd)(wmi_unified_t wmi_handle, diff --git a/wmi/inc/wmi_unified_roam_param.h b/wmi/inc/wmi_unified_roam_param.h index 716f6b078b..1f56c4ff6a 100644 --- a/wmi/inc/wmi_unified_roam_param.h +++ b/wmi/inc/wmi_unified_roam_param.h @@ -430,7 +430,7 @@ struct ap_profile_params { */ struct wmi_roam_invoke_cmd { uint32_t vdev_id; - uint8_t bssid[IEEE80211_ADDR_LEN]; + uint8_t bssid[QDF_MAC_ADDR_SIZE]; uint32_t channel; uint32_t frame_len; uint8_t *frame_buf; diff --git a/wmi/inc/wmi_unified_twt_param.h b/wmi/inc/wmi_unified_twt_param.h index 5ccc10f2fc..f64aa59a4a 100644 --- a/wmi/inc/wmi_unified_twt_param.h +++ b/wmi/inc/wmi_unified_twt_param.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 The Linux Foundation. All rights reserved. + * Copyright (c) 2018-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 @@ -163,7 +163,7 @@ enum WMI_HOST_TWT_COMMAND { */ struct wmi_twt_add_dialog_param { uint32_t vdev_id; - uint8_t peer_macaddr[IEEE80211_ADDR_LEN]; + uint8_t peer_macaddr[QDF_MAC_ADDR_SIZE]; uint32_t dialog_id; uint32_t wake_intvl_us; uint32_t wake_intvl_mantis; @@ -212,7 +212,7 @@ enum WMI_HOST_ADD_TWT_STATUS { */ struct wmi_twt_add_dialog_complete_event_param { uint32_t vdev_id; - uint8_t peer_macaddr[IEEE80211_ADDR_LEN]; + uint8_t peer_macaddr[QDF_MAC_ADDR_SIZE]; uint32_t dialog_id; uint32_t status; }; @@ -224,7 +224,7 @@ struct wmi_twt_add_dialog_complete_event_param { */ struct wmi_twt_del_dialog_param { uint32_t vdev_id; - uint8_t peer_macaddr[IEEE80211_ADDR_LEN]; + uint8_t peer_macaddr[QDF_MAC_ADDR_SIZE]; uint32_t dialog_id; }; @@ -258,7 +258,7 @@ enum WMI_HOST_DEL_TWT_STATUS { */ struct wmi_twt_del_dialog_complete_event_param { uint32_t vdev_id; - uint8_t peer_macaddr[IEEE80211_ADDR_LEN]; + uint8_t peer_macaddr[QDF_MAC_ADDR_SIZE]; uint32_t dialog_id; uint32_t status; }; @@ -270,7 +270,7 @@ struct wmi_twt_del_dialog_complete_event_param { */ struct wmi_twt_pause_dialog_cmd_param { uint32_t vdev_id; - uint8_t peer_macaddr[IEEE80211_ADDR_LEN]; + uint8_t peer_macaddr[QDF_MAC_ADDR_SIZE]; uint32_t dialog_id; }; @@ -304,7 +304,7 @@ enum WMI_HOST_PAUSE_TWT_STATUS { */ struct wmi_twt_pause_dialog_complete_event_param { uint32_t vdev_id; - uint8_t peer_macaddr[IEEE80211_ADDR_LEN]; + uint8_t peer_macaddr[QDF_MAC_ADDR_SIZE]; uint32_t dialog_id; uint32_t status; }; @@ -319,7 +319,7 @@ struct wmi_twt_pause_dialog_complete_event_param { */ struct wmi_twt_resume_dialog_cmd_param { uint32_t vdev_id; - uint8_t peer_macaddr[IEEE80211_ADDR_LEN]; + uint8_t peer_macaddr[QDF_MAC_ADDR_SIZE]; uint32_t dialog_id; uint32_t sp_offset_us; uint32_t next_twt_size; @@ -357,7 +357,7 @@ enum WMI_HOST_RESUME_TWT_STATUS { */ struct wmi_twt_resume_dialog_complete_event_param { uint32_t vdev_id; - uint8_t peer_macaddr[IEEE80211_ADDR_LEN]; + uint8_t peer_macaddr[QDF_MAC_ADDR_SIZE]; uint32_t dialog_id; uint32_t status; }; diff --git a/wmi/src/wmi_unified_api.c b/wmi/src/wmi_unified_api.c index 70f8a6abd5..4cd4cfd61c 100644 --- a/wmi/src/wmi_unified_api.c +++ b/wmi/src/wmi_unified_api.c @@ -62,7 +62,7 @@ static const wmi_host_channel_width mode_to_width[WMI_HOST_MODE_MAX] = { * Return: QDF_STATUS_SUCCESS on success and QDF_STATUS_E_FAILURE for failure */ QDF_STATUS wmi_unified_vdev_create_send(void *wmi_hdl, - uint8_t macaddr[IEEE80211_ADDR_LEN], + uint8_t macaddr[QDF_MAC_ADDR_SIZE], struct vdev_create_params *param) { wmi_unified_t wmi_handle = (wmi_unified_t) wmi_hdl; @@ -209,7 +209,7 @@ QDF_STATUS wmi_unified_hidden_ssid_vdev_restart_send(void *wmi_hdl, * Return: QDF_STATUS_SUCCESS on success and QDF_STATUS_E_FAILURE for failure */ QDF_STATUS wmi_unified_peer_flush_tids_send(void *wmi_hdl, - uint8_t peer_addr[IEEE80211_ADDR_LEN], + uint8_t peer_addr[QDF_MAC_ADDR_SIZE], struct peer_flush_params *param) { wmi_unified_t wmi_handle = (wmi_unified_t) wmi_hdl; @@ -231,7 +231,7 @@ QDF_STATUS wmi_unified_peer_flush_tids_send(void *wmi_hdl, */ QDF_STATUS wmi_unified_peer_delete_send(void *wmi_hdl, uint8_t - peer_addr[IEEE80211_ADDR_LEN], + peer_addr[QDF_MAC_ADDR_SIZE], uint8_t vdev_id) { wmi_unified_t wmi_handle = (wmi_unified_t) wmi_hdl; @@ -252,7 +252,7 @@ QDF_STATUS wmi_unified_peer_delete_send(void *wmi_hdl, * Return: QDF_STATUS_SUCCESS on success and QDF_STATUS_E_FAILURE for failure */ QDF_STATUS wmi_set_peer_param_send(void *wmi_hdl, - uint8_t peer_addr[IEEE80211_ADDR_LEN], + uint8_t peer_addr[QDF_MAC_ADDR_SIZE], struct peer_set_params *param) { wmi_unified_t wmi_handle = (wmi_unified_t) wmi_hdl; @@ -273,7 +273,7 @@ QDF_STATUS wmi_set_peer_param_send(void *wmi_hdl, * Return: QDF_STATUS_SUCCESS on success and QDF_STATUS_E_FAILURE for failure */ QDF_STATUS wmi_unified_vdev_up_send(void *wmi_hdl, - uint8_t bssid[IEEE80211_ADDR_LEN], + uint8_t bssid[QDF_MAC_ADDR_SIZE], struct vdev_up_params *params) { wmi_unified_t wmi_handle = (wmi_unified_t) wmi_hdl; @@ -682,7 +682,7 @@ QDF_STATUS wmi_unified_sifs_trigger_send(void *wmi_hdl, * Return: QDF_STATUS_SUCCESS on success and QDF_STATUS_E_FAILURE for failure */ QDF_STATUS wmi_unified_stats_request_send(wmi_unified_t wmi_handle, - uint8_t macaddr[IEEE80211_ADDR_LEN], + uint8_t macaddr[QDF_MAC_ADDR_SIZE], struct stats_request_params *param) { if (wmi_handle->ops->send_stats_request_cmd) @@ -702,7 +702,7 @@ QDF_STATUS wmi_unified_stats_request_send(wmi_unified_t wmi_handle, * Return: QDF_STATUS_SUCCESS on success and QDF_STATUS_E_FAILURE for failure */ QDF_STATUS wmi_unified_packet_log_enable_send(void *wmi_hdl, - uint8_t macaddr[IEEE80211_ADDR_LEN], + uint8_t macaddr[QDF_MAC_ADDR_SIZE], struct packet_enable_params *param) { wmi_unified_t wmi_handle = (wmi_unified_t) wmi_hdl; @@ -2310,7 +2310,7 @@ QDF_STATUS wmi_unified_remove_beacon_filter_cmd_send(void *wmi_hdl, */ #if 0 QDF_STATUS wmi_unified_mgmt_cmd_send(void *wmi_hdl, - uint8_t macaddr[IEEE80211_ADDR_LEN], + uint8_t macaddr[QDF_MAC_ADDR_SIZE], struct mgmt_params *param) { wmi_unified_t wmi_handle = (wmi_unified_t) wmi_hdl; @@ -2332,7 +2332,7 @@ QDF_STATUS wmi_unified_mgmt_cmd_send(void *wmi_hdl, * @return QDF_STATUS_SUCCESS on success and QDF_STATUS_E_FAILURE for failure */ QDF_STATUS wmi_unified_addba_clearresponse_cmd_send(void *wmi_hdl, - uint8_t macaddr[IEEE80211_ADDR_LEN], + uint8_t macaddr[QDF_MAC_ADDR_SIZE], struct addba_clearresponse_params *param) { wmi_unified_t wmi_handle = (wmi_unified_t) wmi_hdl; @@ -2353,7 +2353,7 @@ QDF_STATUS wmi_unified_addba_clearresponse_cmd_send(void *wmi_hdl, * @return QDF_STATUS_SUCCESS on success and QDF_STATUS_E_FAILURE for failure */ QDF_STATUS wmi_unified_addba_send_cmd_send(void *wmi_hdl, - uint8_t macaddr[IEEE80211_ADDR_LEN], + uint8_t macaddr[QDF_MAC_ADDR_SIZE], struct addba_send_params *param) { wmi_unified_t wmi_handle = (wmi_unified_t) wmi_hdl; @@ -2374,7 +2374,7 @@ QDF_STATUS wmi_unified_addba_send_cmd_send(void *wmi_hdl, * @return QDF_STATUS_SUCCESS on success and QDF_STATUS_E_FAILURE for failure */ QDF_STATUS wmi_unified_delba_send_cmd_send(void *wmi_hdl, - uint8_t macaddr[IEEE80211_ADDR_LEN], + uint8_t macaddr[QDF_MAC_ADDR_SIZE], struct delba_send_params *param) { wmi_unified_t wmi_handle = (wmi_unified_t) wmi_hdl; @@ -2395,7 +2395,7 @@ QDF_STATUS wmi_unified_delba_send_cmd_send(void *wmi_hdl, * @return QDF_STATUS_SUCCESS on success and QDF_STATUS_E_FAILURE for failure */ QDF_STATUS wmi_unified_addba_setresponse_cmd_send(void *wmi_hdl, - uint8_t macaddr[IEEE80211_ADDR_LEN], + uint8_t macaddr[QDF_MAC_ADDR_SIZE], struct addba_setresponse_params *param) { wmi_unified_t wmi_handle = (wmi_unified_t) wmi_hdl; @@ -2416,7 +2416,7 @@ QDF_STATUS wmi_unified_addba_setresponse_cmd_send(void *wmi_hdl, * @return QDF_STATUS_SUCCESS on success and QDF_STATUS_E_FAILURE for failure */ QDF_STATUS wmi_unified_singleamsdu_cmd_send(void *wmi_hdl, - uint8_t macaddr[IEEE80211_ADDR_LEN], + uint8_t macaddr[QDF_MAC_ADDR_SIZE], struct singleamsdu_params *param) { wmi_unified_t wmi_handle = (wmi_unified_t) wmi_hdl; diff --git a/wmi/src/wmi_unified_ocb_ut.c b/wmi/src/wmi_unified_ocb_ut.c index bbaf59aa0b..ed4d28a350 100644 --- a/wmi/src/wmi_unified_ocb_ut.c +++ b/wmi/src/wmi_unified_ocb_ut.c @@ -51,7 +51,7 @@ target_if_ocb_get_rx_ops(struct wlan_objmgr_psoc *psoc) * Return: QDF_STATUS_SUCCESS for success or error code */ static QDF_STATUS fake_vdev_create_cmd_tlv(wmi_unified_t wmi_handle, - uint8_t macaddr[IEEE80211_ADDR_LEN], + uint8_t macaddr[QDF_MAC_ADDR_SIZE], struct vdev_create_params *param) { WMI_LOGP("%s : called", __func__); @@ -378,7 +378,7 @@ static QDF_STATUS fake_peer_create_cmd_tlv(wmi_unified_t wmi, * Return: QDF_STATUS_SUCCESS for success or error code */ static QDF_STATUS fake_peer_delete_cmd_tlv(wmi_unified_t wmi, - uint8_t peer_addr[IEEE80211_ADDR_LEN], + uint8_t peer_addr[QDF_MAC_ADDR_SIZE], uint8_t vdev_id) { WMI_LOGP("%s : called", __func__); diff --git a/wmi/src/wmi_unified_tlv.c b/wmi/src/wmi_unified_tlv.c index 65f3d173de..dc1f9cc8be 100644 --- a/wmi/src/wmi_unified_tlv.c +++ b/wmi/src/wmi_unified_tlv.c @@ -176,7 +176,7 @@ qdf_export_symbol(wmi_mtrace); * Return: QDF_STATUS_SUCCESS for success or error code */ static QDF_STATUS send_vdev_create_cmd_tlv(wmi_unified_t wmi_handle, - uint8_t macaddr[IEEE80211_ADDR_LEN], + uint8_t macaddr[QDF_MAC_ADDR_SIZE], struct vdev_create_params *param) { wmi_vdev_create_cmd_fixed_param *cmd; @@ -647,7 +647,7 @@ static QDF_STATUS send_hidden_ssid_vdev_restart_cmd_tlv(wmi_unified_t wmi_handle * Return: 0 for success or error code */ static QDF_STATUS send_peer_flush_tids_cmd_tlv(wmi_unified_t wmi, - uint8_t peer_addr[IEEE80211_ADDR_LEN], + uint8_t peer_addr[QDF_MAC_ADDR_SIZE], struct peer_flush_params *param) { wmi_peer_flush_tids_cmd_fixed_param *cmd; @@ -688,7 +688,7 @@ static QDF_STATUS send_peer_flush_tids_cmd_tlv(wmi_unified_t wmi, * Return: QDF_STATUS_SUCCESS for success or error code */ static QDF_STATUS send_peer_delete_cmd_tlv(wmi_unified_t wmi, - uint8_t peer_addr[IEEE80211_ADDR_LEN], + uint8_t peer_addr[QDF_MAC_ADDR_SIZE], uint8_t vdev_id) { wmi_peer_delete_cmd_fixed_param *cmd; @@ -858,7 +858,7 @@ static void crash_on_send_peer_rx_reorder_queue_remove_cmd(void) * Return: QDF_STATUS_SUCCESS for success or error code */ static QDF_STATUS send_peer_param_cmd_tlv(wmi_unified_t wmi, - uint8_t peer_addr[IEEE80211_ADDR_LEN], + uint8_t peer_addr[QDF_MAC_ADDR_SIZE], struct peer_set_params *param) { wmi_peer_set_param_cmd_fixed_param *cmd; @@ -905,7 +905,7 @@ static QDF_STATUS send_peer_param_cmd_tlv(wmi_unified_t wmi, * Return: QDF_STATUS_SUCCESS for success or error code */ static QDF_STATUS send_vdev_up_cmd_tlv(wmi_unified_t wmi, - uint8_t bssid[IEEE80211_ADDR_LEN], + uint8_t bssid[QDF_MAC_ADDR_SIZE], struct vdev_up_params *params) { wmi_vdev_up_cmd_fixed_param *cmd; @@ -1669,7 +1669,7 @@ static QDF_STATUS send_vdev_set_param_cmd_tlv(wmi_unified_t wmi_handle, * Return: 0 on success and -ve on failure. */ static QDF_STATUS send_stats_request_cmd_tlv(wmi_unified_t wmi_handle, - uint8_t macaddr[IEEE80211_ADDR_LEN], + uint8_t macaddr[QDF_MAC_ADDR_SIZE], struct stats_request_params *param) { int32_t ret; @@ -1854,7 +1854,7 @@ static QDF_STATUS send_packet_log_disable_cmd_tlv(wmi_unified_t wmi_handle, * Return: QDF_STATUS. */ static QDF_STATUS send_packet_log_enable_cmd_tlv(wmi_unified_t wmi_handle, - uint8_t macaddr[IEEE80211_ADDR_LEN], + uint8_t macaddr[QDF_MAC_ADDR_SIZE], struct packet_enable_params *param) { return QDF_STATUS_SUCCESS; @@ -7323,7 +7323,7 @@ static QDF_STATUS init_cmd_send_tlv(wmi_unified_t wmi_handle, */ static QDF_STATUS send_addba_send_cmd_tlv(wmi_unified_t wmi_handle, - uint8_t macaddr[IEEE80211_ADDR_LEN], + uint8_t macaddr[QDF_MAC_ADDR_SIZE], struct addba_send_params *param) { wmi_addba_send_cmd_fixed_param *cmd; @@ -7370,7 +7370,7 @@ send_addba_send_cmd_tlv(wmi_unified_t wmi_handle, */ static QDF_STATUS send_delba_send_cmd_tlv(wmi_unified_t wmi_handle, - uint8_t macaddr[IEEE80211_ADDR_LEN], + uint8_t macaddr[QDF_MAC_ADDR_SIZE], struct delba_send_params *param) { wmi_delba_send_cmd_fixed_param *cmd; @@ -7417,7 +7417,7 @@ send_delba_send_cmd_tlv(wmi_unified_t wmi_handle, */ static QDF_STATUS send_addba_clearresponse_cmd_tlv(wmi_unified_t wmi_handle, - uint8_t macaddr[IEEE80211_ADDR_LEN], + uint8_t macaddr[QDF_MAC_ADDR_SIZE], struct addba_clearresponse_params *param) { wmi_addba_clear_resp_cmd_fixed_param *cmd;