2013-02-13 13:26:12

by Johannes Berg

Subject: [PATCH] mac80211: always unblock CSA queue stop when disconnecting

From: Johannes Berg <[email protected]>

In some cases when disconnecting after (or during?) CSA
the queues might not recover, and then the only way to
recover is reloading the module.

Fix this by always unblocking the queue CSA reason when
disconnecting.

Reported-by: Jan-Michael Brummer <[email protected]>
Signed-off-by: Johannes Berg <[email protected]>
---
net/mac80211/mlme.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index d75c650..f9da6de 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -2059,6 +2059,9 @@ 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_MAX_QUEUE_MAP,
+ IEEE80211_QUEUE_STOP_REASON_CSA);
mutex_unlock(&ifmgd->mtx);

/*
@@ -2099,9 +2102,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_MAX_QUEUE_MAP,
- IEEE80211_QUEUE_STOP_REASON_CSA);
__ieee80211_disconnect(sdata);
}

--
1.8.0

2013-02-14 17:31:08

by Johannes Berg

Subject: Re: [PATCH] mac80211: always unblock CSA queue stop when disconnecting

On Wed, 2013-02-13 at 14:26 +0100, Johannes Berg wrote:
> From: Johannes Berg <[email protected]>
>
> In some cases when disconnecting after (or during?) CSA
> the queues might not recover, and then the only way to
> recover is reloading the module.
>
> Fix this by always unblocking the queue CSA reason when
> disconnecting.

Applied.

johannes