Skip to content

L
linux
Commit af1853da authored by Jes Sorensen's avatar Jes Sorensen Committed by Greg Kroah-Hartman
Browse files
Options

staging: rtl8723au: Clean up mess of parenthesis abuse 

Signed-off-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 428891a3
Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 39 deletions
drivers/staging/rtl8723au/include/ieee80211.h
View file @ af1853da
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
#define WPA_CIPHER_NONE BIT(0) #define WPA_CIPHER_NONE BIT(0)
#define WPA_CIPHER_WEP40 BIT(1) #define WPA_CIPHER_WEP40 BIT(1)
#define WPA_CIPHER_WEP104 BIT(2) #define WPA_CIPHER_WEP104 BIT(2)
#define WPA_CIPHER_TKIP BIT(3) #define WPA_CIPHER_TKIP BIT(3)
#define WPA_CIPHER_CCMP BIT(4) #define WPA_CIPHER_CCMP BIT(4)
...@@ -105,41 +105,53 @@ enum ratr_table_mode { ...@@ -105,41 +105,53 @@ enum ratr_table_mode {
enum NETWORK_TYPE enum NETWORK_TYPE
{ {
WIRELESS_INVALID = 0, WIRELESS_INVALID = 0,
/* Sub-Element */ /* Sub-Element */
WIRELESS_11B = BIT(0), /* tx: cck only , rx: cck only, hw: cck */ /* tx: cck only , rx: cck only, hw: cck */
WIRELESS_11G = BIT(1), /* tx: ofdm only, rx: ofdm & cck, hw: cck & ofdm */ WIRELESS_11B = BIT(0),
WIRELESS_11A = BIT(2), /* tx: ofdm only, rx: ofdm only, hw: ofdm only */ /* tx: ofdm only, rx: ofdm & cck, hw: cck & ofdm */
WIRELESS_11_24N = BIT(3), /* tx: MCS only, rx: MCS & cck, hw: MCS & cck */ WIRELESS_11G = BIT(1),
WIRELESS_11_5N = BIT(4), /* tx: MCS only, rx: MCS & ofdm, hw: ofdm only */ /* tx: ofdm only, rx: ofdm only, hw: ofdm only */
WIRELESS_11A = BIT(2),
/* tx: MCS only, rx: MCS & cck, hw: MCS & cck */
WIRELESS_11_24N = BIT(3),
/* tx: MCS only, rx: MCS & ofdm, hw: ofdm only */
WIRELESS_11_5N = BIT(4),
/* WIRELESS_AUTO = BIT(5), */ /* WIRELESS_AUTO = BIT(5), */
WIRELESS_AC = BIT(6), WIRELESS_AC = BIT(6),
/* Combination */ /* Combination */
WIRELESS_11BG = (WIRELESS_11B|WIRELESS_11G), /* tx: cck & ofdm, rx: cck & ofdm & MCS, hw: cck & ofdm */ /* tx: cck & ofdm, rx: cck & ofdm & MCS, hw: cck & ofdm */
WIRELESS_11G_24N = (WIRELESS_11G|WIRELESS_11_24N), /* tx: ofdm & MCS, rx: ofdm & cck & MCS, hw: cck & ofdm */ WIRELESS_11BG = WIRELESS_11B|WIRELESS_11G,
WIRELESS_11A_5N = (WIRELESS_11A|WIRELESS_11_5N), /* tx: ofdm & MCS, rx: ofdm & MCS, hw: ofdm only */ /* tx: ofdm & MCS, rx: ofdm & cck & MCS, hw: cck & ofdm */
WIRELESS_11BG_24N = (WIRELESS_11B|WIRELESS_11G|WIRELESS_11_24N), /* tx: ofdm & cck & MCS, rx: ofdm & cck & MCS, hw: ofdm & cck */ WIRELESS_11G_24N = WIRELESS_11G | WIRELESS_11_24N,
WIRELESS_11AGN = (WIRELESS_11A|WIRELESS_11G|WIRELESS_11_24N|WIRELESS_11_5N), /* tx: ofdm & MCS, rx: ofdm & MCS, hw: ofdm only */ /* tx: ofdm & MCS, rx: ofdm & MCS, hw: ofdm only */
WIRELESS_11ABGN = (WIRELESS_11A|WIRELESS_11B|WIRELESS_11G|WIRELESS_11_24N|WIRELESS_11_5N), WIRELESS_11A_5N = WIRELESS_11A | WIRELESS_11_5N,
/* tx: ofdm & cck & MCS, rx: ofdm & cck & MCS, hw: ofdm & cck */
WIRELESS_11BG_24N = WIRELESS_11B | WIRELESS_11G | WIRELESS_11_24N,
/* tx: ofdm & MCS, rx: ofdm & MCS, hw: ofdm only */
WIRELESS_11AGN = WIRELESS_11A | WIRELESS_11G | WIRELESS_11_24N |
WIRELESS_11_5N,
WIRELESS_11ABGN = WIRELESS_11A | WIRELESS_11B | WIRELESS_11G |
WIRELESS_11_24N | WIRELESS_11_5N,
}; };
#define SUPPORTED_24G_NETTYPE_MSK (WIRELESS_11B | WIRELESS_11G | WIRELESS_11_24N) #define SUPPORTED_24G_NETTYPE_MSK (WIRELESS_11B | WIRELESS_11G | WIRELESS_11_24N)
#define SUPPORTED_5G_NETTYPE_MSK (WIRELESS_11A | WIRELESS_11_5N) #define SUPPORTED_5G_NETTYPE_MSK (WIRELESS_11A | WIRELESS_11_5N)
#define IsSupported24G(NetType) ((NetType) & SUPPORTED_24G_NETTYPE_MSK ? true : false) #define IsSupported24G(NetType) (NetType & SUPPORTED_24G_NETTYPE_MSK ? true : false)
#define IsSupported5G(NetType) ((NetType) & SUPPORTED_5G_NETTYPE_MSK ? true : false) #define IsSupported5G(NetType) (NetType & SUPPORTED_5G_NETTYPE_MSK ? true : false)
#define IsEnableHWCCK(NetType) IsSupported24G(NetType) #define IsEnableHWCCK(NetType) IsSupported24G(NetType)
#define IsEnableHWOFDM(NetType) ((NetType) & (WIRELESS_11G|WIRELESS_11_24N|SUPPORTED_5G_NETTYPE_MSK) ? true : false) #define IsEnableHWOFDM(NetType) (NetType & (WIRELESS_11G|WIRELESS_11_24N|SUPPORTED_5G_NETTYPE_MSK) ? true : false)
#define IsSupportedRxCCK(NetType) IsEnableHWCCK(NetType) #define IsSupportedRxCCK(NetType) IsEnableHWCCK(NetType)
#define IsSupportedRxOFDM(NetType) IsEnableHWOFDM(NetType) #define IsSupportedRxOFDM(NetType) IsEnableHWOFDM(NetType)
#define IsSupportedRxMCS(NetType) IsEnableHWOFDM(NetType) #define IsSupportedRxMCS(NetType) IsEnableHWOFDM(NetType)
#define IsSupportedTxCCK(NetType) ((NetType) & (WIRELESS_11B) ? true : false) #define IsSupportedTxCCK(NetType) (NetType & (WIRELESS_11B) ? true : false)
#define IsSupportedTxOFDM(NetType) ((NetType) & (WIRELESS_11G|WIRELESS_11A) ? true : false) #define IsSupportedTxOFDM(NetType) (NetType & (WIRELESS_11G|WIRELESS_11A) ? true : false)
#define IsSupportedTxMCS(NetType) ((NetType) & (WIRELESS_11_24N|WIRELESS_11_5N) ? true : false) #define IsSupportedTxMCS(NetType) (NetType & (WIRELESS_11_24N|WIRELESS_11_5N) ? true : false)
struct ieee_param { struct ieee_param {
...@@ -192,7 +204,7 @@ struct ieee_param { ...@@ -192,7 +204,7 @@ struct ieee_param {
/* QoS,QOS */ /* QoS,QOS */
#define NORMAL_ACK 0 #define NORMAL_ACK 0
#define NO_ACK 1 #define NO_ACK 1
#define NON_EXPLICIT_ACK 2 #define NON_EXPLICIT_ACK 2
#define BLOCK_ACK 3 #define BLOCK_ACK 3
/* IEEE 802.11 defines */ /* IEEE 802.11 defines */
...@@ -200,24 +212,22 @@ struct ieee_param { ...@@ -200,24 +212,22 @@ struct ieee_param {
#define P80211_OUI_LEN 3 #define P80211_OUI_LEN 3
struct ieee80211_snap_hdr { struct ieee80211_snap_hdr {
u8 dsap; /* always 0xAA */ u8 dsap; /* always 0xAA */
u8 ssap; /* always 0xAA */ u8 ssap; /* always 0xAA */
u8 ctrl; /* always 0x03 */ u8 ctrl; /* always 0x03 */
u8 oui[P80211_OUI_LEN]; /* organizational universal id */ u8 oui[P80211_OUI_LEN]; /* organizational universal id */
} __attribute__ ((packed)); } __attribute__ ((packed));
#define SNAP_SIZE sizeof(struct ieee80211_snap_hdr) #define SNAP_SIZE sizeof(struct ieee80211_snap_hdr)
#define WLAN_FC_GET_TYPE(fc) ((fc) & IEEE80211_FCTL_FTYPE) #define WLAN_FC_GET_TYPE(fc) (fc & IEEE80211_FCTL_FTYPE)
#define WLAN_FC_GET_STYPE(fc) ((fc) & IEEE80211_FCTL_STYPE) #define WLAN_FC_GET_STYPE(fc) (fc & IEEE80211_FCTL_STYPE)
#define WLAN_QC_GET_TID(qc) ((qc) & 0x0f) #define WLAN_QC_GET_TID(qc) (qc & 0x0f)
#define WLAN_GET_SEQ_FRAG(seq) ((seq) & RTW_IEEE80211_SCTL_FRAG) #define WLAN_GET_SEQ_FRAG(seq) (seq & RTW_IEEE80211_SCTL_FRAG)
#define WLAN_GET_SEQ_SEQ(seq) ((seq) & RTW_IEEE80211_SCTL_SEQ) #define WLAN_GET_SEQ_SEQ(seq) (seq & RTW_IEEE80211_SCTL_SEQ)
#define WLAN_REASON_JOIN_WRONG_CHANNEL 65534 #define WLAN_REASON_JOIN_WRONG_CHANNEL 65534
...@@ -302,16 +312,16 @@ struct ieee80211_snap_hdr { ...@@ -302,16 +312,16 @@ struct ieee80211_snap_hdr {
* only use 8, and then use extended rates for the remaining supported * only use 8, and then use extended rates for the remaining supported
* rates. Other APs, however, stick all of their supported rates on the * rates. Other APs, however, stick all of their supported rates on the
* main rates information element... */ * main rates information element... */
#define MAX_RATES_LENGTH ((u8)12) #define MAX_RATES_LENGTH 12
#define MAX_RATES_EX_LENGTH ((u8)16) #define MAX_RATES_EX_LENGTH 16
#define MAX_CHANNEL_NUMBER 161 #define MAX_CHANNEL_NUMBER 161
#define MAX_WPA_IE_LEN (256) #define MAX_WPA_IE_LEN 256
#define MAX_WPS_IE_LEN (512) #define MAX_WPS_IE_LEN 512
#define MAX_P2P_IE_LEN (256) #define MAX_P2P_IE_LEN 256
#define MAX_WFD_IE_LEN (128) #define MAX_WFD_IE_LEN 128
#define IW_ESSID_MAX_SIZE 32 #define IW_ESSID_MAX_SIZE 32
/* /*
join_res: join_res:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7