Commit 95862d08 authored by Philipp Hortmann's avatar Philipp Hortmann Committed by Greg Kroah-Hartman

staging: rtl8192e: Use standard ieee80211 function in rtllib_rx_mgt()

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: default avatarPhilipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/26cb0a7758186090a618a134c21e237594bbc525.1694546300.git.philipp.g.hortmann@gmail.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 19444ae9
...@@ -2644,14 +2644,11 @@ static void rtllib_rx_mgt(struct rtllib_device *ieee, ...@@ -2644,14 +2644,11 @@ static void rtllib_rx_mgt(struct rtllib_device *ieee,
{ {
struct rtllib_hdr_4addr *header = (struct rtllib_hdr_4addr *)skb->data; struct rtllib_hdr_4addr *header = (struct rtllib_hdr_4addr *)skb->data;
if ((WLAN_FC_GET_STYPE(le16_to_cpu(header->frame_ctl)) != if (!ieee80211_is_probe_resp(header->frame_ctl) &&
RTLLIB_STYPE_PROBE_RESP) && (!ieee80211_is_beacon(header->frame_ctl)))
(WLAN_FC_GET_STYPE(le16_to_cpu(header->frame_ctl)) !=
RTLLIB_STYPE_BEACON))
ieee->last_rx_ps_time = jiffies; ieee->last_rx_ps_time = jiffies;
switch (WLAN_FC_GET_STYPE(le16_to_cpu(header->frame_ctl))) { if (ieee80211_is_beacon(header->frame_ctl)) {
case RTLLIB_STYPE_BEACON:
netdev_dbg(ieee->dev, "received BEACON\n"); netdev_dbg(ieee->dev, "received BEACON\n");
rtllib_process_probe_response( rtllib_process_probe_response(
ieee, (struct rtllib_probe_response *)header, ieee, (struct rtllib_probe_response *)header,
...@@ -2661,20 +2658,15 @@ static void rtllib_rx_mgt(struct rtllib_device *ieee, ...@@ -2661,20 +2658,15 @@ static void rtllib_rx_mgt(struct rtllib_device *ieee,
ieee->iw_mode == IW_MODE_INFRA && ieee->iw_mode == IW_MODE_INFRA &&
ieee->link_state == MAC80211_LINKED)) ieee->link_state == MAC80211_LINKED))
schedule_work(&ieee->ps_task); schedule_work(&ieee->ps_task);
} else if (ieee80211_is_probe_resp(header->frame_ctl)) {
break;
case RTLLIB_STYPE_PROBE_RESP:
netdev_dbg(ieee->dev, "received PROBE RESPONSE\n"); netdev_dbg(ieee->dev, "received PROBE RESPONSE\n");
rtllib_process_probe_response(ieee, rtllib_process_probe_response(ieee,
(struct rtllib_probe_response *)header, stats); (struct rtllib_probe_response *)header, stats);
break; } else if (ieee80211_is_probe_req(header->frame_ctl)) {
case RTLLIB_STYPE_PROBE_REQ:
netdev_dbg(ieee->dev, "received PROBE REQUEST\n"); netdev_dbg(ieee->dev, "received PROBE REQUEST\n");
if ((ieee->softmac_features & IEEE_SOFTMAC_PROBERS) && if ((ieee->softmac_features & IEEE_SOFTMAC_PROBERS) &&
(ieee->iw_mode == IW_MODE_ADHOC && (ieee->iw_mode == IW_MODE_ADHOC &&
ieee->link_state == MAC80211_LINKED)) ieee->link_state == MAC80211_LINKED))
rtllib_rx_probe_rq(ieee, skb); rtllib_rx_probe_rq(ieee, skb);
break;
} }
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment