From 2e6f24bd3d3aac07a6cc3837aea52f25dee3098b Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Wed, 9 Nov 2011 12:14:16 +0100 Subject: [PATCH] --- yaml --- r: 275702 b: refs/heads/master c: 0ecfe806f146e0cb10c2c5abbb3bb4e91959e41a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/mac80211/mlme.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e3be5178e77a..fd5a8a5f0ad6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d929bbc63069396e723a180cde9cb71adc9f76ac +refs/heads/master: 0ecfe806f146e0cb10c2c5abbb3bb4e91959e41a diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c index d3b408cda08d..40db011da580 100644 --- a/trunk/net/mac80211/mlme.c +++ b/trunk/net/mac80211/mlme.c @@ -2286,6 +2286,7 @@ void ieee80211_sta_quiesce(struct ieee80211_sub_if_data *sdata) cancel_work_sync(&ifmgd->request_smps_work); + cancel_work_sync(&ifmgd->monitor_work); cancel_work_sync(&ifmgd->beacon_connection_loss_work); if (del_timer_sync(&ifmgd->timer)) set_bit(TMR_RUNNING_TIMER, &ifmgd->timers_running); @@ -2294,7 +2295,6 @@ void ieee80211_sta_quiesce(struct ieee80211_sub_if_data *sdata) if (del_timer_sync(&ifmgd->chswitch_timer)) set_bit(TMR_RUNNING_CHANSW, &ifmgd->timers_running); - cancel_work_sync(&ifmgd->monitor_work); /* these will just be re-established on connection */ del_timer_sync(&ifmgd->conn_mon_timer); del_timer_sync(&ifmgd->bcn_mon_timer);