diff --git a/[refs] b/[refs]
index ec26c2e0144f..d07a7895bb31 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e47468518b9dc42db459e7240909946316d9c6c9
+refs/heads/master: 0eabccd940f0f25da0ae29e555fddb8fb84d8e27
diff --git a/trunk/net/mac80211/cfg.c b/trunk/net/mac80211/cfg.c
index edca2a288abd..fdd95bd751a1 100644
--- a/trunk/net/mac80211/cfg.c
+++ b/trunk/net/mac80211/cfg.c
@@ -1052,6 +1052,7 @@ static int ieee80211_stop_ap(struct wiphy *wiphy, struct net_device *dev)
 	ieee80211_free_keys(sdata);
 
 	sdata->vif.bss_conf.enable_beacon = false;
+	sdata->vif.bss_conf.ssid_len = 0;
 	clear_bit(SDATA_STATE_OFFCHANNEL_BEACON_STOPPED, &sdata->state);
 	ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BEACON_ENABLED);