diff --git a/[refs] b/[refs]
index f20ff635ec27..65c2b8bc4a87 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ebd0fd2b1a30aa836c28e758d8a57ecdfa85052f
+refs/heads/master: 99102bd380f27b8dd5e058e69e3203bfad0cad94
diff --git a/trunk/net/mac80211/cfg.c b/trunk/net/mac80211/cfg.c
index efbbdc8a2be0..d41974aacf51 100644
--- a/trunk/net/mac80211/cfg.c
+++ b/trunk/net/mac80211/cfg.c
@@ -917,6 +917,7 @@ static int ieee80211_stop_ap(struct wiphy *wiphy, struct net_device *dev)
 
 	kfree_rcu(old, rcu_head);
 
+	sta_info_flush(sdata->local, sdata);
 	ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BEACON_ENABLED);
 
 	return 0;