Commit b2591ab0 authored by Ivan Safonov's avatar Ivan Safonov Committed by Greg Kroah-Hartman
Browse files

staging:r8188eu: use IEEE80211_FCTL_* kernel definitions 



_TO_DS_, _FROM_DS_, _MORE_FRAG_, _RETRY_, _PWRMGT_, _MORE_DATA_,
_PRIVACY_, _ORDER_ definitions are duplicate IEEE80211_FCTL_*
kernel definitions.

Signed-off-by: default avatarIvan Safonov <insafonov@gmail.com>
Link: https://lore.kernel.org/r/20210213131148.458582-1-insafonov@gmail.com


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

drivers/staging/rtl8188eu/include/wifi.h

+21 −30
Original line number Diff line number Diff line
@@ -88,73 +88,64 @@ enum WIFI_REG_DOMAIN { 
	DOMAIN_MAX

};



#define _TO_DS_		BIT(8)

#define _FROM_DS_	BIT(9)

#define _MORE_FRAG_	BIT(10)

#define _RETRY_		BIT(11)

#define _PWRMGT_	BIT(12)

#define _MORE_DATA_	BIT(13)

#define _PRIVACY_	BIT(14)

#define _ORDER_		BIT(15)



#define SetToDs(pbuf)	\

	*(__le16 *)(pbuf) |= cpu_to_le16(_TO_DS_)

	*(__le16 *)(pbuf) |= cpu_to_le16(IEEE80211_FCTL_TODS)



#define GetToDs(pbuf)	(((*(__le16 *)(pbuf)) & cpu_to_le16(_TO_DS_)) != 0)

#define GetToDs(pbuf)	(((*(__le16 *)(pbuf)) & cpu_to_le16(IEEE80211_FCTL_TODS)) != 0)



#define ClearToDs(pbuf)	\

	*(__le16 *)(pbuf) &= (~cpu_to_le16(_TO_DS_))

	*(__le16 *)(pbuf) &= (~cpu_to_le16(IEEE80211_FCTL_TODS))



#define SetFrDs(pbuf)	\

	*(__le16 *)(pbuf) |= cpu_to_le16(_FROM_DS_)

	*(__le16 *)(pbuf) |= cpu_to_le16(IEEE80211_FCTL_FROMDS)



#define GetFrDs(pbuf)	(((*(__le16 *)(pbuf)) & cpu_to_le16(_FROM_DS_)) != 0)

#define GetFrDs(pbuf)	(((*(__le16 *)(pbuf)) & cpu_to_le16(IEEE80211_FCTL_FROMDS)) != 0)



#define ClearFrDs(pbuf)	\

	*(__le16 *)(pbuf) &= (~cpu_to_le16(_FROM_DS_))

	*(__le16 *)(pbuf) &= (~cpu_to_le16(IEEE80211_FCTL_FROMDS))



#define get_tofr_ds(pframe)	((GetToDs(pframe) << 1) | GetFrDs(pframe))



#define SetMFrag(pbuf)	\

	*(__le16 *)(pbuf) |= cpu_to_le16(_MORE_FRAG_)

	*(__le16 *)(pbuf) |= cpu_to_le16(IEEE80211_FCTL_MOREFRAGS)



#define GetMFrag(pbuf)	(((*(__le16 *)(pbuf)) & cpu_to_le16(_MORE_FRAG_)) != 0)

#define GetMFrag(pbuf)	(((*(__le16 *)(pbuf)) & cpu_to_le16(IEEE80211_FCTL_MOREFRAGS)) != 0)



#define ClearMFrag(pbuf)	\

	*(__le16 *)(pbuf) &= (~cpu_to_le16(_MORE_FRAG_))

	*(__le16 *)(pbuf) &= (~cpu_to_le16(IEEE80211_FCTL_MOREFRAGS))



#define SetRetry(pbuf)	\

	*(__le16 *)(pbuf) |= cpu_to_le16(_RETRY_)

	*(__le16 *)(pbuf) |= cpu_to_le16(IEEE80211_FCTL_RETRY)



#define GetRetry(pbuf)	(((*(__le16 *)(pbuf)) & cpu_to_le16(_RETRY_)) != 0)

#define GetRetry(pbuf)	(((*(__le16 *)(pbuf)) & cpu_to_le16(IEEE80211_FCTL_RETRY)) != 0)



#define ClearRetry(pbuf)	\

	*(__le16 *)(pbuf) &= (~cpu_to_le16(_RETRY_))

	*(__le16 *)(pbuf) &= (~cpu_to_le16(IEEE80211_FCTL_RETRY))



#define SetPwrMgt(pbuf)	\

	*(__le16 *)(pbuf) |= cpu_to_le16(_PWRMGT_)

	*(__le16 *)(pbuf) |= cpu_to_le16(IEEE80211_FCTL_PM)



#define GetPwrMgt(pbuf)	(((*(__le16 *)(pbuf)) & cpu_to_le16(_PWRMGT_)) != 0)

#define GetPwrMgt(pbuf)	(((*(__le16 *)(pbuf)) & cpu_to_le16(IEEE80211_FCTL_PM)) != 0)



#define ClearPwrMgt(pbuf)	\

	*(__le16 *)(pbuf) &= (~cpu_to_le16(_PWRMGT_))

	*(__le16 *)(pbuf) &= (~cpu_to_le16(IEEE80211_FCTL_PM))



#define SetMData(pbuf)	\

	*(__le16 *)(pbuf) |= cpu_to_le16(_MORE_DATA_)

	*(__le16 *)(pbuf) |= cpu_to_le16(IEEE80211_FCTL_MOREDATA)



#define GetMData(pbuf)	(((*(__le16 *)(pbuf)) & cpu_to_le16(_MORE_DATA_)) != 0)

#define GetMData(pbuf)	(((*(__le16 *)(pbuf)) & cpu_to_le16(IEEE80211_FCTL_MOREDATA)) != 0)



#define ClearMData(pbuf)	\

	*(__le16 *)(pbuf) &= (~cpu_to_le16(_MORE_DATA_))

	*(__le16 *)(pbuf) &= (~cpu_to_le16(IEEE80211_FCTL_MOREDATA))



#define SetPrivacy(pbuf)	\

	*(__le16 *)(pbuf) |= cpu_to_le16(_PRIVACY_)

	*(__le16 *)(pbuf) |= cpu_to_le16(IEEE80211_FCTL_PROTECTED)



#define GetPrivacy(pbuf)					\

	(((*(__le16 *)(pbuf)) & cpu_to_le16(_PRIVACY_)) != 0)

	(((*(__le16 *)(pbuf)) & cpu_to_le16(IEEE80211_FCTL_PROTECTED)) != 0)



#define GetOrder(pbuf)					\

	(((*(__le16 *)(pbuf)) & cpu_to_le16(_ORDER_)) != 0)

	(((*(__le16 *)(pbuf)) & cpu_to_le16(IEEE80211_FCTL_ORDER)) != 0)



#define GetFrameType(pbuf)				\

	(le16_to_cpu(*(__le16 *)(pbuf)) & (BIT(3) | BIT(2)))