mac80211: don't delay station destruction

[~andy/linux] / net / mac80211 / cfg.c

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 8b790e7b221eacfa9239d0d1da1285184b1354cd..e11bdb63167ac3273b62055e922c14457911bc78 100644 (file)
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -1098,15 +1098,11 @@ static int ieee80211_stop_ap(struct wiphy *wiphy, struct net_device *dev)
                kfree_rcu(old_probe_resp, rcu_head);
 
        list_for_each_entry(vlan, &sdata->u.ap.vlans, u.vlan.list)
-               sta_info_flush_defer(vlan);
-       sta_info_flush_defer(sdata);
+               sta_info_flush(vlan);
+       sta_info_flush(sdata);
        synchronize_net();
-       rcu_barrier();
-       list_for_each_entry(vlan, &sdata->u.ap.vlans, u.vlan.list) {
-               sta_info_flush_cleanup(vlan);
+       list_for_each_entry(vlan, &sdata->u.ap.vlans, u.vlan.list)
                ieee80211_free_keys(vlan);
-       }
-       sta_info_flush_cleanup(sdata);
        ieee80211_free_keys(sdata);
 
        sdata->vif.bss_conf.enable_beacon = false;