Revert "mac80211: stop queues before rate control updation"
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 7 Jun 2011 18:03:08 +0000 (14:03 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 7 Jun 2011 18:03:08 +0000 (14:03 -0400)
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>
net/mac80211/mlme.c

index 456cccf26b512ef1babb0420471dd95b51f16670..d595265d6c22c4a8e618daa17111b28da495836b 100644 (file)
@@ -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 */