From 7dfe682b050410d03d5d28e4f86d2a93c6172dd8 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Sat, 23 Feb 2013 01:14:20 +0100 Subject: [PATCH] --- yaml --- r: 368424 b: refs/heads/master c: 7b4396bd6868f3d665c5f4cb53a9bdde5a2f4bf2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/mac80211/cfg.c | 5 ++++- trunk/net/mac80211/iface.c | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8e9495c7b59a..20d2b1668c4a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8d1f7ecd2af55c0c82ffd2bff0ef0b26f16ea69f +refs/heads/master: 7b4396bd6868f3d665c5f4cb53a9bdde5a2f4bf2 diff --git a/trunk/net/mac80211/cfg.c b/trunk/net/mac80211/cfg.c index 8baa561c8f5b..9d708f9e246e 100644 --- a/trunk/net/mac80211/cfg.c +++ b/trunk/net/mac80211/cfg.c @@ -1035,9 +1035,12 @@ static int ieee80211_stop_ap(struct wiphy *wiphy, struct net_device *dev) sta_info_flush_defer(vlan); sta_info_flush_defer(sdata); rcu_barrier(); - list_for_each_entry(vlan, &sdata->u.ap.vlans, u.vlan.list) + list_for_each_entry(vlan, &sdata->u.ap.vlans, u.vlan.list) { sta_info_flush_cleanup(vlan); + ieee80211_free_keys(vlan); + } sta_info_flush_cleanup(sdata); + ieee80211_free_keys(sdata); sdata->vif.bss_conf.enable_beacon = false; clear_bit(SDATA_STATE_OFFCHANNEL_BEACON_STOPPED, &sdata->state); diff --git a/trunk/net/mac80211/iface.c b/trunk/net/mac80211/iface.c index 8e0bf34f3f68..290de4d99697 100644 --- a/trunk/net/mac80211/iface.c +++ b/trunk/net/mac80211/iface.c @@ -840,7 +840,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, /* * Free all remaining keys, there shouldn't be any, - * except maybe group keys in AP more or WDS? + * except maybe in WDS mode? */ ieee80211_free_keys(sdata);