staging: rtl8192e: Use standard ieee80211 function in rtllib_rx_mgt()
authorPhilipp Hortmann <philipp.g.hortmann@gmail.com>
Tue, 12 Sep 2023 19:28:11 +0000 (21:28 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 17 Sep 2023 07:47:42 +0000 (09:47 +0200)
Replace WLAN_FC_GET_STYPE(le16_to_cpu(header->frame_ctl)) and comparison
with standard function to avoid proprietary code and to increase
readability.

Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/26cb0a7758186090a618a134c21e237594bbc525.1694546300.git.philipp.g.hortmann@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8192e/rtllib_rx.c

index 9f944eefa41edee885ae5a2a7b86826a04870a02..108238aa61d93ddfc93fc820e9abdd4c7a8dac63 100644 (file)
@@ -2644,14 +2644,11 @@ static void rtllib_rx_mgt(struct rtllib_device *ieee,
 {
        struct rtllib_hdr_4addr *header = (struct rtllib_hdr_4addr *)skb->data;
 
-       if ((WLAN_FC_GET_STYPE(le16_to_cpu(header->frame_ctl)) !=
-           RTLLIB_STYPE_PROBE_RESP) &&
-           (WLAN_FC_GET_STYPE(le16_to_cpu(header->frame_ctl)) !=
-           RTLLIB_STYPE_BEACON))
+       if (!ieee80211_is_probe_resp(header->frame_ctl) &&
+           (!ieee80211_is_beacon(header->frame_ctl)))
                ieee->last_rx_ps_time = jiffies;
 
-       switch (WLAN_FC_GET_STYPE(le16_to_cpu(header->frame_ctl))) {
-       case RTLLIB_STYPE_BEACON:
+       if (ieee80211_is_beacon(header->frame_ctl)) {
                netdev_dbg(ieee->dev, "received BEACON\n");
                rtllib_process_probe_response(
                                ieee, (struct rtllib_probe_response *)header,
@@ -2661,20 +2658,15 @@ static void rtllib_rx_mgt(struct rtllib_device *ieee,
                    ieee->iw_mode == IW_MODE_INFRA &&
                    ieee->link_state == MAC80211_LINKED))
                        schedule_work(&ieee->ps_task);
-
-               break;
-
-       case RTLLIB_STYPE_PROBE_RESP:
+       } else if (ieee80211_is_probe_resp(header->frame_ctl)) {
                netdev_dbg(ieee->dev, "received PROBE RESPONSE\n");
                rtllib_process_probe_response(ieee,
                              (struct rtllib_probe_response *)header, stats);
-               break;
-       case RTLLIB_STYPE_PROBE_REQ:
+       } else if (ieee80211_is_probe_req(header->frame_ctl)) {
                netdev_dbg(ieee->dev, "received PROBE REQUEST\n");
                if ((ieee->softmac_features & IEEE_SOFTMAC_PROBERS) &&
                    (ieee->iw_mode == IW_MODE_ADHOC &&
                    ieee->link_state == MAC80211_LINKED))
                        rtllib_rx_probe_rq(ieee, skb);
-               break;
        }
 }