This is a note to let you know that I've just added the patch titled mac80211: always unblock CSA queue stop when disconnecting to the 3.8-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: mac80211-always-unblock-csa-queue-stop-when-disconnecting.patch and it can be found in the queue-3.8 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From johannes@xxxxxxxxxxxxxxxx Tue Feb 26 15:00:24 2013 From: Johannes Berg <johannes@xxxxxxxxxxxxxxxx> Date: Tue, 26 Feb 2013 22:37:57 +0100 Subject: mac80211: always unblock CSA queue stop when disconnecting To: gregkh@xxxxxxxxxxxxxxxxxxx Cc: stable@xxxxxxxxxxxxxxx, jan.brummer@xxxxxxxxx, Johannes Berg <johannes.berg@xxxxxxxxx> Message-ID: <1361914677-19032-1-git-send-email-johannes@xxxxxxxxxxxxxxxx> From: Johannes Berg <johannes.berg@xxxxxxxxx> Commit 5b36ebd8249f403c7edf7cf68d68e9a0d0f55243 upstream. 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 <jan.brummer@xxxxxxxxx> Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- net/mac80211/mlme.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -1812,6 +1812,8 @@ static void __ieee80211_disconnect(struc WLAN_REASON_DISASSOC_DUE_TO_INACTIVITY, transmit_frame, 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); /* @@ -1856,8 +1858,6 @@ static void ieee80211_csa_connection_dro 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, true); } Patches currently in stable-queue which might be from johannes@xxxxxxxxxxxxxxxx are queue-3.8/mac80211-always-unblock-csa-queue-stop-when-disconnecting.patch -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html