diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-06-10 22:26:12 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-06-10 22:26:12 +0400 |
| commit | c48b1f729a75880d0895f0b23efaf551ee800a35 (patch) | |
| tree | 167e974268f2979ffe7215755014d7e197fe9d02 /net/mac80211/mlme.c | |
| parent | 448f2627c169092d2091a1be22feb6a7775f6201 (diff) | |
| parent | 51e65257142a87fe46a1ce5c35c86c5baf012614 (diff) | |
| download | linux-c48b1f729a75880d0895f0b23efaf551ee800a35.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
drivers/net/wireless/rtlwifi/pci.c
Diffstat (limited to 'net/mac80211/mlme.c')
| -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 */ |