rtl8188eu: Correcting macro ROUND macro defination
PATCH 1/1 rtl8188eu: Correcting macro ROUND macro defination
Description:
There should not be ';' after do ... while(0) in macro defination
--- drivers/staging/rtl8188eu/core/rtw_security.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rtl8188eu/core/rtw_security.c +1 -1
@@ -1690,4 +1690,4 @@ do { \ 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); +} while (0)
Signature · 1 line
2.7.4
Quoted 19 lines · Pushkar Jambhlekar
Description:
There should not be ';' after do ... while(0) in macro definationSigned-off-by Pushkar Jambhlekar <[email protected]>--- drivers/staging/rtl8188eu/core/rtw_security.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/staging/rtl8188eu/core/rtw_security.c +1
-2@@ -1690,4 +1690,4 @@ do { \ 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); +} while (0) --
Quoted 2 lines
2.7.4
A semicolon is required after 'while(bool);' in 'do..while'. Without it, you get a compile time error.
Hi Alexander,
It is not needed for a macro. I am modifying do---while() loop for ROUND macro.
/**
* Expand the cipher key into the encryption key schedule. *
* @return the number of rounds for the given cipher key size.
*/
#define ROUND(i, d, s) \
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)Quoted 26 lines · Alexander Kapshuk
Quoted 19 lines · Pushkar Jambhlekar
Description:
There should not be ';' after do ... while(0) in macro definationSigned-off-by Pushkar Jambhlekar <[email protected]>--- drivers/staging/rtl8188eu/core/rtw_security.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/staging/rtl8188eu/core/rtw_security.c +1
-2@@ -1690,4 +1690,4 @@ do { \ 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); +} while (0) --Quoted 2 lines
2.7.4
A semicolon is required after 'while(bool);' in 'do..while'. Without it, you get a compile time error.
Signature · 2 lines
Jambhlekar Pushkar Arun M.Tech IIT Roorkee
Quoted 48 lines · Pushkar Jambhlekar
Hi Alexander,
It is not needed for a macro. I am modifying do---while() loop for ROUND macro.
/**
* Expand the cipher key into the encryption key schedule. *
* @return the number of rounds for the given cipher key size.
*/
#defineROUND(i, d, s)\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)Quoted 10 lines · Alexander Kapshuk
Quoted 8 lines · Pushkar Jambhlekar
Description:
There should not be ';' after do ... while(0) in macro definationSigned-off-by Pushkar Jambhlekar <[email protected]>--- drivers/staging/rtl8188eu/core/rtw_security.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)Quoted 16 lines
Quoted 11 lines
drivers/staging/rtl8188eu/core/rtw_security.c +1
-2@@ -1690,4 +1690,4 @@ do { \ 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); +} while (0) --Quoted 2 lines
2.7.4
A semicolon is required after 'while(bool);' in 'do..while'. Without it, you get a compile time error.
Quoted 3 lines
--
Jambhlekar Pushkar Arun
M.Tech IIT Roorkee
You're right. My apologies.
Your concerns were valid. Since 'do' is defined on the new-line, git did not include it in diff.
Quoted 55 lines · Alexander Kapshuk
Quoted 48 lines · Pushkar Jambhlekar
Hi Alexander,
It is not needed for a macro. I am modifying do---while() loop for ROUND macro.
/**
* Expand the cipher key into the encryption key schedule. *
* @return the number of rounds for the given cipher key size.
*/
#defineROUND(i, d, s)\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)Quoted 10 lines · Alexander Kapshuk
Quoted 8 lines · Pushkar Jambhlekar
Description:
There should not be ';' after do ... while(0) in macro definationSigned-off-by Pushkar Jambhlekar <[email protected]>--- drivers/staging/rtl8188eu/core/rtw_security.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)Quoted 16 lines
Quoted 11 lines
drivers/staging/rtl8188eu/core/rtw_security.c +1
-2@@ -1690,4 +1690,4 @@ do { \ 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); +} while (0) --Quoted 2 lines
2.7.4
A semicolon is required after 'while(bool);' in 'do..while'. Without it, you get a compile time error.
Quoted 3 lines
--
Jambhlekar Pushkar Arun
M.Tech IIT RoorkeeYou're right. My apologies.
Signature · 2 lines
Jambhlekar Pushkar Arun M.Tech IIT Roorkee
I don't understand why we have any of these things under the /* AES tables*/ comment. They don't seem to be used anywhere. Can't we just delete them?
regards,
dan carpenter