---

yaml --- r: 159089 b: refs/heads/master c: 908d436 h: refs/heads/master i: 159087: 5c9bb16 v: v3
git-mirror · Jul 24, 2009 · 6251134 · 6251134
1 parent cbb9a07
commit 6251134
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4b14c96dfbf068acb85c3fa2446b3949c0230deb
+refs/heads/master: 908d4369a394e816767d566d9c3d15a5af8c1c55
diff --git a/trunk/net/wireless/wext-sme.c b/trunk/net/wireless/wext-sme.c
@@ -209,11 +209,7 @@ int cfg80211_mgd_wext_giwessid(struct net_device *dev,
 	data->flags = 0;
 
 	wdev_lock(wdev);
-	if (wdev->ssid_len) {
-		data->flags = 1;
-		data->length = wdev->ssid_len;
-		memcpy(ssid, wdev->ssid, data->length);
-	} else if (wdev->wext.connect.ssid && wdev->wext.connect.ssid_len) {
+	if (wdev->wext.connect.ssid && wdev->wext.connect.ssid_len) {
 		data->flags = 1;
 		data->length = wdev->wext.connect.ssid_len;
 		memcpy(ssid, wdev->wext.connect.ssid, data->length);