diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-06-07 20:03:08 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-06-07 20:03:08 +0200 |
| commit | bb77f6341728624314f488ebd8b4c69f2caa33ea (patch) | |
| tree | f72bea21417787c64783e8ab323c95964dabe40d /net | |
| parent | iwl4965: set tx power after rxon_assoc (diff) | |
| download | linux-bb77f6341728624314f488ebd8b4c69f2caa33ea.tar.xz linux-bb77f6341728624314f488ebd8b4c69f2caa33ea.zip | |
Revert "mac80211: stop queues before rate control updation"
This reverts commit 1d38c16ce4156f63b45abbd09dd28ca2ef5172b4.
The mac80211 maintainer raised complaints about abuse of the CSA stop
reason, and about whether this patch actually serves its intended
purpose at all.
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/mlme.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 456cccf26b51..d595265d6c22 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -232,9 +232,6 @@ 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); @@ -248,9 +245,6 @@ 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 */ |