Re: [PATCH] staging: rtl8723bs/core: add spaces between operators

[Joe Perches]

On Tue, 2021-03-16 at 20:05 +0800, Qiang Ma wrote:
> Add spaces between operators for a better readability
> in function 'rtw_seccalctkipmic'.

Perhaps better would be to refactor it a bit to
follow the comments.  Something like:
---
 drivers/staging/rtl8723bs/core/rtw_security.c | 24 ++--
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_security.c 
b/drivers/staging/rtl8723bs/core/rtw_security.c
index a311595deafb..a30e1fa717af 100644
--- a/drivers/staging/rtl8723bs/core/rtw_security.c
+++ b/drivers/staging/rtl8723bs/core/rtw_security.c
@@ -405,30 +405,26 @@ void rtw_secgetmic(struct mic_data *pmicdata, u8 *dst)
 
 void rtw_seccalctkipmic(u8 *key, u8 *header, u8 *data, u32 data_len, u8 
*mic_code, u8 pri)
 {
-
struct mic_data micdata;
u8 priority[4] = {0x0, 0x0, 0x0, 0x0};
+   int da_offset;
+   int sa_offset;
 
rtw_secmicsetkey(, key);
priority[0] = pri;
 
/* Michael MIC pseudo header: DA, SA, 3 x 0, Priority */
-   if (header[1]&1) {   /* ToDS == 1 */
-   rtw_secmicappend(, [16], 6);  /* DA */
-   if (header[1]&2)  /* From Ds == 1 */
-   rtw_secmicappend(, [24], 6);
-   else
-   rtw_secmicappend(, [10], 6);
-   } else {/* ToDS == 0 */
-   rtw_secmicappend(, [4], 6);   /* DA */
-   if (header[1]&2)  /* From Ds == 1 */
-   rtw_secmicappend(, [16], 6);
-   else
-   rtw_secmicappend(, [10], 6);
+   if (header[1] & 1) {   /* ToDS == 1 */
+   da_offset = 16;
+   sa_offset = (header[1] & 2) ? 24 : 10;
+   } else {/* ToDS == 0 */
+   da_offset = 4;
+   sa_offset = (header[1] & 2) ? 16 : 10;
}
+   rtw_secmicappend(, [da_offset], 6);  /* DA */
+   rtw_secmicappend(, [sa_offset], 6);  /* SA */
rtw_secmicappend(, [0], 4);
 
-
rtw_secmicappend(, data, data_len);
 
rtw_secgetmic(, mic_code);

[PATCH] staging: rtl8723bs/core: add spaces between operators

[Qiang Ma]

Add spaces between operators for a better readability
in function 'rtw_seccalctkipmic'.

Signed-off-by: Qiang Ma 
---
 drivers/staging/rtl8723bs/core/rtw_security.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_security.c 
b/drivers/staging/rtl8723bs/core/rtw_security.c
index 3e576cbe4712..469e4d563da1 100644
--- a/drivers/staging/rtl8723bs/core/rtw_security.c
+++ b/drivers/staging/rtl8723bs/core/rtw_security.c
@@ -413,15 +413,15 @@ void rtw_seccalctkipmic(u8 *key, u8 *header, u8 *data, 
u32 data_len, u8 *mic_cod
priority[0] = pri;
 
/* Michael MIC pseudo header: DA, SA, 3 x 0, Priority */
-   if (header[1]&1) {   /* ToDS == 1 */
+   if (header[1] & 1) {   /* ToDS == 1 */
rtw_secmicappend(, [16], 6);  /* DA */
-   if (header[1]&2)  /* From Ds == 1 */
+   if (header[1] & 2)  /* From Ds == 1 */
rtw_secmicappend(, [24], 6);
else
rtw_secmicappend(, [10], 6);
} else {/* ToDS == 0 */
rtw_secmicappend(, [4], 6);   /* DA */
-   if (header[1]&2)  /* From Ds == 1 */
+   if (header[1] & 2)  /* From Ds == 1 */
rtw_secmicappend(, [16], 6);
else
rtw_secmicappend(, [10], 6);
-- 
2.20.1