Commit d181ee37 authored by Jes Sorensen's avatar Jes Sorensen Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723au: Get rid of duplicate ieee80211 frame_control defines



This is all defined nicely in ieee80211.h, this was all duplication
serving no other purpose than to obfuscate the code.

Signed-off-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6ebd2948
Loading
Loading
Loading
Loading
+0 −49
Original line number Diff line number Diff line
@@ -23,61 +23,12 @@
 */
#define	WiFiNavUpperUs		30000	/*  30 ms */

enum WIFI_FRAME_TYPE {
	WIFI_MGT_TYPE  =	(0),
	WIFI_CTRL_TYPE =	(BIT(2)),
	WIFI_DATA_TYPE =	(BIT(3)),
	WIFI_QOS_DATA_TYPE	= (BIT(7)|BIT(3)),	/*  QoS Data */
};

enum WIFI_FRAME_SUBTYPE {
	/*  below is for mgt frame */
	WIFI_ASSOCREQ = (0 | WIFI_MGT_TYPE),
	WIFI_ASSOCRSP = (BIT(4) | WIFI_MGT_TYPE),
	WIFI_REASSOCREQ = (BIT(5) | WIFI_MGT_TYPE),
	WIFI_REASSOCRSP = (BIT(5) | BIT(4) | WIFI_MGT_TYPE),
	WIFI_PROBEREQ = (BIT(6) | WIFI_MGT_TYPE),
	WIFI_PROBERSP = (BIT(6) | BIT(4) | WIFI_MGT_TYPE),
	WIFI_BEACON = (BIT(7) | WIFI_MGT_TYPE),
	WIFI_ATIM = (BIT(7) | BIT(4) | WIFI_MGT_TYPE),
	WIFI_DISASSOC = (BIT(7) | BIT(5) | WIFI_MGT_TYPE),
	WIFI_AUTH = (BIT(7) | BIT(5) | BIT(4) | WIFI_MGT_TYPE),
	WIFI_DEAUTH = (BIT(7) | BIT(6) | WIFI_MGT_TYPE),
	WIFI_ACTION = (BIT(7) | BIT(6) | BIT(4) | WIFI_MGT_TYPE),

	/*  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),

	/*  below is for data frame */
	WIFI_DATA = (0 | WIFI_DATA_TYPE),
	WIFI_DATA_CFACK = (BIT(4) | WIFI_DATA_TYPE),
	WIFI_DATA_CFPOLL = (BIT(5) | WIFI_DATA_TYPE),
	WIFI_DATA_CFACKPOLL = (BIT(5) | BIT(4) | WIFI_DATA_TYPE),
	WIFI_DATA_NULL = (BIT(6) | WIFI_DATA_TYPE),
	WIFI_CF_ACK = (BIT(6) | BIT(4) | WIFI_DATA_TYPE),
	WIFI_CF_POLL = (BIT(6) | BIT(5) | WIFI_DATA_TYPE),
	WIFI_CF_ACKPOLL = (BIT(6) | BIT(5) | BIT(4) | WIFI_DATA_TYPE),
	WIFI_QOS_DATA_NULL = (BIT(6) | WIFI_QOS_DATA_TYPE),
};


#define SetToDs(pbuf)	\
	(*(__le16 *)(pbuf) |= cpu_to_le16(IEEE80211_FCTL_TODS))

#define SetFrDs(pbuf)	\
	(*(__le16 *)(pbuf) |= cpu_to_le16(IEEE80211_FCTL_FROMDS))

#define SetFrameSubType(pbuf, type) \
	do {    \
		*(__le16 *)(pbuf) &= cpu_to_le16(~(BIT(7) | BIT(6) | BIT(5) | BIT(4) | BIT(3) | BIT(2))); \
		*(__le16 *)(pbuf) |= cpu_to_le16(type); \
	} while (0)

#define _ASOCREQ_IE_OFFSET_		4	/*  excluding wlan_hdr */
#define	_ASOCRSP_IE_OFFSET_		6
#define _REASOCREQ_IE_OFFSET_		10