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

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.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 19444ae9

drivers/staging/rtl8192e/rtllib_rx.c

+5 −13
Original line number Diff line number Diff line
@@ -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;

	}

}