aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/mac80211/mlme.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index d3b408cda08d..40db011da580 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -2286,6 +2286,7 @@ void ieee80211_sta_quiesce(struct ieee80211_sub_if_data *sdata)
2286 2286
2287 cancel_work_sync(&ifmgd->request_smps_work); 2287 cancel_work_sync(&ifmgd->request_smps_work);
2288 2288
2289 cancel_work_sync(&ifmgd->monitor_work);
2289 cancel_work_sync(&ifmgd->beacon_connection_loss_work); 2290 cancel_work_sync(&ifmgd->beacon_connection_loss_work);
2290 if (del_timer_sync(&ifmgd->timer)) 2291 if (del_timer_sync(&ifmgd->timer))
2291 set_bit(TMR_RUNNING_TIMER, &ifmgd->timers_running); 2292 set_bit(TMR_RUNNING_TIMER, &ifmgd->timers_running);
@@ -2294,7 +2295,6 @@ void ieee80211_sta_quiesce(struct ieee80211_sub_if_data *sdata)
2294 if (del_timer_sync(&ifmgd->chswitch_timer)) 2295 if (del_timer_sync(&ifmgd->chswitch_timer))
2295 set_bit(TMR_RUNNING_CHANSW, &ifmgd->timers_running); 2296 set_bit(TMR_RUNNING_CHANSW, &ifmgd->timers_running);
2296 2297
2297 cancel_work_sync(&ifmgd->monitor_work);
2298 /* these will just be re-established on connection */ 2298 /* these will just be re-established on connection */
2299 del_timer_sync(&ifmgd->conn_mon_timer); 2299 del_timer_sync(&ifmgd->conn_mon_timer);
2300 del_timer_sync(&ifmgd->bcn_mon_timer); 2300 del_timer_sync(&ifmgd->bcn_mon_timer);