diff --git a/[refs] b/[refs]
index 7efa1b47fd80..ce6a89c7e0c5 100644
--- 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
index 9394e78cd11f..8b65e212ae49 100644
--- 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;