From c1e140bf79d817d4a7aa9932eb98b0359c87af33 Mon Sep 17 00:00:00 2001 From: Emmanuel Grumbach Date: Mon, 19 Jan 2015 16:53:06 +0200 Subject: [PATCH] mac80211: delete the assoc/auth timer upon suspend While suspending, we destroy the authentication / association that might be taking place. While doing so, we forgot to delete the timer which can be firing after local->suspended is already set, producing the warning below. Fix that by deleting the timer. [66722.825487] WARNING: CPU: 2 PID: 5612 at net/mac80211/util.c:755 ieee80211_can_queue_work.isra.18+0x32/0x40 [mac80211]() [66722.825487] queueing ieee80211 work while going to suspend [66722.825529] CPU: 2 PID: 5612 Comm: kworker/u16:69 Tainted: G W O 3.16.1+ #24 [66722.825537] Workqueue: events_unbound async_run_entry_fn [66722.825545] Call Trace: [66722.825552] [] dump_stack+0x4d/0x66 [66722.825556] [] warn_slowpath_common+0x7d/0xa0 [66722.825572] [] ? ieee80211_sta_bcn_mon_timer+0x50/0x50 [mac80211] [66722.825573] [] warn_slowpath_fmt+0x4c/0x50 [66722.825586] [] ieee80211_can_queue_work.isra.18+0x32/0x40 [mac80211] [66722.825598] [] ieee80211_queue_work+0x25/0x50 [mac80211] [66722.825611] [] ieee80211_sta_timer+0x1c/0x20 [mac80211] [66722.825614] [] call_timer_fn+0x8a/0x300 Signed-off-by: Emmanuel Grumbach Signed-off-by: Johannes Berg --- net/mac80211/mlme.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index c0711082a2b8..1875181ebd94 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -2453,6 +2453,12 @@ static void ieee80211_destroy_auth_data(struct ieee80211_sub_if_data *sdata, sdata_assert_lock(sdata); if (!assoc) { + /* + * we are not authenticated yet, the only timer that could be + * running is the timeout for the authentication response which + * which is not relevant anymore. + */ + del_timer_sync(&sdata->u.mgd.timer); sta_info_destroy_addr(sdata, auth_data->bss->bssid); memset(sdata->u.mgd.bssid, 0, ETH_ALEN); @@ -2760,6 +2766,12 @@ static void ieee80211_destroy_assoc_data(struct ieee80211_sub_if_data *sdata, sdata_assert_lock(sdata); if (!assoc) { + /* + * we are not associated yet, the only timer that could be + * running is the timeout for the association response which + * which is not relevant anymore. + */ + del_timer_sync(&sdata->u.mgd.timer); sta_info_destroy_addr(sdata, assoc_data->bss->bssid); memset(sdata->u.mgd.bssid, 0, ETH_ALEN);