Commit c3ba49e3 authored by Martin Kaiser's avatar Martin Kaiser Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: use standard mechanisms for control frames 



Use defines and macros from ieee80211.h to check for control frames and
to define control frame subtypes.

Signed-off-by: default avatarMartin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20220327180944.712545-4-martin@kaiser.cx


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

drivers/staging/r8188eu/core/rtw_recv.c

+2 −1
Original line number Diff line number Diff line
@@ -801,9 +801,10 @@ static int validate_recv_ctrl_frame(struct adapter *padapter, 
	struct rx_pkt_attrib *pattrib = &precv_frame->attrib;

	struct sta_priv *pstapriv = &padapter->stapriv;

	u8 *pframe = precv_frame->rx_data;

	__le16 fc = *(__le16 *)pframe;

	/* uint len = precv_frame->len; */



	if (GetFrameType(pframe) != WIFI_CTRL_TYPE)

	if (!ieee80211_is_ctl(fc))

		return _FAIL;



	/* receive the frames that ra(a1) is my address */

drivers/staging/r8188eu/hal/rtl8188e_rxdesc.c

+2 −1
Original line number Diff line number Diff line
@@ -113,12 +113,13 @@ 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 = ((!IsFrameTypeCtrl(wlanhdr)) &&

	pkt_info.bPacketMatchBSSID = ((!ieee80211_is_ctl(fc)) &&

		!pattrib->icv_err && !pattrib->crc_err &&

		!memcmp(get_hdr_bssid(wlanhdr),

		 get_bssid(&padapter->mlmepriv), ETH_ALEN));

drivers/staging/r8188eu/include/wifi.h

+6 −15
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
#define WLAN_SSID_MAXLEN	32



enum WIFI_FRAME_TYPE {

	WIFI_CTRL_TYPE =	(BIT(2)),

	WIFI_DATA_TYPE =	(BIT(3)),

	WIFI_QOS_DATA_TYPE	= (BIT(7)|BIT(3)),	/*  QoS Data */

};
@@ -34,13 +33,12 @@ enum WIFI_FRAME_SUBTYPE { 
	WIFI_ACTION         = (BIT(7) | BIT(6) | BIT(4) | IEEE80211_FTYPE_MGMT),



	/*  below is for control frame */

	WIFI_PSPOLL         = (BIT(7) | BIT(5) | WIFI_CTRL_TYPE),

	WIFI_RTS            = (BIT(7) | BIT(5) | BIT(4) | WIFI_CTRL_TYPE),

	WIFI_CTS            = (BIT(7) | BIT(6) | WIFI_CTRL_TYPE),

	WIFI_ACK            = (BIT(7) | BIT(6) | BIT(4) | WIFI_CTRL_TYPE),

	WIFI_CFEND          = (BIT(7) | BIT(6) | BIT(5) | WIFI_CTRL_TYPE),

	WIFI_CFEND_CFACK    = (BIT(7) | BIT(6) | BIT(5) | BIT(4) |

	WIFI_CTRL_TYPE),

	WIFI_PSPOLL         = (BIT(7) | BIT(5) | IEEE80211_FTYPE_CTL),

	WIFI_RTS            = (BIT(7) | BIT(5) | BIT(4) | IEEE80211_FTYPE_CTL),

	WIFI_CTS            = (BIT(7) | BIT(6) | IEEE80211_FTYPE_CTL),

	WIFI_ACK            = (BIT(7) | BIT(6) | BIT(4) | IEEE80211_FTYPE_CTL),

	WIFI_CFEND          = (BIT(7) | BIT(6) | BIT(5) | IEEE80211_FTYPE_CTL),

	WIFI_CFEND_CFACK    = (BIT(7) | BIT(6) | BIT(5) | BIT(4) | IEEE80211_FTYPE_CTL),



	/*  below is for data frame */

	WIFI_DATA           = (0 | WIFI_DATA_TYPE),
@@ -340,13 +338,6 @@ static inline unsigned char *get_hdr_bssid(unsigned char *pframe) 
	return sa;

}



static inline bool IsFrameTypeCtrl(unsigned char *pframe)

{

	if (WIFI_CTRL_TYPE == GetFrameType(pframe))

		return true;

	else

		return false;

}

/*-----------------------------------------------------------------------------

			Below is for the security related definition

------------------------------------------------------------------------------*/