Re: [Outreachy kernel] [PATCH] Staging: rtl8723au: rtw_xmit: Remove extra NULL tests

From: Shivani Bhardwaj <shivanib134@gmail.com>
To: Julia Lawall <julia.lawall@lip6.fr>
Cc: outreachy-kernel <outreachy-kernel@googlegroups.com>
Subject: Re: [Outreachy kernel] [PATCH] Staging: rtl8723au: rtw_xmit: Remove extra NULL tests
Date: Wed, 14 Oct 2015 14:38:24 +0530	[thread overview]
Message-ID: <CAKHNQQHkNOgY71D6eo5-R-OGBALnJ5H8fyHgkN0xcNMjDZ+T0Q@mail.gmail.com> (raw)
In-Reply-To: <alpine.DEB.2.02.1510140748240.2038@localhost6.localdomain6>

On Wed, Oct 14, 2015 at 11:18 AM, Julia Lawall <julia.lawall@lip6.fr> wrote:
> On Wed, 14 Oct 2015, Shivani Bhardwaj wrote:
>
>> Variables already tested for NULL value are checked again so, the extra
>> NULL tests should be removed.
>> Semantic patch used:
>>
>> @@ expression E; @@
>> if(E==NULL) {... return...;}
>> - if(E)
>
> This is not a valid semantic patch.  The if needs at least a then branch.
>
> julia
>
>

@@ expression E; @@
if(E==NULL) {... return ...;}
else S
-if(E==NULL){
+{
...
}
-else S

Can you check this one, Julia?

>>
>> Signed-off-by: Shivani Bhardwaj <shivanib134@gmail.com>
>> ---
>>  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
>>
>> --
>> 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/20151014005112.GA26569%40ubuntu.
>> For more options, visit https://groups.google.com/d/optout.
>>

