Re: [PATCH v2 2/3] staging: rtl8192u: fix macro alignment in ieee80211

2019-08-28 Thread Joe Perches
On Wed, 2019-08-21 at 07:35 -0700, Stephen Brennan wrote:
> Several macros display unaligned, due to mixes of tabs and spaces. These
> can be fixed by making spacing consistent, do this.
[]
> @@ -452,18 +452,19 @@ do { if (ieee80211_debug_level & (level)) \
>printk(KERN_DEBUG "ieee80211: " fmt, ## args); } while (0)
>  //wb added to debug out data buf
>  //if you want print DATA buffer related BA, please set ieee80211_debug_level 
> to DATA|BA
> -#define IEEE80211_DEBUG_DATA(level, data, datalen)   \
> - do { if ((ieee80211_debug_level & (level)) == (level))  \
> - {   \
> - int i;  \
> - u8 *pdata = (u8 *) data;\
> - printk(KERN_DEBUG "ieee80211: %s()\n", __func__);   
> \
> - for (i = 0; i < (int)(datalen); i++) {  \
> - printk("%2x ", pdata[i]);   \
> - if ((i + 1) % 16 == 0) printk("\n");\
> - }   \
> - printk("\n");   \
> - }   \
> +#define IEEE80211_DEBUG_DATA(level, data, datalen)   
>   \
> + do { if ((ieee80211_debug_level & (level)) == (level)) \
> + {  \
> + int i; \
> + u8 *pdata = (u8 *) data;   \
> + printk(KERN_DEBUG "ieee80211: %s()\n", __func__);  \
> + for (i = 0; i < (int)(datalen); i++) { \
> + printk("%2x ", pdata[i]);  \
> + if ((i + 1) % 16 == 0) \
> + printk("\n");  \
> + }  \
> + printk("\n");  \

without pr_cont/KERN_CONT, this will output a terrible mess.

It's probably better to use print_hex_dump_debug




[PATCH v2 2/3] staging: rtl8192u: fix macro alignment in ieee80211

2019-08-21 Thread Stephen Brennan
Several macros display unaligned, due to mixes of tabs and spaces. These
can be fixed by making spacing consistent, do this.

Signed-off-by: Stephen Brennan 
---
 .../staging/rtl8192u/ieee80211/ieee80211.h| 35 ++-
 .../staging/rtl8192u/ieee80211/rtl819x_HT.h   |  8 ++---
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211.h 
b/drivers/staging/rtl8192u/ieee80211/ieee80211.h
index 129dcb5a0f2e..6b7828a9e71d 100644
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211.h
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211.h
@@ -169,9 +169,9 @@ struct cb_desc {
 #define MGN_MCS14   0x8e
 #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_5G) ? \
+   priv->ieee80211->current_network.mode == IEEE_N_5G) ?  \
   16 : 10)
 
 #define MGMT_QUEUE_NUM 5
@@ -387,7 +387,7 @@ struct ieee_param {
 #define IEEE80211_STYPE_ACK0x00D0
 #define IEEE80211_STYPE_CFEND  0x00E0
 #define IEEE80211_STYPE_CFENDACK   0x00F0
-#define IEEE80211_STYPE_BLOCKACK   0x0094
+#define IEEE80211_STYPE_BLOCKACK   0x0094
 
 /* data */
 #define IEEE80211_STYPE_DATA   0x
@@ -452,18 +452,19 @@ do { if (ieee80211_debug_level & (level)) \
   printk(KERN_DEBUG "ieee80211: " fmt, ## args); } while (0)
 //wb added to debug out data buf
 //if you want print DATA buffer related BA, please set ieee80211_debug_level 
to DATA|BA
-#define IEEE80211_DEBUG_DATA(level, data, datalen) \
-   do { if ((ieee80211_debug_level & (level)) == (level))  \
-   {   \
-   int i;  \
-   u8 *pdata = (u8 *) data;\
-   printk(KERN_DEBUG "ieee80211: %s()\n", __func__);   
\
-   for (i = 0; i < (int)(datalen); i++) {  \
-   printk("%2x ", pdata[i]);   \
-   if ((i + 1) % 16 == 0) printk("\n");\
-   }   \
-   printk("\n");   \
-   }   \
+#define IEEE80211_DEBUG_DATA(level, data, datalen) 
\
+   do { if ((ieee80211_debug_level & (level)) == (level)) \
+   {  \
+   int i; \
+   u8 *pdata = (u8 *) data;   \
+   printk(KERN_DEBUG "ieee80211: %s()\n", __func__);  \
+   for (i = 0; i < (int)(datalen); i++) { \
+   printk("%2x ", pdata[i]);  \
+   if ((i + 1) % 16 == 0) \
+   printk("\n");  \
+   }  \
+   printk("\n");  \
+   }  \
} while (0)
 #else
 #define IEEE80211_DEBUG (level, fmt, args...) do {} while (0)
@@ -2014,8 +2015,8 @@ struct ieee80211_device {
 #define IEEE_A(1<<0)
 #define IEEE_B(1<<1)
 #define IEEE_G(1<<2)
-#define IEEE_N_24G   (1<<4)
-#defineIEEE_N_5G (1<<5)
+#define IEEE_N_24G(1<<4)
+#define IEEE_N_5G (1<<5)
 #define IEEE_MODE_MASK(IEEE_A | IEEE_B | IEEE_G)
 
 /* Generate a 802.11 header */
diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h 
b/drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h
index 3fca0d3a1d05..586d93720e37 100644
--- a/drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h
+++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h
@@ -253,10 +253,10 @@ extern u8 MCS_FILTER_1SS[16];
 /* 2007/07/12 MH We only define legacy and HT wireless mode now. */
 #defineLEGACY_WIRELESS_MODEIEEE_MODE_MASK
 
-#define CURRENT_RATE(WirelessMode, LegacyRate, HTRate) \
-   ((WirelessMode & 
(LEGACY_WIRELESS_MODE)) != 0) ?\
-   (LegacyRate) :\
-   (PICK_RATE(LegacyRate, HTRate))
+#define CURRENT_RATE(WirelessMode, LegacyRate, HTRate)   \
+   ((WirelessMode & (LEGACY_WIRELESS_MODE)) != 0) ? \
+   (LegacyRate) :   \
+