---

yaml --- r: 159077 b: refs/heads/master c: 80e5b06 h: refs/heads/master i: 159075: 7ce923a v: v3
git-mirror · Jul 24, 2009 · 97b6dc0 · 97b6dc0
1 parent 9f56d7d
commit 97b6dc0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f874011bb01e7fb19904db7f739bb343a0a53fd5
+refs/heads/master: 80e5b06a1b0d9a6aa88dc5c9e93ba49510c52b45
diff --git a/trunk/net/wireless/ibss.c b/trunk/net/wireless/ibss.c
@@ -487,8 +487,11 @@ int cfg80211_ibss_wext_giwap(struct net_device *dev,
 	wdev_lock(wdev);
 	if (wdev->current_bss)
 		memcpy(ap_addr->sa_data, wdev->current_bss->pub.bssid, ETH_ALEN);
-	else
+	else if (wdev->wext.ibss.bssid)
 		memcpy(ap_addr->sa_data, wdev->wext.ibss.bssid, ETH_ALEN);
+	else
+		memset(ap_addr->sa_data, 0, ETH_ALEN);
+
 	wdev_unlock(wdev);
 
 	return 0;