diff --git a/[refs] b/[refs]
index a7d96d115a9a..6aedf2a275d2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a01f5450401f081f07a866612121e780e0730cfd
+refs/heads/master: ad81b2f97d42e13ef78bb3798e046cd5f0492980
diff --git a/trunk/net/mac80211/main.c b/trunk/net/mac80211/main.c
index 5c876450b14c..98c0b5e56ecc 100644
--- a/trunk/net/mac80211/main.c
+++ b/trunk/net/mac80211/main.c
@@ -511,6 +511,7 @@ static int ieee80211_stop(struct net_device *dev)
 	case IEEE80211_IF_TYPE_STA:
 	case IEEE80211_IF_TYPE_IBSS:
 		sdata->u.sta.state = IEEE80211_DISABLED;
+		memset(sdata->u.sta.bssid, 0, ETH_ALEN);
 		del_timer_sync(&sdata->u.sta.timer);
 		/*
 		 * When we get here, the interface is marked down.