mac80211: free all AP/VLAN keys at once

[mirror_ubuntu-artful-kernel.git] / net / mac80211 / cfg.c

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 18b56fb7911ef192fc221e9a97d3711bb0c90444..8718401cbd89eed0a5bdd01ffc7b768523d3e249 100644 (file)
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -1098,10 +1098,7 @@ static int ieee80211_stop_ap(struct wiphy *wiphy, struct net_device *dev)
                kfree_rcu(old_probe_resp, rcu_head);
 
        __sta_info_flush(sdata, true);
-       synchronize_net();
-       list_for_each_entry(vlan, &sdata->u.ap.vlans, u.vlan.list)
-               ieee80211_free_keys(vlan);
-       ieee80211_free_keys(sdata);
+       ieee80211_free_keys(sdata, true);
 
        sdata->vif.bss_conf.enable_beacon = false;
        sdata->vif.bss_conf.ssid_len = 0;