staging: rtl8192e: Use standard function in rtllib_process_probe_response()

Replace proprietary is_beacon() with ieee80211_is_beacon() and
proprietary "WLAN_FC_GET_STYPE(frame_ctl) == RTLLIB_STYPE_PROBE_RESP"
with standard function to increase readability.

Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/ad24a52c045d6638103f4263b811c87d18cb3e97.1694546300.git.philipp.g.hortmann@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192e/rtllib_rx.c
index 108238aa61d93ddfc93fc820e9abdd4c7a8dac63..89c8d66765fe37c939f59b491d755d115a7b5a7e 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib_rx.c
+++ b/drivers/staging/rtl8192e/rtllib_rx.c
@@ -2448,11 +2448,6 @@ static inline void update_network(struct rtllib_device *ieee,
        dst->BssCcxVerNumber = src->BssCcxVerNumber;
 }
 
-static inline int is_beacon(u16 fc)
-{
-       return (WLAN_FC_GET_STYPE(fc) == RTLLIB_STYPE_BEACON);
-}
-
 static int IsPassiveChannel(struct rtllib_device *rtllib, u8 channel)
 {
        if (channel > MAX_CHANNEL_NUMBER) {
@@ -2491,7 +2486,7 @@ static inline void rtllib_process_probe_response(
        short renew;
        struct rtllib_network *network = kzalloc(sizeof(struct rtllib_network),
                                                 GFP_ATOMIC);
-       u16 frame_ctl = le16_to_cpu(beacon->header.frame_ctl);
+       __le16 frame_ctl = beacon->header.frame_ctl;
 
        if (!network)
                return;
@@ -2521,14 +2516,14 @@ static inline void rtllib_process_probe_response(
                netdev_dbg(ieee->dev, "Dropped '%s' ( %pM) via %s.\n",
                           escape_essid(info_element->data, info_element->len),
                           beacon->header.addr3,
-                          is_beacon(frame_ctl) ? "BEACON" : "PROBE RESPONSE");
+                          ieee80211_is_beacon(frame_ctl) ? "BEACON" : "PROBE RESPONSE");
                goto free_network;
        }
 
        if (!rtllib_legal_channel(ieee, network->channel))
                goto free_network;
 
-       if (WLAN_FC_GET_STYPE(frame_ctl) == RTLLIB_STYPE_PROBE_RESP) {
+       if (ieee80211_is_probe_resp(frame_ctl)) {
                if (IsPassiveChannel(ieee, network->channel)) {
                        netdev_info(ieee->dev,
                                    "GetScanInfo(): For Global Domain, filter probe response at channel(%d).\n",
@@ -2561,7 +2556,7 @@ static inline void rtllib_process_probe_response(
                        else
                                ieee->current_network.buseprotection = false;
                }
-               if (is_beacon(frame_ctl)) {
+               if (ieee80211_is_beacon(frame_ctl)) {
                        if (ieee->link_state >= MAC80211_LINKED)
                                ieee->link_detect_info.NumRecvBcnInPeriod++;
                }
@@ -2597,7 +2592,7 @@ static inline void rtllib_process_probe_response(
                netdev_dbg(ieee->dev, "Adding '%s' ( %pM) via %s.\n",
                           escape_essid(network->ssid, network->ssid_len),
                           network->bssid,
-                          is_beacon(frame_ctl) ? "BEACON" : "PROBE RESPONSE");
+                          ieee80211_is_beacon(frame_ctl) ? "BEACON" : "PROBE RESPONSE");
 
                memcpy(target, network, sizeof(*target));
                list_add_tail(&target->list, &ieee->network_list);
@@ -2607,7 +2602,7 @@ static inline void rtllib_process_probe_response(
                netdev_dbg(ieee->dev, "Updating '%s' ( %pM) via %s.\n",
                           escape_essid(target->ssid, target->ssid_len),
                           target->bssid,
-                          is_beacon(frame_ctl) ? "BEACON" : "PROBE RESPONSE");
+                          ieee80211_is_beacon(frame_ctl) ? "BEACON" : "PROBE RESPONSE");
 
                /* we have an entry and we are going to update it. But this
                 *  entry may be already expired. In this case we do the same
@@ -2628,7 +2623,7 @@ static inline void rtllib_process_probe_response(
        }
 
        spin_unlock_irqrestore(&ieee->lock, flags);
-       if (is_beacon(frame_ctl) &&
+       if (ieee80211_is_beacon(frame_ctl) &&
            is_same_network(&ieee->current_network, network,
            (network->ssid_len ? 1 : 0)) &&
            (ieee->link_state == MAC80211_LINKED)) {