mac80211: cancel the connection monitor timers/work
Johannes Berg
maintainerPATCH 1/1 mac80211: cancel the connection monitor timers/work
In "mac80211: monitor the connection" I forgot to add code to cancel the new timers & work when the interface is brought down, which isn't a problem if you just bring it down, but _is_ a problem when you destroy the interface. Correct this lapse.
Signed-off-by Johannes Berg <[email protected]>
---
Fixes http://www.intellinuxwireless.org/bugzilla/show_bug.cgi?id=2044
net/mac80211/iface.c | 8 +++++--- net/mac80211/mlme.c | 3 +++ 2 files changed, 8 insertions(+), 3 deletions(-)
net/mac80211/iface.c +5 -3
@@ -451,16 +451,18 @@ static int ieee80211_stop(struct net_devcase NL80211_IFTYPE_STATION :del_timer_sync (&sdata->u.mgd.chswitch_timer);del_timer_sync (&sdata->u.mgd.timer); +del_timer_sync (&sdata->u.mgd.conn_mon_timer); +del_timer_sync (&sdata->u.mgd.bcn_mon_timer);/* -* If the timer fired while we waited for it, it will have -* requeued the work. Now the work will be running again +* If any of the timers fired while we waited for it, it will +* have queued its work. Now the work will be running again * but will not rearm the timer again because it checks * whether the interface is running, which, at this point, * it no longer is. */ cancel_work_sync (&sdata->u.mgd.work);cancel_work_sync (&sdata->u.mgd.chswitch_work); - +cancel_work_sync (&sdata->u.mgd.monitor_work);cancel_work_sync (&sdata->u.mgd.beacon_loss_work);/*
net/mac80211/mlme.c +3 -0
@@ -1163,6 +1163,9 @@ static void ieee80211_mgd_probe_ap(strucconst u8 *ssid;bool already = false; +if (!netif_running (sdata->dev)) +return ; +mutex_lock (&ifmgd->mtx);if (!ifmgd->associated)