aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/cfg.c
diff options
context:
space:
mode:
authorSimon Wunderlich <sw@simonwunderlich.de>2013-11-21 12:19:53 -0500
committerJohannes Berg <johannes.berg@intel.com>2013-12-02 05:51:55 -0500
commit1f3b8a2bdeccac8abe6817b7b70cea90c93ed3e4 (patch)
treeeda2ccd1d9067e47cf02388855a2fa2813f6a57e /net/mac80211/cfg.c
parentbeffd138d358b69bf15f5a46cb18b31a9b37befb (diff)
mac80211: don't leak next beacon when csa is aborted
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/cfg.c')
-rw-r--r--net/mac80211/cfg.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index a66f4f1eb860..754069cbb756 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -1080,6 +1080,9 @@ static int ieee80211_stop_ap(struct wiphy *wiphy, struct net_device *dev)
1080 1080
1081 /* abort any running channel switch */ 1081 /* abort any running channel switch */
1082 sdata->vif.csa_active = false; 1082 sdata->vif.csa_active = false;
1083 kfree(sdata->u.ap.next_beacon);
1084 sdata->u.ap.next_beacon = NULL;
1085
1083 cancel_work_sync(&sdata->u.ap.request_smps_work); 1086 cancel_work_sync(&sdata->u.ap.request_smps_work);
1084 1087
1085 /* turn off carrier for this interface and dependent VLANs */ 1088 /* turn off carrier for this interface and dependent VLANs */