mac80211: explicitly disable/enable QoS

[net-next-2.6.git] / net / mac80211 / util.c

diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index c453226f06b2758377132ddb83e179c4c61ff921..7b2c170af71cb14832b4ed614b75d3539f9e19b7 100644 (file)
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -796,6 +796,11 @@ void ieee80211_set_wmm_default(struct ieee80211_sub_if_data *sdata)
 
                drv_conf_tx(local, queue, &qparam);
        }
+
+       /* after reinitialize QoS TX queues setting to default,
+        * disable QoS at all */
+       local->hw.conf.flags &= ~IEEE80211_CONF_QOS;
+       drv_config(local, IEEE80211_CONF_CHANGE_QOS);
 }
 
 void ieee80211_sta_def_wmm_params(struct ieee80211_sub_if_data *sdata,