staging: r8188eu: use ieee80211 struct for aid

Remove the GetAid macro and map the frame data to a struct
ieee80211_pspoll instead. We can then read the aid component.

psta->aid is in host endianness and has a 0x3FFF mask applied. We have to
convert our read value as well and apply the mask before we compare it to
psta->aid.

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20220403164526.357371-6-martin@kaiser.cx
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/core/rtw_recv.c b/drivers/staging/r8188eu/core/rtw_recv.c
index a8ab1be33cfbecddc6796c124c3e8a312a6cdda7..9f0bb29c9c56263a6ba0a72425cc625c3a4f17df 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_recv.c
+++ b/drivers/staging/r8188eu/core/rtw_recv.c
@@ -800,9 +800,8 @@ 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;
-       u16 aid;
        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)precv_frame->rx_data;
+       struct ieee80211_pspoll *pspoll = (struct ieee80211_pspoll *)hdr;
        u8 wmmps_ac;
        struct sta_info *psta;
 
@@ -814,10 +813,8 @@ static void validate_recv_ctrl_frame(struct adapter *padapter,
        if (!ieee80211_is_pspoll(hdr->frame_control))
                return;
 
-       aid = GetAid(pframe);
        psta = rtw_get_stainfo(pstapriv, hdr->addr2);
-
-       if (!psta || psta->aid != aid)
+       if (!psta || psta->aid != (le16_to_cpu(pspoll->aid) & 0x3FFF))
                return;
 
        /* for rx pkt statistics */

diff --git a/drivers/staging/r8188eu/include/wifi.h b/drivers/staging/r8188eu/include/wifi.h
index e10cf17d6aa0fc4fe274b481e65de80f652913b8..eb3cb1fb285fb61fed97af6e20ab096ea613b9c4 100644 (file)
--- a/drivers/staging/r8188eu/include/wifi.h
+++ b/drivers/staging/r8188eu/include/wifi.h
@@ -228,8 +228,6 @@ enum WIFI_REG_DOMAIN {
 #define SetAMsdu(pbuf, amsdu)  \
        *(__le16 *)(pbuf) |= cpu_to_le16((amsdu & 1) << 7)
 
-#define GetAid(pbuf)   (le16_to_cpu(*(__le16 *)((size_t)(pbuf) + 2)) & 0x3fff)
-
 #define GetTid(pbuf)   (le16_to_cpu(*(__le16 *)((size_t)(pbuf) +       \
                        (((GetToDs(pbuf)<<1) | GetFrDs(pbuf)) == 3 ?    \
                        30 : 24))) & 0x000f)