Commit 2b1d4c42 authored by Stephen Brennan's avatar Stephen Brennan Committed by Greg Kroah-Hartman

staging: rtl8192u: fix macro alignment in ieee80211

Several macros display unaligned, due to mixes of tabs and spaces. These
can be fixed by making spacing consistent, do this.
Signed-off-by: default avatarStephen Brennan <stephen@brennan.io>
Link: https://lore.kernel.org/r/20190821143540.4501-3-stephen@brennan.ioSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ee16d7d3
...@@ -169,9 +169,9 @@ struct cb_desc { ...@@ -169,9 +169,9 @@ struct cb_desc {
#define MGN_MCS14 0x8e #define MGN_MCS14 0x8e
#define MGN_MCS15 0x8f #define MGN_MCS15 0x8f
#define aSifsTime ((priv->ieee80211->current_network.mode == IEEE_A || \ #define aSifsTime ((priv->ieee80211->current_network.mode == IEEE_A || \
priv->ieee80211->current_network.mode == IEEE_N_24G || \ priv->ieee80211->current_network.mode == IEEE_N_24G || \
priv->ieee80211->current_network.mode == IEEE_N_5G) ? \ priv->ieee80211->current_network.mode == IEEE_N_5G) ? \
16 : 10) 16 : 10)
#define MGMT_QUEUE_NUM 5 #define MGMT_QUEUE_NUM 5
...@@ -387,7 +387,7 @@ struct ieee_param { ...@@ -387,7 +387,7 @@ struct ieee_param {
#define IEEE80211_STYPE_ACK 0x00D0 #define IEEE80211_STYPE_ACK 0x00D0
#define IEEE80211_STYPE_CFEND 0x00E0 #define IEEE80211_STYPE_CFEND 0x00E0
#define IEEE80211_STYPE_CFENDACK 0x00F0 #define IEEE80211_STYPE_CFENDACK 0x00F0
#define IEEE80211_STYPE_BLOCKACK 0x0094 #define IEEE80211_STYPE_BLOCKACK 0x0094
/* data */ /* data */
#define IEEE80211_STYPE_DATA 0x0000 #define IEEE80211_STYPE_DATA 0x0000
...@@ -452,18 +452,19 @@ do { if (ieee80211_debug_level & (level)) \ ...@@ -452,18 +452,19 @@ do { if (ieee80211_debug_level & (level)) \
printk(KERN_DEBUG "ieee80211: " fmt, ## args); } while (0) printk(KERN_DEBUG "ieee80211: " fmt, ## args); } while (0)
//wb added to debug out data buf //wb added to debug out data buf
//if you want print DATA buffer related BA, please set ieee80211_debug_level to DATA|BA //if you want print DATA buffer related BA, please set ieee80211_debug_level to DATA|BA
#define IEEE80211_DEBUG_DATA(level, data, datalen) \ #define IEEE80211_DEBUG_DATA(level, data, datalen) \
do { if ((ieee80211_debug_level & (level)) == (level)) \ do { if ((ieee80211_debug_level & (level)) == (level)) \
{ \ { \
int i; \ int i; \
u8 *pdata = (u8 *) data; \ u8 *pdata = (u8 *) data; \
printk(KERN_DEBUG "ieee80211: %s()\n", __func__); \ printk(KERN_DEBUG "ieee80211: %s()\n", __func__); \
for (i = 0; i < (int)(datalen); i++) { \ for (i = 0; i < (int)(datalen); i++) { \
printk("%2x ", pdata[i]); \ printk("%2x ", pdata[i]); \
if ((i + 1) % 16 == 0) printk("\n"); \ if ((i + 1) % 16 == 0) \
} \ printk("\n"); \
printk("\n"); \ } \
} \ printk("\n"); \
} \
} while (0) } while (0)
#else #else
#define IEEE80211_DEBUG (level, fmt, args...) do {} while (0) #define IEEE80211_DEBUG (level, fmt, args...) do {} while (0)
...@@ -2014,8 +2015,8 @@ struct ieee80211_device { ...@@ -2014,8 +2015,8 @@ struct ieee80211_device {
#define IEEE_A (1<<0) #define IEEE_A (1<<0)
#define IEEE_B (1<<1) #define IEEE_B (1<<1)
#define IEEE_G (1<<2) #define IEEE_G (1<<2)
#define IEEE_N_24G (1<<4) #define IEEE_N_24G (1<<4)
#define IEEE_N_5G (1<<5) #define IEEE_N_5G (1<<5)
#define IEEE_MODE_MASK (IEEE_A | IEEE_B | IEEE_G) #define IEEE_MODE_MASK (IEEE_A | IEEE_B | IEEE_G)
/* Generate a 802.11 header */ /* Generate a 802.11 header */
......
...@@ -253,10 +253,10 @@ extern u8 MCS_FILTER_1SS[16]; ...@@ -253,10 +253,10 @@ extern u8 MCS_FILTER_1SS[16];
/* 2007/07/12 MH We only define legacy and HT wireless mode now. */ /* 2007/07/12 MH We only define legacy and HT wireless mode now. */
#define LEGACY_WIRELESS_MODE IEEE_MODE_MASK #define LEGACY_WIRELESS_MODE IEEE_MODE_MASK
#define CURRENT_RATE(WirelessMode, LegacyRate, HTRate) \ #define CURRENT_RATE(WirelessMode, LegacyRate, HTRate) \
((WirelessMode & (LEGACY_WIRELESS_MODE)) != 0) ?\ ((WirelessMode & (LEGACY_WIRELESS_MODE)) != 0) ? \
(LegacyRate) :\ (LegacyRate) : \
(PICK_RATE(LegacyRate, HTRate)) (PICK_RATE(LegacyRate, HTRate))
// MCS Bw 40 {1~7, 12~15,32} // MCS Bw 40 {1~7, 12~15,32}
#define RATE_ADPT_1SS_MASK 0xFF #define RATE_ADPT_1SS_MASK 0xFF
......
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