* [PATCH] rtl8188eu: Correcting macro ROUND macro defination
@ 2017-03-14 11:26 Pushkar Jambhlekar
2017-03-14 11:32 ` Alexander Kapshuk
2017-03-14 12:17 ` Dan Carpenter
0 siblings, 2 replies; 6+ messages in thread
From: Pushkar Jambhlekar @ 2017-03-14 11:26 UTC (permalink / raw)
To: Greg Kroah-Hartman, Ivan Safonov, Pushkar Jambhlekar,
Yamanappagouda Patil, William Blough, Georgiana Rodica Chelu,
Kyle Kuffermann
Cc: devel, linux-kernel
Description:
There should not be ';' after do ... while(0) in macro defination
Signed-off-by: Pushkar Jambhlekar <pushkar.iit@gmail.com>
---
drivers/staging/rtl8188eu/core/rtw_security.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/rtl8188eu/core/rtw_security.c b/drivers/staging/rtl8188eu/core/rtw_security.c
index b283a490..5b1ef22 100644
--- a/drivers/staging/rtl8188eu/core/rtw_security.c
+++ b/drivers/staging/rtl8188eu/core/rtw_security.c
@@ -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)
--
2.7.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] rtl8188eu: Correcting macro ROUND macro defination 2017-03-14 11:26 [PATCH] rtl8188eu: Correcting macro ROUND macro defination Pushkar Jambhlekar @ 2017-03-14 11:32 ` Alexander Kapshuk 2017-03-14 11:44 ` Pushkar Jambhlekar 2017-03-14 12:17 ` Dan Carpenter 1 sibling, 1 reply; 6+ messages in thread From: Alexander Kapshuk @ 2017-03-14 11:32 UTC (permalink / raw) To: Pushkar Jambhlekar Cc: Greg Kroah-Hartman, Ivan Safonov, Yamanappagouda Patil, William Blough, Georgiana Rodica Chelu, Kyle Kuffermann, devel, linux-kernel On Tue, Mar 14, 2017 at 1:26 PM, Pushkar Jambhlekar <pushkar.iit@gmail.com> wrote: > Description: > There should not be ';' after do ... while(0) in macro defination > > Signed-off-by: Pushkar Jambhlekar <pushkar.iit@gmail.com> > --- > drivers/staging/rtl8188eu/core/rtw_security.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/staging/rtl8188eu/core/rtw_security.c b/drivers/staging/rtl8188eu/core/rtw_security.c > index b283a490..5b1ef22 100644 > --- a/drivers/staging/rtl8188eu/core/rtw_security.c > +++ b/drivers/staging/rtl8188eu/core/rtw_security.c > @@ -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) > -- > 2.7.4 > A semicolon is required after 'while(bool);' in 'do..while'. Without it, you get a compile time error. ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] rtl8188eu: Correcting macro ROUND macro defination 2017-03-14 11:32 ` Alexander Kapshuk @ 2017-03-14 11:44 ` Pushkar Jambhlekar 2017-03-14 11:52 ` Alexander Kapshuk 0 siblings, 1 reply; 6+ messages in thread From: Pushkar Jambhlekar @ 2017-03-14 11:44 UTC (permalink / raw) To: Alexander Kapshuk Cc: Greg Kroah-Hartman, Ivan Safonov, Yamanappagouda Patil, William Blough, Georgiana Rodica Chelu, Kyle Kuffermann, devel, linux-kernel 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) On Tue, Mar 14, 2017 at 5:02 PM, Alexander Kapshuk <alexander.kapshuk@gmail.com> wrote: > On Tue, Mar 14, 2017 at 1:26 PM, Pushkar Jambhlekar > <pushkar.iit@gmail.com> wrote: >> Description: >> There should not be ';' after do ... while(0) in macro defination >> >> Signed-off-by: Pushkar Jambhlekar <pushkar.iit@gmail.com> >> --- >> drivers/staging/rtl8188eu/core/rtw_security.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/drivers/staging/rtl8188eu/core/rtw_security.c b/drivers/staging/rtl8188eu/core/rtw_security.c >> index b283a490..5b1ef22 100644 >> --- a/drivers/staging/rtl8188eu/core/rtw_security.c >> +++ b/drivers/staging/rtl8188eu/core/rtw_security.c >> @@ -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) >> -- >> 2.7.4 >> > > A semicolon is required after 'while(bool);' in 'do..while'. > Without it, you get a compile time error. -- Jambhlekar Pushkar Arun M.Tech IIT Roorkee ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] rtl8188eu: Correcting macro ROUND macro defination 2017-03-14 11:44 ` Pushkar Jambhlekar @ 2017-03-14 11:52 ` Alexander Kapshuk 2017-03-14 12:13 ` Pushkar Jambhlekar 0 siblings, 1 reply; 6+ messages in thread From: Alexander Kapshuk @ 2017-03-14 11:52 UTC (permalink / raw) To: Pushkar Jambhlekar Cc: Greg Kroah-Hartman, Ivan Safonov, Yamanappagouda Patil, William Blough, Georgiana Rodica Chelu, Kyle Kuffermann, devel, linux-kernel On Tue, Mar 14, 2017 at 1:44 PM, Pushkar Jambhlekar <pushkar.iit@gmail.com> wrote: > 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) > > On Tue, Mar 14, 2017 at 5:02 PM, Alexander Kapshuk > <alexander.kapshuk@gmail.com> wrote: >> On Tue, Mar 14, 2017 at 1:26 PM, Pushkar Jambhlekar >> <pushkar.iit@gmail.com> wrote: >>> Description: >>> There should not be ';' after do ... while(0) in macro defination >>> >>> Signed-off-by: Pushkar Jambhlekar <pushkar.iit@gmail.com> >>> --- >>> drivers/staging/rtl8188eu/core/rtw_security.c | 2 +- >>> 1 file changed, 1 insertion(+), 1 deletion(-) >>> >>> diff --git a/drivers/staging/rtl8188eu/core/rtw_security.c b/drivers/staging/rtl8188eu/core/rtw_security.c >>> index b283a490..5b1ef22 100644 >>> --- a/drivers/staging/rtl8188eu/core/rtw_security.c >>> +++ b/drivers/staging/rtl8188eu/core/rtw_security.c >>> @@ -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) >>> -- >>> 2.7.4 >>> >> >> A semicolon is required after 'while(bool);' in 'do..while'. >> Without it, you get a compile time error. > > > > -- > Jambhlekar Pushkar Arun > M.Tech IIT Roorkee You're right. My apologies. ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] rtl8188eu: Correcting macro ROUND macro defination 2017-03-14 11:52 ` Alexander Kapshuk @ 2017-03-14 12:13 ` Pushkar Jambhlekar 0 siblings, 0 replies; 6+ messages in thread From: Pushkar Jambhlekar @ 2017-03-14 12:13 UTC (permalink / raw) To: Alexander Kapshuk Cc: Greg Kroah-Hartman, Ivan Safonov, Yamanappagouda Patil, William Blough, Georgiana Rodica Chelu, Kyle Kuffermann, devel, linux-kernel Your concerns were valid. Since 'do' is defined on the new-line, git did not include it in diff. On Tue, Mar 14, 2017 at 5:22 PM, Alexander Kapshuk <alexander.kapshuk@gmail.com> wrote: > On Tue, Mar 14, 2017 at 1:44 PM, Pushkar Jambhlekar > <pushkar.iit@gmail.com> wrote: >> 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) >> >> On Tue, Mar 14, 2017 at 5:02 PM, Alexander Kapshuk >> <alexander.kapshuk@gmail.com> wrote: >>> On Tue, Mar 14, 2017 at 1:26 PM, Pushkar Jambhlekar >>> <pushkar.iit@gmail.com> wrote: >>>> Description: >>>> There should not be ';' after do ... while(0) in macro defination >>>> >>>> Signed-off-by: Pushkar Jambhlekar <pushkar.iit@gmail.com> >>>> --- >>>> drivers/staging/rtl8188eu/core/rtw_security.c | 2 +- >>>> 1 file changed, 1 insertion(+), 1 deletion(-) >>>> >>>> diff --git a/drivers/staging/rtl8188eu/core/rtw_security.c b/drivers/staging/rtl8188eu/core/rtw_security.c >>>> index b283a490..5b1ef22 100644 >>>> --- a/drivers/staging/rtl8188eu/core/rtw_security.c >>>> +++ b/drivers/staging/rtl8188eu/core/rtw_security.c >>>> @@ -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) >>>> -- >>>> 2.7.4 >>>> >>> >>> A semicolon is required after 'while(bool);' in 'do..while'. >>> Without it, you get a compile time error. >> >> >> >> -- >> Jambhlekar Pushkar Arun >> M.Tech IIT Roorkee > > You're right. My apologies. -- Jambhlekar Pushkar Arun M.Tech IIT Roorkee ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] rtl8188eu: Correcting macro ROUND macro defination 2017-03-14 11:26 [PATCH] rtl8188eu: Correcting macro ROUND macro defination Pushkar Jambhlekar 2017-03-14 11:32 ` Alexander Kapshuk @ 2017-03-14 12:17 ` Dan Carpenter 1 sibling, 0 replies; 6+ messages in thread From: Dan Carpenter @ 2017-03-14 12:17 UTC (permalink / raw) To: Pushkar Jambhlekar Cc: Greg Kroah-Hartman, Ivan Safonov, Yamanappagouda Patil, William Blough, Georgiana Rodica Chelu, Kyle Kuffermann, devel, linux-kernel 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 ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-03-14 12:18 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2017-03-14 11:26 [PATCH] rtl8188eu: Correcting macro ROUND macro defination Pushkar Jambhlekar 2017-03-14 11:32 ` Alexander Kapshuk 2017-03-14 11:44 ` Pushkar Jambhlekar 2017-03-14 11:52 ` Alexander Kapshuk 2017-03-14 12:13 ` Pushkar Jambhlekar 2017-03-14 12:17 ` Dan Carpenter
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox