[PATCH] Staging: rtl8192e: rtllib_softmac: Remove unnecessary NULL test

[PATCH] Staging: rtl8192e: rtllib_softmac: Remove unnecessary NULL test

[Shivani Bhardwaj]

Remove NULL test on the variable ssidbroad as it is already tested for that.

Signed-off-by: Shivani Bhardwaj <shivanib134@gmail.com>
---
 drivers/staging/rtl8192e/rtllib_softmac.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rtl8192e/rtllib_softmac.c
index d0fedb0..89da282 100644
--- a/drivers/staging/rtl8192e/rtllib_softmac.c
+++ b/drivers/staging/rtl8192e/rtllib_softmac.c
@@ -1693,11 +1693,9 @@ inline void rtllib_softmac_new_net(struct rtllib_device *ieee,
 			}
 			memcpy(&ieee->current_network, net,
 			       sizeof(struct rtllib_network));
-			if (!ssidbroad) {
-				strncpy(ieee->current_network.ssid, tmp_ssid,
+			strncpy(ieee->current_network.ssid, tmp_ssid,
 					IW_ESSID_MAX_SIZE);
-				ieee->current_network.ssid_len = tmp_ssid_len;
-			}
+			ieee->current_network.ssid_len = tmp_ssid_len;
 			netdev_info(ieee->dev,
 				    "Linking with %s,channel:%d, qos:%d, myHT:%d, networkHT:%d, mode:%x cur_net.flags:0x%x\n",
 				    ieee->current_network.ssid,
-- 
2.1.0

Re: [Outreachy kernel] [PATCH] Staging: rtl8192e: rtllib_softmac: Remove unnecessary NULL test

[Daniel Baluta]

On Wed, Oct 14, 2015 at 9:20 PM, Shivani Bhardwaj <shivanib134@gmail.com> wrote:
> Remove NULL test on the variable ssidbroad as it is already tested for that.
>

Hmm, care to explain more on this?


> Signed-off-by: Shivani Bhardwaj <shivanib134@gmail.com>
> ---
>  drivers/staging/rtl8192e/rtllib_softmac.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rtl8192e/rtllib_softmac.c
> index d0fedb0..89da282 100644
> --- a/drivers/staging/rtl8192e/rtllib_softmac.c
> +++ b/drivers/staging/rtl8192e/rtllib_softmac.c
> @@ -1693,11 +1693,9 @@ inline void rtllib_softmac_new_net(struct rtllib_device *ieee,
>                         }
>                         memcpy(&ieee->current_network, net,
>                                sizeof(struct rtllib_network));
> -                       if (!ssidbroad) {

You can reach this line with ssidbroad = 0.

> -                               strncpy(ieee->current_network.ssid, tmp_ssid,


> +                       strncpy(ieee->current_network.ssid, tmp_ssid,
>                                         IW_ESSID_MAX_SIZE);
> -                               ieee->current_network.ssid_len = tmp_ssid_len;
> -                       }
> +                       ieee->current_network.ssid_len = tmp_ssid_len;
>                         netdev_info(ieee->dev,
>                                     "Linking with %s,channel:%d, qos:%d, myHT:%d, networkHT:%d, mode:%x cur_net.flags:0x%x\n",
>                                     ieee->current_network.ssid,

thanks,
Daniel.

Re: [Outreachy kernel] [PATCH] Staging: rtl8192e: rtllib_softmac: Remove unnecessary NULL test

[Shivani Bhardwaj]

On Wed, Oct 14, 2015 at 11:57 PM, Daniel Baluta <daniel.baluta@gmail.com> wrote:
> On Wed, Oct 14, 2015 at 9:20 PM, Shivani Bhardwaj <shivanib134@gmail.com> wrote:
>> Remove NULL test on the variable ssidbroad as it is already tested for that.
>>
>
> Hmm, care to explain more on this?
>
>
>> Signed-off-by: Shivani Bhardwaj <shivanib134@gmail.com>
>> ---
>>  drivers/staging/rtl8192e/rtllib_softmac.c | 6 ++----
>>  1 file changed, 2 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rtl8192e/rtllib_softmac.c
>> index d0fedb0..89da282 100644
>> --- a/drivers/staging/rtl8192e/rtllib_softmac.c
>> +++ b/drivers/staging/rtl8192e/rtllib_softmac.c
>> @@ -1693,11 +1693,9 @@ inline void rtllib_softmac_new_net(struct rtllib_device *ieee,
>>                         }
>>                         memcpy(&ieee->current_network, net,
>>                                sizeof(struct rtllib_network));
>> -                       if (!ssidbroad) {
>
> You can reach this line with ssidbroad = 0.
>

Yes, it is true. I wrote just about NULL test because Julia mentioned
in a discussion here,

https://groups.google.com/forum/#!searchin/outreachy-kernel/rtw_mlme_ext/outreachy-kernel/obtRajQfZx0/i-h6KcaWCwAJ

I'm guessing you want to say that I should not just mention about NULL
checks because even for the value 0, the statements inside the block
can be reached. If I'm wrong please let me know.

Thank you

>> -                               strncpy(ieee->current_network.ssid, tmp_ssid,
>
>
>> +                       strncpy(ieee->current_network.ssid, tmp_ssid,
>>                                         IW_ESSID_MAX_SIZE);
>> -                               ieee->current_network.ssid_len = tmp_ssid_len;
>> -                       }
>> +                       ieee->current_network.ssid_len = tmp_ssid_len;
>>                         netdev_info(ieee->dev,
>>                                     "Linking with %s,channel:%d, qos:%d, myHT:%d, networkHT:%d, mode:%x cur_net.flags:0x%x\n",
>>                                     ieee->current_network.ssid,
>
> thanks,
> Daniel.