samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacmn: Consolidate multiple MAC_ADDR_LEN to QDF_MAC_ADDR_SIZE

Browse Source 
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:
Srinivas Girigowda
2019-02-27 12:28:13 -08:00
committed by nshrivas
parent fdea3c7af7
commit 2751b6d2b3
34 changed files with 225 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
utils/pktlog/pktlog_internal.c
View File

@@ -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;
}