Skip to content

Commit

Permalink
mac80211: stop timers before canceling work items
Browse files Browse the repository at this point in the history
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
correct.

Signed-off-by: Ben Greear <greearb@candelatech.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
  • Loading branch information
Ben Greear authored and Johannes Berg committed Feb 26, 2013
1 parent cb601ff commit 9b5bd5a
Showing 1 changed file with 9 additions and 5 deletions.
14 changes: 9 additions & 5 deletions net/mac80211/mlme.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
del_timer_sync(&ifmgd->conn_mon_timer);
del_timer_sync(&ifmgd->bcn_mon_timer);

/*
* we need to use atomic bitops for the running bits
* only because both timers might fire at the same
Expand All @@ -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);

cancel_work_sync(&ifmgd->chswitch_work);
if (del_timer_sync(&ifmgd->chswitch_timer))
set_bit(TMR_RUNNING_CHANSW, &ifmgd->timers_running);

/* these will just be re-established on connection */
del_timer_sync(&ifmgd->conn_mon_timer);
del_timer_sync(&ifmgd->bcn_mon_timer);
cancel_work_sync(&ifmgd->chswitch_work);
}

void ieee80211_sta_restart(struct ieee80211_sub_if_data *sdata)
Expand Down

0 comments on commit 9b5bd5a

Please sign in to comment.