From 2b9ff660d5161b83209819c9f371d6fab0a95019 Mon Sep 17 00:00:00 2001 From: Rajkumar Manoharan Date: Fri, 20 May 2011 17:52:15 +0530 Subject: [PATCH] --- yaml --- r: 253039 b: refs/heads/master c: 1d38c16ce4156f63b45abbd09dd28ca2ef5172b4 h: refs/heads/master i: 253037: de18e193219830c2373f04958fb17d58100e0fb0 253035: 4231c2fa52951f236c28ec3cbb4c0da9670667d6 253031: e8d1a794e548e3f657b4c836324f2acd5501099e 253023: e68c1225d1f968c9b1951831ac3313303c0da3de v: v3 --- [refs] | 2 +- trunk/net/mac80211/mlme.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 3a9e34f7994e..ff2c09e2e639 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 41e2b05b9598d6bdf91fc20280bfc538d853f769 +refs/heads/master: 1d38c16ce4156f63b45abbd09dd28ca2ef5172b4 diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c index 4f6b2675e41d..746595597b68 100644 --- a/trunk/net/mac80211/mlme.c +++ b/trunk/net/mac80211/mlme.c @@ -232,6 +232,9 @@ static u32 ieee80211_enable_ht(struct ieee80211_sub_if_data *sdata, WARN_ON(!ieee80211_set_channel_type(local, sdata, channel_type)); } + ieee80211_stop_queues_by_reason(&sdata->local->hw, + IEEE80211_QUEUE_STOP_REASON_CSA); + /* channel_type change automatically detected */ ieee80211_hw_config(local, 0); @@ -245,6 +248,9 @@ static u32 ieee80211_enable_ht(struct ieee80211_sub_if_data *sdata, rcu_read_unlock(); } + ieee80211_wake_queues_by_reason(&sdata->local->hw, + IEEE80211_QUEUE_STOP_REASON_CSA); + ht_opmode = le16_to_cpu(hti->operation_mode); /* if bss configuration changed store the new one */