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 correct. Signed-off-by: Ben Greear <greearb@candelatech.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
parent
cb601ffa32
commit
9b5bd5a491
|
@ -3502,6 +3502,14 @@ void ieee80211_sta_quiesce(struct ieee80211_sub_if_data *sdata)
|
||||||
{
|
{
|
||||||
struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
|
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
|
* we need to use atomic bitops for the running bits
|
||||||
* only because both timers might fire at the same
|
* 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))
|
if (del_timer_sync(&ifmgd->timer))
|
||||||
set_bit(TMR_RUNNING_TIMER, &ifmgd->timers_running);
|
set_bit(TMR_RUNNING_TIMER, &ifmgd->timers_running);
|
||||||
|
|
||||||
cancel_work_sync(&ifmgd->chswitch_work);
|
|
||||||
if (del_timer_sync(&ifmgd->chswitch_timer))
|
if (del_timer_sync(&ifmgd->chswitch_timer))
|
||||||
set_bit(TMR_RUNNING_CHANSW, &ifmgd->timers_running);
|
set_bit(TMR_RUNNING_CHANSW, &ifmgd->timers_running);
|
||||||
|
cancel_work_sync(&ifmgd->chswitch_work);
|
||||||
/* these will just be re-established on connection */
|
|
||||||
del_timer_sync(&ifmgd->conn_mon_timer);
|
|
||||||
del_timer_sync(&ifmgd->bcn_mon_timer);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void ieee80211_sta_restart(struct ieee80211_sub_if_data *sdata)
|
void ieee80211_sta_restart(struct ieee80211_sub_if_data *sdata)
|
||||||
|
|
Loading…
Reference in a new issue