From: Jes Sorensen Date: Fri, 9 May 2014 13:03:34 +0000 (+0200) Subject: staging: rtl8723au: Use struct ieee80211_pspoll to obtain 'aid' X-Git-Tag: firefly_0821_release~176^2~3465^2~39^2~987 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c51e886fe17808d67ad05748d0c542c51f057283;p=firefly-linux-kernel-4.4.55.git staging: rtl8723au: Use struct ieee80211_pspoll to obtain 'aid' Signed-off-by: Jes Sorensen Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8723au/core/rtw_recv.c b/drivers/staging/rtl8723au/core/rtw_recv.c index 3376a65d956a..0999cf2311c7 100644 --- a/drivers/staging/rtl8723au/core/rtw_recv.c +++ b/drivers/staging/rtl8723au/core/rtw_recv.c @@ -1119,7 +1119,6 @@ static int validate_recv_ctrl_frame(struct rtw_adapter *padapter, struct sta_priv *pstapriv = &padapter->stapriv; struct sk_buff *skb = precv_frame->pkt; struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data; - u8 *pframe = skb->data; if (!ieee80211_is_ctl(hdr->frame_control)) return _FAIL; @@ -1130,14 +1129,15 @@ static int validate_recv_ctrl_frame(struct rtw_adapter *padapter, /* only handle ps-poll */ if (ieee80211_is_pspoll(hdr->frame_control)) { + struct ieee80211_pspoll *psp = (struct ieee80211_pspoll *)hdr; u16 aid; u8 wmmps_ac = 0; struct sta_info *psta = NULL; - aid = GetAid(pframe); + aid = le16_to_cpu(psp->aid) & 0x3fff; psta = rtw_get_stainfo23a(pstapriv, hdr->addr2); - if ((!psta) || (psta->aid != aid)) + if (!psta || psta->aid != aid) return _FAIL; /* for rx pkt statistics */ diff --git a/drivers/staging/rtl8723au/include/wifi.h b/drivers/staging/rtl8723au/include/wifi.h index 1c1b2f6a2287..4657b2265672 100644 --- a/drivers/staging/rtl8723au/include/wifi.h +++ b/drivers/staging/rtl8723au/include/wifi.h @@ -149,10 +149,6 @@ enum WIFI_REG_DOMAIN { #define SetAMsdu(pbuf, amsdu) \ (*(__le16 *)(pbuf) |= cpu_to_le16((amsdu & 1) << 7)) -#define GetAid(pbuf) \ - (cpu_to_le16(*(unsigned short *)((unsigned long)(pbuf) + 2)) & \ - 0x3fff) - #define GetTid(pbuf) \ (cpu_to_le16(*(unsigned short *)((unsigned long)(pbuf) + \ (((ieee80211_has_tods(pbuf)<<1) | \