From a32dad7d97eadb69fcddc5fdb3dd98e684a7a870 Mon Sep 17 00:00:00 2001 From: Martin Kaiser Date: Sun, 3 Apr 2022 18:45:25 +0200 Subject: [PATCH] staging: r8188eu: use ieee80211 structs for addresses Map the incoming frame data to a struct ieee80211_hdr and extract the addresses. Signed-off-by: Martin Kaiser Link: https://lore.kernel.org/r/20220403164526.357371-5-martin@kaiser.cx Signed-off-by: Greg Kroah-Hartman --- drivers/staging/r8188eu/core/rtw_recv.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_recv.c b/drivers/staging/r8188eu/core/rtw_recv.c index 3983477..a8ab1be 100644 --- a/drivers/staging/r8188eu/core/rtw_recv.c +++ b/drivers/staging/r8188eu/core/rtw_recv.c @@ -801,22 +801,21 @@ static void validate_recv_ctrl_frame(struct adapter *padapter, struct rx_pkt_attrib *pattrib = &precv_frame->attrib; struct sta_priv *pstapriv = &padapter->stapriv; u8 *pframe = precv_frame->rx_data; - __le16 fc = *(__le16 *)pframe; - /* uint len = precv_frame->len; */ u16 aid; + struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)precv_frame->rx_data; u8 wmmps_ac; struct sta_info *psta; /* receive the frames that ra(a1) is my address */ - if (memcmp(GetAddr1Ptr(pframe), myid(&padapter->eeprompriv), ETH_ALEN)) + if (memcmp(hdr->addr1, myid(&padapter->eeprompriv), ETH_ALEN)) return; /* only handle ps-poll */ - if (!ieee80211_is_pspoll(fc)) + if (!ieee80211_is_pspoll(hdr->frame_control)) return; aid = GetAid(pframe); - psta = rtw_get_stainfo(pstapriv, GetAddr2Ptr(pframe)); + psta = rtw_get_stainfo(pstapriv, hdr->addr2); if (!psta || psta->aid != aid) return; -- 2.7.4