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
This commit is contained in:
@@ -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;
|
||||
|
||||
|
@@ -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 */
|
||||
|
Reference in New Issue
Block a user