[PATCH v2] Staging: rtl8723au: rtw_xmit: Remove unnecessary tests

[PATCH v2] Staging: rtl8723au: rtw_xmit: Remove unnecessary tests

[Shivani Bhardwaj]

The variables which are preceded by NULL tests on them should not be
checked again.
Semantic patch used:
@@ expression E;
statement S1, S2, S3; @@
if(E==NULL) {... return ...;}
else S1
- if(E==NULL)
  S2
- else S3

Signed-off-by: Shivani Bhardwaj <shivanib134@gmail.com>
---
Changes in v2:
	-Correct the semantic patch and make commit message better.

 drivers/staging/rtl8723au/core/rtw_xmit.c | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/drivers/staging/rtl8723au/core/rtw_xmit.c b/drivers/staging/rtl8723au/core/rtw_xmit.c
index a4b6bb6..0ea521b 100644
--- a/drivers/staging/rtl8723au/core/rtw_xmit.c
+++ b/drivers/staging/rtl8723au/core/rtw_xmit.c
@@ -667,7 +667,6 @@ static int xmitframe_addmic(struct rtw_adapter *padapter,
 
 	if (pattrib->encrypt == WLAN_CIPHER_SUITE_TKIP) {
 		/* encode mic code */
-		if (stainfo) {
 			u8 null_key[16]={0x0, 0x0, 0x0, 0x0,
 					 0x0, 0x0, 0x0, 0x0,
 					 0x0, 0x0, 0x0, 0x0,
@@ -792,10 +791,6 @@ static int xmitframe_addmic(struct rtw_adapter *padapter,
 					 *(payload + curfragnum + 6),
 					 *(payload + curfragnum + 7));
 			}
-		} else {
-			RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_,
-				 "xmitframe_addmic: rtw_get_stainfo23a ==NULL!!!\n");
-		}
 	}
 
 	return _SUCCESS;
@@ -934,7 +929,6 @@ static int rtw_make_wlanhdr(struct rtw_adapter *padapter, u8 *hdr,
 		/* TODO: fill HT Control Field */
 
 		/* Update Seq Num will be handled by f/w */
-		if (psta) {
 			psta->sta_xmitpriv.txseq_tid[pattrib->priority]++;
 			psta->sta_xmitpriv.txseq_tid[pattrib->priority] &= 0xFFF;
 			pattrib->seqnum = psta->sta_xmitpriv.txseq_tid[pattrib->priority];
@@ -970,7 +964,6 @@ static int rtw_make_wlanhdr(struct rtw_adapter *padapter, u8 *hdr,
 					pattrib->ampdu_en = true;/* AGG EN */
 				}
 			}
-		}
 	}
 exit:
 	return res;
