staging: r8188eu: use hdr->frame_control instead of fc
authorMartin Kaiser <martin@kaiser.cx>
Mon, 31 Oct 2022 20:54:11 +0000 (21:54 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 2 Nov 2022 07:16:45 +0000 (08:16 +0100)
We can remove the fc variable in update_recvframe_phyinfo_88e and use
hdr->frame_control instead.

Tested-by: Philipp Hortmann <philipp.g.hortmann@gmail.com> # Edimax N150
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20221031205412.124871-3-martin@kaiser.cx
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/r8188eu/hal/rtl8188e_rxdesc.c

index 10bb2e60298468b225465157a45519f89d691617..4e9d8c8285c4f909446fcd45a940b6d2452398c9 100644 (file)
@@ -114,13 +114,12 @@ void update_recvframe_phyinfo_88e(struct recv_frame *precvframe, struct phy_stat
        struct hal_data_8188e *pHalData = &padapter->haldata;
        struct phy_info *pPHYInfo  = &pattrib->phy_info;
        u8 *wlanhdr = precvframe->rx_data;
-       __le16 fc = *(__le16 *)wlanhdr;
        struct odm_per_pkt_info pkt_info;
        u8 *sa = NULL;
        struct sta_priv *pstapriv;
        struct sta_info *psta;
 
-       pkt_info.bPacketMatchBSSID = ((!ieee80211_is_ctl(fc)) &&
+       pkt_info.bPacketMatchBSSID = ((!ieee80211_is_ctl(hdr->frame_control)) &&
                !pattrib->icv_err && !pattrib->crc_err &&
                !memcmp(get_hdr_bssid(wlanhdr),
                 get_bssid(&padapter->mlmepriv), ETH_ALEN));
@@ -129,7 +128,8 @@ void update_recvframe_phyinfo_88e(struct recv_frame *precvframe, struct phy_stat
                                 ether_addr_equal(ieee80211_get_DA(hdr),
                                                  myid(&padapter->eeprompriv));
 
-       pkt_info.bPacketBeacon = pkt_info.bPacketMatchBSSID && ieee80211_is_beacon(fc);
+       pkt_info.bPacketBeacon = pkt_info.bPacketMatchBSSID &&
+                                ieee80211_is_beacon(hdr->frame_control);
        if (pkt_info.bPacketBeacon) {
                if (check_fwstate(&padapter->mlmepriv, WIFI_STATION_STATE))
                        sa = padapter->mlmepriv.cur_network.network.MacAddress;