Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1600241 > unrolled thread

[PATCH] rtl8188eu: Correcting macro ROUND macro defination

Started byPushkar Jambhlekar <pushkar.iit@gmail.com>
First post2017-03-14 12:30 +0100
Last post2017-03-14 13:20 +0100
Articles 6 — 3 participants

Back to article view | Back to linux.kernel

Contents

  [PATCH] rtl8188eu: Correcting macro ROUND macro defination Pushkar Jambhlekar <pushkar.iit@gmail.com> - 2017-03-14 12:30 +0100
    Re: [PATCH] rtl8188eu: Correcting macro ROUND macro defination Alexander Kapshuk <alexander.kapshuk@gmail.com> - 2017-03-14 12:40 +0100
      Re: [PATCH] rtl8188eu: Correcting macro ROUND macro defination Pushkar Jambhlekar <pushkar.iit@gmail.com> - 2017-03-14 12:50 +0100
        Re: [PATCH] rtl8188eu: Correcting macro ROUND macro defination Alexander Kapshuk <alexander.kapshuk@gmail.com> - 2017-03-14 13:00 +0100
          Re: [PATCH] rtl8188eu: Correcting macro ROUND macro defination Pushkar Jambhlekar <pushkar.iit@gmail.com> - 2017-03-14 13:20 +0100
    Re: [PATCH] rtl8188eu: Correcting macro ROUND macro defination Dan Carpenter <dan.carpenter@oracle.com> - 2017-03-14 13:20 +0100

#1600241 — [PATCH] rtl8188eu: Correcting macro ROUND macro defination

FromPushkar Jambhlekar <pushkar.iit@gmail.com>
Date2017-03-14 12:30 +0100
Subject[PATCH] rtl8188eu: Correcting macro ROUND macro defination
Message-ID<tkSOl-7QC-15@gated-at.bofh.it>
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

[toc] | [next] | [standalone]

#1600254

FromAlexander Kapshuk <alexander.kapshuk@gmail.com>
Date2017-03-14 12:40 +0100
Message-ID<tkSY3-7U6-45@gated-at.bofh.it>
In reply to#1600241
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.

[toc] | [prev] | [next] | [standalone]

#1600263

FromPushkar Jambhlekar <pushkar.iit@gmail.com>
Date2017-03-14 12:50 +0100
Message-ID<tkT7H-7Za-9@gated-at.bofh.it>
In reply to#1600254
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

[toc] | [prev] | [next] | [standalone]

#1600269

FromAlexander Kapshuk <alexander.kapshuk@gmail.com>
Date2017-03-14 13:00 +0100
Message-ID<tkTho-84x-17@gated-at.bofh.it>
In reply to#1600263
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.

[toc] | [prev] | [next] | [standalone]

#1600280

FromPushkar Jambhlekar <pushkar.iit@gmail.com>
Date2017-03-14 13:20 +0100
Message-ID<tkTAK-8qq-15@gated-at.bofh.it>
In reply to#1600269
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

[toc] | [prev] | [next] | [standalone]

#1600278

FromDan Carpenter <dan.carpenter@oracle.com>
Date2017-03-14 13:20 +0100
Message-ID<tkTAK-8qq-9@gated-at.bofh.it>
In reply to#1600241
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

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web