staging: r8188eu: use ieee80211 structs for addresses
authorMartin Kaiser <martin@kaiser.cx>
Sun, 3 Apr 2022 16:45:25 +0000 (18:45 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 4 Apr 2022 14:31:07 +0000 (16:31 +0200)
Map the incoming frame data to a struct ieee80211_hdr and extract
the addresses.

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20220403164526.357371-5-martin@kaiser.cx
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/r8188eu/core/rtw_recv.c

index 3983477..a8ab1be 100644 (file)
@@ -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;