@@ -1132,7 +1125,6 @@ int rtw_xmitframe_coalesce23a(struct rtw_adapter *padapter, struct sk_buff *skb,
 
 		/* adding icv, if necessary... */
 		if (pattrib->iv_len) {
-			if (psta) {
 				switch (pattrib->encrypt) {
 				case WLAN_CIPHER_SUITE_WEP40:
 				case WLAN_CIPHER_SUITE_WEP104:
@@ -1158,7 +1150,6 @@ int rtw_xmitframe_coalesce23a(struct rtw_adapter *padapter, struct sk_buff *skb,
 						       psta->dot11txpn, 0);
 					break;
 				}
-			}
 
 			memcpy(pframe, pattrib->iv, pattrib->iv_len);
 
-- 
2.1.0

Re: [Outreachy kernel] [PATCH v2] Staging: rtl8723au: rtw_xmit: Remove unnecessary tests

[Sudip Mukherjee]

On Wed, Oct 14, 2015 at 04:02:56PM +0530, Shivani Bhardwaj wrote:
> The variables which are preceded by NULL tests on them should not be
> checked again.
> Semantic patch used:
> @@ expression E;
> statement S1, S2, S3; @@
> if(E==NULL) {... return ...;}
> else S1
> - if(E==NULL)
>   S2
> - else S3
> 
> Signed-off-by: Shivani Bhardwaj <shivanib134@gmail.com>
> ---
> Changes in v2:
> 	-Correct the semantic patch and make commit message better.
> 
>  drivers/staging/rtl8723au/core/rtw_xmit.c | 9 ---------
>  1 file changed, 9 deletions(-)
> 
> diff --git a/drivers/staging/rtl8723au/core/rtw_xmit.c b/drivers/staging/rtl8723au/core/rtw_xmit.c
> index a4b6bb6..0ea521b 100644
> --- a/drivers/staging/rtl8723au/core/rtw_xmit.c
> +++ b/drivers/staging/rtl8723au/core/rtw_xmit.c
> @@ -667,7 +667,6 @@ static int xmitframe_addmic(struct rtw_adapter *padapter,
>  
>  	if (pattrib->encrypt == WLAN_CIPHER_SUITE_TKIP) {
>  		/* encode mic code */
> -		if (stainfo) {
>  			u8 null_key[16]={0x0, 0x0, 0x0, 0x0,
>  					 0x0, 0x0, 0x0, 0x0,
>  					 0x0, 0x0, 0x0, 0x0,

Now this indention is looking wrong.

regards
sudip

Re: [Outreachy kernel] [PATCH v2] Staging: rtl8723au: rtw_xmit: Remove unnecessary tests

[Shivani Bhardwaj]

On Thu, Oct 15, 2015 at 12:17 PM, Sudip Mukherjee
<sudipm.mukherjee@gmail.com> wrote:
> On Wed, Oct 14, 2015 at 04:02:56PM +0530, Shivani Bhardwaj wrote:
>> The variables which are preceded by NULL tests on them should not be
>> checked again.
>> Semantic patch used:
>> @@ expression E;
>> statement S1, S2, S3; @@
>> if(E==NULL) {... return ...;}
>> else S1
>> - if(E==NULL)
>>   S2
>> - else S3
>>
>> Signed-off-by: Shivani Bhardwaj <shivanib134@gmail.com>
>> ---
>> Changes in v2:
>>       -Correct the semantic patch and make commit message better.
>>
>>  drivers/staging/rtl8723au/core/rtw_xmit.c | 9 ---------
>>  1 file changed, 9 deletions(-)
>>
>> diff --git a/drivers/staging/rtl8723au/core/rtw_xmit.c b/drivers/staging/rtl8723au/core/rtw_xmit.c
>> index a4b6bb6..0ea521b 100644
>> --- a/drivers/staging/rtl8723au/core/rtw_xmit.c
>> +++ b/drivers/staging/rtl8723au/core/rtw_xmit.c
>> @@ -667,7 +667,6 @@ static int xmitframe_addmic(struct rtw_adapter *padapter,
>>
>>       if (pattrib->encrypt == WLAN_CIPHER_SUITE_TKIP) {
>>               /* encode mic code */
>> -             if (stainfo) {
>>                       u8 null_key[16]={0x0, 0x0, 0x0, 0x0,
>>                                        0x0, 0x0, 0x0, 0x0,
>>                                        0x0, 0x0, 0x0, 0x0,
>
> Now this indention is looking wrong.
>
> regards
> sudip
Is it also supposed to be a part of the same patch or a series should be made?

Re: [Outreachy kernel] [PATCH v2] Staging: rtl8723au: rtw_xmit: Remove unnecessary tests

[Sudip Mukherjee]

On Thu, Oct 15, 2015 at 12:39:05PM +0530, Shivani Bhardwaj wrote:
> On Thu, Oct 15, 2015 at 12:17 PM, Sudip Mukherjee
> <sudipm.mukherjee@gmail.com> wrote:
> > On Wed, Oct 14, 2015 at 04:02:56PM +0530, Shivani Bhardwaj wrote:
> >> The variables which are preceded by NULL tests on them should not be
> >> checked again.
> >> Semantic patch used:
> >> @@ expression E;
> >> statement S1, S2, S3; @@
> >> if(E==NULL) {... return ...;}
> >> else S1
> >> - if(E==NULL)
> >>   S2
> >> - else S3
> >>
> >> Signed-off-by: Shivani Bhardwaj <shivanib134@gmail.com>
> >> ---
> >> Changes in v2:
> >>       -Correct the semantic patch and make commit message better.
> >>
> >>  drivers/staging/rtl8723au/core/rtw_xmit.c | 9 ---------
> >>  1 file changed, 9 deletions(-)
> >>
> >> diff --git a/drivers/staging/rtl8723au/core/rtw_xmit.c b/drivers/staging/rtl8723au/core/rtw_xmit.c
> >> index a4b6bb6..0ea521b 100644
> >> --- a/drivers/staging/rtl8723au/core/rtw_xmit.c
> >> +++ b/drivers/staging/rtl8723au/core/rtw_xmit.c
> >> @@ -667,7 +667,6 @@ static int xmitframe_addmic(struct rtw_adapter *padapter,
> >>
> >>       if (pattrib->encrypt == WLAN_CIPHER_SUITE_TKIP) {
> >>               /* encode mic code */
> >> -             if (stainfo) {
> >>                       u8 null_key[16]={0x0, 0x0, 0x0, 0x0,
> >>                                        0x0, 0x0, 0x0, 0x0,
> >>                                        0x0, 0x0, 0x0, 0x0,
> >
> > Now this indention is looking wrong.
> >
> > regards
> > sudip
> Is it also supposed to be a part of the same patch or a series should be made?

same patch as that indention problem is caused as "if (stainfo) {" is
removed. But can the cocci script handle that? maybe you need to modify
the indention by hand, and mention that in the commit message.

regards
sudip

Re: [Outreachy kernel] [PATCH v2] Staging: rtl8723au: rtw_xmit: Remove unnecessary tests

[Shivani Bhardwaj]

On Thu, Oct 15, 2015 at 12:52 PM, Sudip Mukherjee
<sudipm.mukherjee@gmail.com> wrote:
> On Thu, Oct 15, 2015 at 12:39:05PM +0530, Shivani Bhardwaj wrote:
>> On Thu, Oct 15, 2015 at 12:17 PM, Sudip Mukherjee
>> <sudipm.mukherjee@gmail.com> wrote:
>> > On Wed, Oct 14, 2015 at 04:02:56PM +0530, Shivani Bhardwaj wrote:
>> >> The variables which are preceded by NULL tests on them should not be
>> >> checked again.
>> >> Semantic patch used:
>> >> @@ expression E;
>> >> statement S1, S2, S3; @@
>> >> if(E==NULL) {... return ...;}
>> >> else S1
>> >> - if(E==NULL)
>> >>   S2
>> >> - else S3
>> >>
>> >> Signed-off-by: Shivani Bhardwaj <shivanib134@gmail.com>
>> >> ---
>> >> Changes in v2:
>> >>       -Correct the semantic patch and make commit message better.
>> >>
>> >>  drivers/staging/rtl8723au/core/rtw_xmit.c | 9 ---------
>> >>  1 file changed, 9 deletions(-)
>> >>
>> >> diff --git a/drivers/staging/rtl8723au/core/rtw_xmit.c b/drivers/staging/rtl8723au/core/rtw_xmit.c
>> >> index a4b6bb6..0ea521b 100644
>> >> --- a/drivers/staging/rtl8723au/core/rtw_xmit.c
>> >> +++ b/drivers/staging/rtl8723au/core/rtw_xmit.c
>> >> @@ -667,7 +667,6 @@ static int xmitframe_addmic(struct rtw_adapter *padapter,
>> >>
>> >>       if (pattrib->encrypt == WLAN_CIPHER_SUITE_TKIP) {
>> >>               /* encode mic code */
>> >> -             if (stainfo) {
>> >>                       u8 null_key[16]={0x0, 0x0, 0x0, 0x0,
>> >>                                        0x0, 0x0, 0x0, 0x0,
>> >>                                        0x0, 0x0, 0x0, 0x0,
>> >
>> > Now this indention is looking wrong.
>> >
>> > regards
>> > sudip
>> Is it also supposed to be a part of the same patch or a series should be made?
>
> same patch as that indention problem is caused as "if (stainfo) {" is
> removed. But can the cocci script handle that? maybe you need to modify
> the indention by hand, and mention that in the commit message.
>
> regards
> sudip

I don't know if cocci script can do that. I'll have to ask Julia.
Anyway, I'll make the changes by hand.

Re: [Outreachy kernel] [PATCH v2] Staging: rtl8723au: rtw_xmit: Remove unnecessary tests

[Julia Lawall]

On Thu, 15 Oct 2015, Shivani Bhardwaj wrote:

> On Thu, Oct 15, 2015 at 12:52 PM, Sudip Mukherjee
> <sudipm.mukherjee@gmail.com> wrote:
> > On Thu, Oct 15, 2015 at 12:39:05PM +0530, Shivani Bhardwaj wrote:
> >> On Thu, Oct 15, 2015 at 12:17 PM, Sudip Mukherjee
> >> <sudipm.mukherjee@gmail.com> wrote:
> >> > On Wed, Oct 14, 2015 at 04:02:56PM +0530, Shivani Bhardwaj wrote:
> >> >> The variables which are preceded by NULL tests on them should not be
> >> >> checked again.
> >> >> Semantic patch used:
> >> >> @@ expression E;
> >> >> statement S1, S2, S3; @@
> >> >> if(E==NULL) {... return ...;}
> >> >> else S1
> >> >> - if(E==NULL)
> >> >>   S2
> >> >> - else S3
> >> >>
> >> >> Signed-off-by: Shivani Bhardwaj <shivanib134@gmail.com>
> >> >> ---
> >> >> Changes in v2:
> >> >>       -Correct the semantic patch and make commit message better.
> >> >>
> >> >>  drivers/staging/rtl8723au/core/rtw_xmit.c | 9 ---------
> >> >>  1 file changed, 9 deletions(-)
> >> >>
> >> >> diff --git a/drivers/staging/rtl8723au/core/rtw_xmit.c b/drivers/staging/rtl8723au/core/rtw_xmit.c
> >> >> index a4b6bb6..0ea521b 100644
> >> >> --- a/drivers/staging/rtl8723au/core/rtw_xmit.c
> >> >> +++ b/drivers/staging/rtl8723au/core/rtw_xmit.c
> >> >> @@ -667,7 +667,6 @@ static int xmitframe_addmic(struct rtw_adapter *padapter,
> >> >>
> >> >>       if (pattrib->encrypt == WLAN_CIPHER_SUITE_TKIP) {
> >> >>               /* encode mic code */
> >> >> -             if (stainfo) {
> >> >>                       u8 null_key[16]={0x0, 0x0, 0x0, 0x0,
> >> >>                                        0x0, 0x0, 0x0, 0x0,
> >> >>                                        0x0, 0x0, 0x0, 0x0,
> >> >
> >> > Now this indention is looking wrong.
> >> >
> >> > regards
> >> > sudip
> >> Is it also supposed to be a part of the same patch or a series should be made?
> >
> > same patch as that indention problem is caused as "if (stainfo) {" is
> > removed. But can the cocci script handle that? maybe you need to modify
> > the indention by hand, and mention that in the commit message.
> >
> > regards
> > sudip
>
> I don't know if cocci script can do that. I'll have to ask Julia.
> Anyway, I'll make the changes by hand.

Coccinelle is supposed to clean up the indentation, but it seems that it
is not.  Could you send me your semantic patch, and I will check on it.

thanks,
julia

Re: [Outreachy kernel] [PATCH v2] Staging: rtl8723au: rtw_xmit: Remove unnecessary tests

[Shivani Bhardwaj]

On Thu, Oct 15, 2015 at 1:17 PM, Julia Lawall <julia.lawall@lip6.fr> wrote:
>
>
> On Thu, 15 Oct 2015, Shivani Bhardwaj wrote:
>
>> On Thu, Oct 15, 2015 at 12:52 PM, Sudip Mukherjee
>> <sudipm.mukherjee@gmail.com> wrote:
>> > On Thu, Oct 15, 2015 at 12:39:05PM +0530, Shivani Bhardwaj wrote:
>> >> On Thu, Oct 15, 2015 at 12:17 PM, Sudip Mukherjee
>> >> <sudipm.mukherjee@gmail.com> wrote:
>> >> > On Wed, Oct 14, 2015 at 04:02:56PM +0530, Shivani Bhardwaj wrote:
>> >> >> The variables which are preceded by NULL tests on them should not be
>> >> >> checked again.
>> >> >> Semantic patch used:
>> >> >> @@ expression E;
>> >> >> statement S1, S2, S3; @@
>> >> >> if(E==NULL) {... return ...;}
>> >> >> else S1
>> >> >> - if(E==NULL)
>> >> >>   S2
>> >> >> - else S3
>> >> >>
>> >> >> Signed-off-by: Shivani Bhardwaj <shivanib134@gmail.com>
>> >> >> ---
>> >> >> Changes in v2:
>> >> >>       -Correct the semantic patch and make commit message better.
>> >> >>
>> >> >>  drivers/staging/rtl8723au/core/rtw_xmit.c | 9 ---------
>> >> >>  1 file changed, 9 deletions(-)
>> >> >>
>> >> >> diff --git a/drivers/staging/rtl8723au/core/rtw_xmit.c b/drivers/staging/rtl8723au/core/rtw_xmit.c
>> >> >> index a4b6bb6..0ea521b 100644
>> >> >> --- a/drivers/staging/rtl8723au/core/rtw_xmit.c
>> >> >> +++ b/drivers/staging/rtl8723au/core/rtw_xmit.c
>> >> >> @@ -667,7 +667,6 @@ static int xmitframe_addmic(struct rtw_adapter *padapter,
>> >> >>
>> >> >>       if (pattrib->encrypt == WLAN_CIPHER_SUITE_TKIP) {
>> >> >>               /* encode mic code */
>> >> >> -             if (stainfo) {
>> >> >>                       u8 null_key[16]={0x0, 0x0, 0x0, 0x0,
>> >> >>                                        0x0, 0x0, 0x0, 0x0,
>> >> >>                                        0x0, 0x0, 0x0, 0x0,
>> >> >
>> >> > Now this indention is looking wrong.
>> >> >
>> >> > regards
>> >> > sudip
>> >> Is it also supposed to be a part of the same patch or a series should be made?
>> >
>> > same patch as that indention problem is caused as "if (stainfo) {" is
>> > removed. But can the cocci script handle that? maybe you need to modify
>> > the indention by hand, and mention that in the commit message.
>> >
>> > regards
>> > sudip
>>
>> I don't know if cocci script can do that. I'll have to ask Julia.
>> Anyway, I'll make the changes by hand.
>
> Coccinelle is supposed to clean up the indentation, but it seems that it
> is not.  Could you send me your semantic patch, and I will check on it.
>
> thanks,
> julia

I just used the script to detect null tests. I used
http://coccinelle.lip6.fr/rules/notnull.cocci .
I still don't know well about making changes to cocci scripts. :(

Re: [Outreachy kernel] [PATCH v2] Staging: rtl8723au: rtw_xmit: Remove unnecessary tests

[Julia Lawall]

On Thu, 15 Oct 2015, Shivani Bhardwaj wrote:

> On Thu, Oct 15, 2015 at 12:17 PM, Sudip Mukherjee
> <sudipm.mukherjee@gmail.com> wrote:
> > On Wed, Oct 14, 2015 at 04:02:56PM +0530, Shivani Bhardwaj wrote:
> >> The variables which are preceded by NULL tests on them should not be
> >> checked again.
> >> Semantic patch used:
> >> @@ expression E;
> >> statement S1, S2, S3; @@
> >> if(E==NULL) {... return ...;}
> >> else S1
> >> - if(E==NULL)
> >>   S2
> >> - else S3
> >>
> >> Signed-off-by: Shivani Bhardwaj <shivanib134@gmail.com>
> >> ---
> >> Changes in v2:
> >>       -Correct the semantic patch and make commit message better.
> >>
> >>  drivers/staging/rtl8723au/core/rtw_xmit.c | 9 ---------
> >>  1 file changed, 9 deletions(-)
> >>
> >> diff --git a/drivers/staging/rtl8723au/core/rtw_xmit.c b/drivers/staging/rtl8723au/core/rtw_xmit.c
> >> index a4b6bb6..0ea521b 100644
> >> --- a/drivers/staging/rtl8723au/core/rtw_xmit.c
> >> +++ b/drivers/staging/rtl8723au/core/rtw_xmit.c
> >> @@ -667,7 +667,6 @@ static int xmitframe_addmic(struct rtw_adapter *padapter,
> >>
> >>       if (pattrib->encrypt == WLAN_CIPHER_SUITE_TKIP) {
> >>               /* encode mic code */
> >> -             if (stainfo) {
> >>                       u8 null_key[16]={0x0, 0x0, 0x0, 0x0,
> >>                                        0x0, 0x0, 0x0, 0x0,
> >>                                        0x0, 0x0, 0x0, 0x0,
> >
> > Now this indention is looking wrong.
> >
> > regards
> > sudip
> Is it also supposed to be a part of the same patch or a series should be made?

Same.  The removal caused the indentation problem, so the same patch
should fix it up.

julia

>
> --
> You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to outreachy-kernel+unsubscribe@googlegroups.com.
> To post to this group, send email to outreachy-kernel@googlegroups.com.
> To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/CAKHNQQGOs9OPBZi6Eoy3t7R1ybZf5kmnTUJx9JRxGTmhAhmCjg%40mail.gmail.com.
> For more options, visit https://groups.google.com/d/optout.
>