summaryrefslogtreecommitdiffstats
path: root/drivers/staging/rtl8192u
diff options
context:
space:
mode:
authorShivani Bhardwaj2015-10-14 19:33:50 +0200
committerGreg Kroah-Hartman2015-10-17 07:19:04 +0200
commitafd0fea4e691ff53bff8adb4bc89398010b6f954 (patch)
tree46d8c7e61d6e5fc759c189e1d98c6d4742e5a958 /drivers/staging/rtl8192u
parentStaging: rtl8712: Coding style warnings fix for block comments (diff)
downloadkernel-qcow2-linux-afd0fea4e691ff53bff8adb4bc89398010b6f954.tar.gz
kernel-qcow2-linux-afd0fea4e691ff53bff8adb4bc89398010b6f954.tar.xz
kernel-qcow2-linux-afd0fea4e691ff53bff8adb4bc89398010b6f954.zip
Staging: rtl8192u: ieee80211_softmac: Remove extra NULL check
Remove NULL check on a variable as it is already preceded by one. Signed-off-by: Shivani Bhardwaj <shivanib134@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/rtl8192u')
-rw-r--r--drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
index c443e2eee8d3..fcbd59f9d6e9 100644
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
@@ -1463,10 +1463,8 @@ inline void ieee80211_softmac_new_net(struct ieee80211_device *ieee, struct ieee
}
memcpy(&ieee->current_network, net, sizeof(struct ieee80211_network));
- if (!ssidbroad) {
- strncpy(ieee->current_network.ssid, tmp_ssid, IW_ESSID_MAX_SIZE);
- ieee->current_network.ssid_len = tmp_ssid_len;
- }
+ strncpy(ieee->current_network.ssid, tmp_ssid, IW_ESSID_MAX_SIZE);
+ ieee->current_network.ssid_len = tmp_ssid_len;
printk(KERN_INFO"Linking with %s,channel:%d, qos:%d, myHT:%d, networkHT:%d\n",ieee->current_network.ssid,ieee->current_network.channel, ieee->current_network.qos_data.supported, ieee->pHTInfo->bEnableHT, ieee->current_network.bssht.bdSupportHT);
//ieee->pHTInfo->IOTAction = 0;