aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/wireless/wext-sme.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/net/wireless/wext-sme.c b/net/wireless/wext-sme.c
index bf725275eb8d..53c6ba98dc25 100644
--- a/net/wireless/wext-sme.c
+++ b/net/wireless/wext-sme.c
@@ -229,8 +229,7 @@ int cfg80211_mgd_wext_giwessid(struct net_device *dev,
229 data->flags = 1; 229 data->flags = 1;
230 data->length = wdev->wext.connect.ssid_len; 230 data->length = wdev->wext.connect.ssid_len;
231 memcpy(ssid, wdev->wext.connect.ssid, data->length); 231 memcpy(ssid, wdev->wext.connect.ssid, data->length);
232 } else 232 }
233 data->flags = 0;
234 wdev_unlock(wdev); 233 wdev_unlock(wdev);
235 234
236 return 0; 235 return 0;
@@ -306,8 +305,6 @@ int cfg80211_mgd_wext_giwap(struct net_device *dev,
306 wdev_lock(wdev); 305 wdev_lock(wdev);
307 if (wdev->current_bss) 306 if (wdev->current_bss)
308 memcpy(ap_addr->sa_data, wdev->current_bss->pub.bssid, ETH_ALEN); 307 memcpy(ap_addr->sa_data, wdev->current_bss->pub.bssid, ETH_ALEN);
309 else if (wdev->wext.connect.bssid)
310 memcpy(ap_addr->sa_data, wdev->wext.connect.bssid, ETH_ALEN);
311 else 308 else
312 memset(ap_addr->sa_data, 0, ETH_ALEN); 309 memset(ap_addr->sa_data, 0, ETH_ALEN);
313 wdev_unlock(wdev); 310 wdev_unlock(wdev);