From f7feb1460fca7d373461eccce4de1d0723d42a32 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Wed, 13 Feb 2013 14:21:45 +0100 Subject: [PATCH] --- yaml --- r: 352707 b: refs/heads/master c: 5b36ebd8249f403c7edf7cf68d68e9a0d0f55243 h: refs/heads/master i: 352705: e54de3044a6a77a8383c9bb96b49770d9b064861 352703: c8bc7658171192511a06df50ead6a4dd31b81bd5 v: v3 --- [refs] | 2 +- trunk/net/mac80211/mlme.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d496041c1e61..52e48534c9b6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5bbe754d9ecc4a09994ecd0cf3b167224e114da5 +refs/heads/master: 5b36ebd8249f403c7edf7cf68d68e9a0d0f55243 diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c index a7fb276d87cb..99be3b61a225 100644 --- a/trunk/net/mac80211/mlme.c +++ b/trunk/net/mac80211/mlme.c @@ -1819,6 +1819,8 @@ static void __ieee80211_disconnect(struct ieee80211_sub_if_data *sdata) WLAN_REASON_DISASSOC_DUE_TO_INACTIVITY, true, frame_buf); ifmgd->flags &= ~IEEE80211_STA_CSA_RECEIVED; + ieee80211_wake_queues_by_reason(&sdata->local->hw, + IEEE80211_QUEUE_STOP_REASON_CSA); mutex_unlock(&ifmgd->mtx); /* @@ -1859,8 +1861,6 @@ static void ieee80211_csa_connection_drop_work(struct work_struct *work) container_of(work, struct ieee80211_sub_if_data, u.mgd.csa_connection_drop_work); - ieee80211_wake_queues_by_reason(&sdata->local->hw, - IEEE80211_QUEUE_STOP_REASON_CSA); __ieee80211_disconnect(sdata); }