Skip to contentSkip to conversation

Staging: rtl8192e: rtllib_softmac: Remove unnecessary NULL test

PATCH In review Shivani Bhardwaj 2 participants 3 messages Oct 14, 2015 – Oct 15, 2015 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Staging: rtl8192e: rtllib_softmac: Remove unnecessary NULL test

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

---
 drivers/staging/rtl8192e/rtllib_softmac.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/staging/rtl8192e/rtllib_softmac.c +2 -4
index d0fedb0..89da282 100644
@@ -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,
Signature · 1 line
2.1.0
#1 lore raw
Quoted 2 lines · Shivani Bhardwaj

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

Hmm, care to explain more on this?

Quoted 10 lines
---
 drivers/staging/rtl8192e/rtllib_softmac.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/staging/rtl8192e/rtllib_softmac.c +0 -0
index d0fedb0..89da282 100644

drivers/staging/rtl8192e/rtllib_softmac.c inline void rtllib_softmac_new_net(struct rtllib_device *ieee, · line 1696

Quoted 4 lines
drivers/staging/rtl8192e/rtllib_softmac.c +0 -1
@@ -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.

Quoted 11 lines
drivers/staging/rtl8192e/rtllib_softmac.c +2 -3
-                               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.

#2 lore raw
Quoted 12 lines · Daniel Baluta
Quoted 2 lines · Shivani Bhardwaj

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

Hmm, care to explain more on this?

Quoted 5 lines
---
 drivers/staging/rtl8192e/rtllib_softmac.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
Quoted 12 lines

drivers/staging/rtl8192e/rtllib_softmac.c inline void rtllib_softmac_new_net(struct rtllib_device *ieee, · line 1696

Quoted 9 lines
drivers/staging/rtl8192e/rtllib_softmac.c +0 -1
index d0fedb0..89da282 100644
@@ -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

Quoted 14 lines
Quoted 11 lines
drivers/staging/rtl8192e/rtllib_softmac.c +2 -3
-                               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.