Commit 9b5bd5a4 authored by Ben Greear's avatar Ben Greear Committed by Johannes Berg

mac80211: stop timers before canceling work items

Re-order the quiesce code so that timers are always
stopped before work-items are flushed. This was not
the problem I saw, but I think it may still be more
Signed-off-by: default avatarBen Greear <>
Signed-off-by: default avatarJohannes Berg <>
parent cb601ffa
......@@ -3502,6 +3502,14 @@ void ieee80211_sta_quiesce(struct ieee80211_sub_if_data *sdata)
struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
* Stop timers before deleting work items, as timers
* could race and re-add the work-items. They will be
* re-established on connection.
* we need to use atomic bitops for the running bits
* only because both timers might fire at the same
......@@ -3516,13 +3524,9 @@ void ieee80211_sta_quiesce(struct ieee80211_sub_if_data *sdata)
if (del_timer_sync(&ifmgd->timer))
set_bit(TMR_RUNNING_TIMER, &ifmgd->timers_running);
if (del_timer_sync(&ifmgd->chswitch_timer))
set_bit(TMR_RUNNING_CHANSW, &ifmgd->timers_running);
/* these will just be re-established on connection */
void ieee80211_sta_restart(struct ieee80211_sub_if_data *sdata)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment