UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging:rtl8712: 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: Ivan Safonov <insafonov@gmail.com>
Link: https://lore.kernel.org/r/20210227222236.581490-4-insafonov@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ivan Safonov 2021-02-28 01:22:36 +03:00 committed by Greg Kroah-Hartman
parent 99b83fd48d
commit e93aa38475
1 changed files with 22 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
drivers/staging/rtl8712/wifi.h
View File

@ -15,6 +15,7 @@
#define _WIFI_H_ #define _WIFI_H_
#include <linux/compiler.h> #include <linux/compiler.h>
#include <linux/ieee80211.h>
#define WLAN_HDR_A3_LEN 24 #define WLAN_HDR_A3_LEN 24
#define WLAN_HDR_A3_QOS_LEN 26 #define WLAN_HDR_A3_QOS_LEN 26
@ -74,33 +75,24 @@ enum WIFI_REG_DOMAIN {
DOMAIN_MAX 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) ({ \ #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) ({ \ #define ClearToDs(pbuf) ({ \
*(__le16 *)(pbuf) &= (~cpu_to_le16(_TO_DS_)); \ *(__le16 *)(pbuf) &= (~cpu_to_le16(IEEE80211_FCTL_TODS)); \
}) })
#define SetFrDs(pbuf) ({ \ #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) ({ \ #define ClearFrDs(pbuf) ({ \
*(__le16 *)(pbuf) &= (~cpu_to_le16(_FROM_DS_)); \ *(__le16 *)(pbuf) &= (~cpu_to_le16(IEEE80211_FCTL_FROMDS)); \
}) })
static inline unsigned char get_tofr_ds(unsigned char *pframe) static inline unsigned char get_tofr_ds(unsigned char *pframe)
@ -109,56 +101,56 @@ static inline unsigned char get_tofr_ds(unsigned char *pframe)
} }
#define SetMFrag(pbuf) ({ \ #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) ({ \ #define ClearMFrag(pbuf) ({ \
*(__le16 *)(pbuf) &= (~cpu_to_le16(_MORE_FRAG_)); \ *(__le16 *)(pbuf) &= (~cpu_to_le16(IEEE80211_FCTL_MOREFRAGS)); \
}) })
#define SetRetry(pbuf) ({ \ #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) ({ \ #define ClearRetry(pbuf) ({ \
*(__le16 *)(pbuf) &= (~cpu_to_le16(_RETRY_)); \ *(__le16 *)(pbuf) &= (~cpu_to_le16(IEEE80211_FCTL_RETRY)); \
}) })
#define SetPwrMgt(pbuf) ({ \ #define SetPwrMgt(pbuf) ({ \
*(__le16 *)(pbuf) |= cpu_to_le16(_PWRMGT_); \ *(__le16 *)(pbuf) |= cpu_to_le16(IEEE80211_FCTL_PM); \
}) })
#define GetPwrMgt(pbuf) (((*(__le16 *)(pbuf)) & \ #define GetPwrMgt(pbuf) (((*(__le16 *)(pbuf)) & \
cpu_to_le16(_PWRMGT_)) != 0) cpu_to_le16(IEEE80211_FCTL_PM)) != 0)
#define ClearPwrMgt(pbuf) ({ \ #define ClearPwrMgt(pbuf) ({ \
*(__le16 *)(pbuf) &= (~cpu_to_le16(_PWRMGT_)); \ *(__le16 *)(pbuf) &= (~cpu_to_le16(IEEE80211_FCTL_PM)); \
}) })
#define SetMData(pbuf) ({ \ #define SetMData(pbuf) ({ \
*(__le16 *)(pbuf) |= cpu_to_le16(_MORE_DATA_); \ *(__le16 *)(pbuf) |= cpu_to_le16(IEEE80211_FCTL_MOREDATA); \
}) })
#define GetMData(pbuf) (((*(__le16 *)(pbuf)) & \ #define GetMData(pbuf) (((*(__le16 *)(pbuf)) & \
cpu_to_le16(_MORE_DATA_)) != 0) cpu_to_le16(IEEE80211_FCTL_MOREDATA)) != 0)
#define ClearMData(pbuf) ({ \ #define ClearMData(pbuf) ({ \
*(__le16 *)(pbuf) &= (~cpu_to_le16(_MORE_DATA_)); \ *(__le16 *)(pbuf) &= (~cpu_to_le16(IEEE80211_FCTL_MOREDATA)); \
}) })
#define SetPrivacy(pbuf) ({ \ #define SetPrivacy(pbuf) ({ \
*(__le16 *)(pbuf) |= cpu_to_le16(_PRIVACY_); \ *(__le16 *)(pbuf) |= cpu_to_le16(IEEE80211_FCTL_PROTECTED); \
}) })
#define GetPrivacy(pbuf) (((*(__le16 *)(pbuf)) & \ #define GetPrivacy(pbuf) (((*(__le16 *)(pbuf)) & \
cpu_to_le16(_PRIVACY_)) != 0) cpu_to_le16(IEEE80211_FCTL_PROTECTED)) != 0)
#define GetOrder(pbuf) (((*(__le16 *)(pbuf)) & \ #define GetOrder(pbuf) (((*(__le16 *)(pbuf)) & \
cpu_to_le16(_ORDER_)) != 0) cpu_to_le16(IEEE80211_FCTL_ORDER)) != 0)
#define GetFrameType(pbuf) (le16_to_cpu(*(__le16 *)(pbuf)) & \ #define GetFrameType(pbuf) (le16_to_cpu(*(__le16 *)(pbuf)) & \
(BIT(3) | BIT(2))) (BIT(3) | BIT(2)))