1 files changed, 12 insertions, 4 deletions

diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index 76df5eabf268..6b7e92eaab47 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -219,18 +219,26 @@ void ieee80211_bss_info_change_notify(struct ieee80211_sub_if_data *sdata,
                                       u32 changed)
 {
         struct ieee80211_local *local = sdata->local;
+        static const u8 zero[ETH_ALEN] = { 0 };
 
         if (!changed)
                 return;
 
-        if (sdata->vif.type == NL80211_IFTYPE_STATION)
-                sdata->vif.bss_conf.bssid = sdata->u.mgd.bssid;
-        else if (sdata->vif.type == NL80211_IFTYPE_ADHOC)
+        if (sdata->vif.type == NL80211_IFTYPE_STATION) {
+                /*
+                 * While not associated, claim a BSSID of all-zeroes
+                 * so that drivers don't do any weird things with the
+                 * BSSID at that time.
+                 */
+                if (sdata->vif.bss_conf.assoc)
+                        sdata->vif.bss_conf.bssid = sdata->u.mgd.bssid;
+                else
+                        sdata->vif.bss_conf.bssid = zero;
+        } else if (sdata->vif.type == NL80211_IFTYPE_ADHOC)
                 sdata->vif.bss_conf.bssid = sdata->u.ibss.bssid;
         else if (sdata->vif.type == NL80211_IFTYPE_AP)
                 sdata->vif.bss_conf.bssid = sdata->dev->dev_addr;
         else if (ieee80211_vif_is_mesh(&sdata->vif)) {
-                static const u8 zero[ETH_ALEN] = { 0 };
                 sdata->vif.bss_conf.bssid = zero;
         } else {
                 WARN_ON(1);