Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3e96015 authored by Quytelda Kahja's avatar Quytelda Kahja Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723bs: Replace RTW_IEEE80211_STYPE_* with IEEE80211_STYPE_*. 



This driver defines the constants RTW_IEEE80211_STYPE_*, but all these
values are already defined in 'linux/ieee80211.h' as IEEE80211_STYPE_*.
Remove the locally defined constants, and substitute the kernel constants.

Signed-off-by: default avatarQuytelda Kahja <quytelda@tamalin.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d95908d5

drivers/staging/rtl8723bs/core/rtw_ieee80211.c

+1 −1
Original line number Diff line number Diff line
@@ -1381,7 +1381,7 @@ int rtw_action_frame_parse(const u8 *frame, u32 frame_len, u8 *category, u8 *act 
	fc = le16_to_cpu(((struct ieee80211_hdr_3addr *)frame)->frame_control);



	if ((fc & (IEEE80211_FCTL_FTYPE|IEEE80211_FCTL_STYPE))

		!= (IEEE80211_FTYPE_MGMT|RTW_IEEE80211_STYPE_ACTION)

		!= (IEEE80211_FTYPE_MGMT|IEEE80211_STYPE_ACTION)

	) {

		return false;

	}

drivers/staging/rtl8723bs/include/ieee80211.h

+0 −43
Original line number Diff line number Diff line
@@ -324,49 +324,6 @@ enum eap_type { 
#define MIN_FRAG_THRESHOLD     256U

#define	MAX_FRAG_THRESHOLD     2346U



/* management */

#define RTW_IEEE80211_STYPE_ASSOC_REQ	0x0000

#define RTW_IEEE80211_STYPE_ASSOC_RESP	0x0010

#define RTW_IEEE80211_STYPE_REASSOC_REQ	0x0020

#define RTW_IEEE80211_STYPE_REASSOC_RESP	0x0030

#define RTW_IEEE80211_STYPE_PROBE_REQ	0x0040

#define RTW_IEEE80211_STYPE_PROBE_RESP	0x0050

#define RTW_IEEE80211_STYPE_BEACON		0x0080

#define RTW_IEEE80211_STYPE_ATIM		0x0090

#define RTW_IEEE80211_STYPE_DISASSOC	0x00A0

#define RTW_IEEE80211_STYPE_AUTH		0x00B0

#define RTW_IEEE80211_STYPE_DEAUTH		0x00C0

#define RTW_IEEE80211_STYPE_ACTION		0x00D0



/* control */

#define RTW_IEEE80211_STYPE_CTL_EXT		0x0060

#define RTW_IEEE80211_STYPE_BACK_REQ		0x0080

#define RTW_IEEE80211_STYPE_BACK		0x0090

#define RTW_IEEE80211_STYPE_PSPOLL		0x00A0

#define RTW_IEEE80211_STYPE_RTS		0x00B0

#define RTW_IEEE80211_STYPE_CTS		0x00C0

#define RTW_IEEE80211_STYPE_ACK		0x00D0

#define RTW_IEEE80211_STYPE_CFEND		0x00E0

#define RTW_IEEE80211_STYPE_CFENDACK		0x00F0



/* data */

#define RTW_IEEE80211_STYPE_DATA		0x0000

#define RTW_IEEE80211_STYPE_DATA_CFACK	0x0010

#define RTW_IEEE80211_STYPE_DATA_CFPOLL	0x0020

#define RTW_IEEE80211_STYPE_DATA_CFACKPOLL	0x0030

#define RTW_IEEE80211_STYPE_NULLFUNC	0x0040

#define RTW_IEEE80211_STYPE_CFACK		0x0050

#define RTW_IEEE80211_STYPE_CFPOLL		0x0060

#define RTW_IEEE80211_STYPE_CFACKPOLL	0x0070

#define RTW_IEEE80211_STYPE_QOS_DATA		0x0080

#define RTW_IEEE80211_STYPE_QOS_DATA_CFACK		0x0090

#define RTW_IEEE80211_STYPE_QOS_DATA_CFPOLL		0x00A0

#define RTW_IEEE80211_STYPE_QOS_DATA_CFACKPOLL	0x00B0

#define RTW_IEEE80211_STYPE_QOS_NULLFUNC	0x00C0

#define RTW_IEEE80211_STYPE_QOS_CFACK		0x00D0

#define RTW_IEEE80211_STYPE_QOS_CFPOLL		0x00E0

#define RTW_IEEE80211_STYPE_QOS_CFACKPOLL	0x00F0



/* sequence control field */

#define RTW_IEEE80211_SCTL_FRAG	0x000F

#define RTW_IEEE80211_SCTL_SEQ	0xFFF0

drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c

+1 −1
Original line number Diff line number Diff line
@@ -2546,7 +2546,7 @@ static int rtw_cfg80211_monitor_if_xmit_entry(struct sk_buff *skb, struct net_de 


	}

	else if ((frame_control & (IEEE80211_FCTL_FTYPE|IEEE80211_FCTL_STYPE))

		== (IEEE80211_FTYPE_MGMT|RTW_IEEE80211_STYPE_ACTION)

		== (IEEE80211_FTYPE_MGMT|IEEE80211_STYPE_ACTION)

	)

	{

		/* only for action frames */