mac80211: remove queue stop on rate control update

We currently stop the queue when changing the rate
control between 20/40 MHz in the BSS. This seems to
have been necessary when we actually changed the
channel, but now that we just update the station it
doesn't seem right any more. Remove it.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 867b8ee..93b075e 100644 (file)
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -757,7 +757,6 @@ enum queue_stop_reason {
        IEEE80211_QUEUE_STOP_REASON_AGGREGATION,
        IEEE80211_QUEUE_STOP_REASON_SUSPEND,
        IEEE80211_QUEUE_STOP_REASON_SKB_ADD,
-       IEEE80211_QUEUE_STOP_REASON_CHTYPE_CHANGE,
 };
 
 #ifdef CONFIG_MAC80211_LEDS

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 9cc5dda..594af5f 100644 (file)
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -212,21 +212,6 @@ static u32 ieee80211_config_ht_tx(struct ieee80211_sub_if_data *sdata,
        if (sta && (!reconfig ||
                    (disable_40 != !!(sta->sta.ht_cap.cap &
                                        IEEE80211_HT_CAP_SUP_WIDTH_20_40)))) {
-               if (reconfig) {
-                       /*
-                        * Whenever the AP announces the HT mode changed
-                        * (e.g. 40 MHz intolerant) stop queues to avoid
-                        * sending out frames while the rate control is
-                        * reconfiguring.
-                        */
-                       ieee80211_stop_queues_by_reason(&sdata->local->hw,
-                               IEEE80211_QUEUE_STOP_REASON_CHTYPE_CHANGE);
-
-                       /* flush out all packets */
-                       synchronize_net();
-
-                       drv_flush(local, false);
-               }
 
                if (disable_40)
                        sta->sta.ht_cap.cap &= ~IEEE80211_HT_CAP_SUP_WIDTH_20_40;
@@ -235,10 +220,6 @@ static u32 ieee80211_config_ht_tx(struct ieee80211_sub_if_data *sdata,
 
                rate_control_rate_update(local, sband, sta,
                                         IEEE80211_RC_HT_CHANGED);
-
-               if (reconfig)
-                       ieee80211_wake_queues_by_reason(&sdata->local->hw,
-                               IEEE80211_QUEUE_STOP_REASON_CHTYPE_CHANGE);
        }
        mutex_unlock(&local->sta_mtx);