fix error: Macros with multiple statements should be enclosed in a do -
while loop Detected by scripts/checkpatch.pl -f
>From b1bcd6f9d31f5ea899799f0f9b4cf04a0558d2d8 Mon Sep 17 00:00:00 2001
From: Jamie Huang <jamienstar@xxxxxxx>
Date: Thu, 4 May 2017 14:49:26 +0800
Subject: [PATCH] staging: fix macros with multiple statements in
rtl8723bs/core/rtw_security.c
ERROR: Macros with multiple statements should be enclosed in a do - while loop
Detected by scripts/checkpatch.pl -f
Signed-off-by: Jamie Huang <jamienstar@xxxxxxx>
---
drivers/staging/rtl8723bs/core/rtw_security.c | 46 +++++++++++++++++----------
1 file changed, 30 insertions(+), 16 deletions(-)
diff --git a/drivers/staging/rtl8723bs/core/rtw_security.c b/drivers/staging/rtl8723bs/core/rtw_security.c
index e832f16..8f90a0d 100644
--- a/drivers/staging/rtl8723bs/core/rtw_security.c
+++ b/drivers/staging/rtl8723bs/core/rtw_security.c
@@ -38,52 +38,64 @@ const char *security_type_str(u8 value)
#ifdef DBG_SW_SEC_CNT
#define WEP_SW_ENC_CNT_INC(sec, ra) \
+do { \
if (is_broadcast_mac_addr(ra)) \
sec->wep_sw_enc_cnt_bc++; \
else if (is_multicast_mac_addr(ra)) \
sec->wep_sw_enc_cnt_mc++; \
- else \
- sec->wep_sw_enc_cnt_uc++;
+ else \
+ sec->wep_sw_enc_cnt_uc++; \
+} while (0)
#define WEP_SW_DEC_CNT_INC(sec, ra) \
+do { \
if (is_broadcast_mac_addr(ra)) \
sec->wep_sw_dec_cnt_bc++; \
else if (is_multicast_mac_addr(ra)) \
sec->wep_sw_dec_cnt_mc++; \
- else \
- sec->wep_sw_dec_cnt_uc++;
+ else \
+ sec->wep_sw_dec_cnt_uc++;\
+} while (0)
#define TKIP_SW_ENC_CNT_INC(sec, ra) \
+do { \
if (is_broadcast_mac_addr(ra)) \
sec->tkip_sw_enc_cnt_bc++; \
else if (is_multicast_mac_addr(ra)) \
sec->tkip_sw_enc_cnt_mc++; \
- else \
- sec->tkip_sw_enc_cnt_uc++;
+ else \
+ sec->tkip_sw_enc_cnt_uc++;\
+} while (0)
#define TKIP_SW_DEC_CNT_INC(sec, ra) \
+do { \
if (is_broadcast_mac_addr(ra)) \
sec->tkip_sw_dec_cnt_bc++; \
else if (is_multicast_mac_addr(ra)) \
sec->tkip_sw_dec_cnt_mc++; \
- else \
- sec->tkip_sw_dec_cnt_uc++;
+ else \
+ sec->tkip_sw_dec_cnt_uc++;\
+} while (0)
#define AES_SW_ENC_CNT_INC(sec, ra) \
+do { \
if (is_broadcast_mac_addr(ra)) \
sec->aes_sw_enc_cnt_bc++; \
else if (is_multicast_mac_addr(ra)) \
sec->aes_sw_enc_cnt_mc++; \
- else \
- sec->aes_sw_enc_cnt_uc++;
+ else \
+ sec->aes_sw_enc_cnt_uc++;\
+} while (0)
#define AES_SW_DEC_CNT_INC(sec, ra) \
+do { \
if (is_broadcast_mac_addr(ra)) \
sec->aes_sw_dec_cnt_bc++; \
else if (is_multicast_mac_addr(ra)) \
sec->aes_sw_dec_cnt_mc++; \
- else \
- sec->aes_sw_dec_cnt_uc++;
+ else \
+ sec->aes_sw_dec_cnt_uc++;\
+} while (0)
#else
#define WEP_SW_ENC_CNT_INC(sec, ra)
#define WEP_SW_DEC_CNT_INC(sec, ra)
@@ -2236,10 +2248,12 @@ static void rijndaelEncrypt(u32 rk[/*44*/], u8 pt[16], u8 ct[16])
s3 = GETU32(pt + 12) ^ rk[3];
#define ROUND(i, d, s) \
-d##0 = TE0(s##0) ^ TE1(s##1) ^ TE2(s##2) ^ TE3(s##3) ^ rk[4 * i]; \
-d##1 = TE0(s##1) ^ TE1(s##2) ^ TE2(s##3) ^ TE3(s##0) ^ rk[4 * i + 1]; \
-d##2 = TE0(s##2) ^ TE1(s##3) ^ TE2(s##0) ^ TE3(s##1) ^ rk[4 * i + 2]; \
-d##3 = TE0(s##3) ^ TE1(s##0) ^ TE2(s##1) ^ TE3(s##2) ^ rk[4 * i + 3]
+do { \
+ d##0 = TE0(s##0) ^ TE1(s##1) ^ TE2(s##2) ^ TE3(s##3) ^ rk[4 * i]; \
+ d##1 = TE0(s##1) ^ TE1(s##2) ^ TE2(s##3) ^ TE3(s##0) ^ rk[4 * i + 1]; \
+ d##2 = TE0(s##2) ^ TE1(s##3) ^ TE2(s##0) ^ TE3(s##1) ^ rk[4 * i + 2]; \
+ d##3 = TE0(s##3) ^ TE1(s##0) ^ TE2(s##1) ^ TE3(s##2) ^ rk[4 * i + 3] \
+} while (0)
/* Nr - 1 full rounds: */
r = Nr >> 1;
--
2.5.0
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
