From 9234e3d0a82dc470ae8adc38e4e0bd1b76b0435f Mon Sep 17 00:00:00 2001
From: Stanislaw Gruszka <sgruszka@redhat.com>
Date: Mon, 29 Mar 2010 12:18:36 +0200
Subject: [PATCH] --- yaml --- r: 194152 b: refs/heads/master c:
 0af26b278bc1d747370b451595b7586cb7b3455c h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/net/mac80211/cfg.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 23b18ccaa7e2..7a1abdbe6e23 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e61146e36b40fd9d346118c40285913236c329f3
+refs/heads/master: 0af26b278bc1d747370b451595b7586cb7b3455c
diff --git a/trunk/net/mac80211/cfg.c b/trunk/net/mac80211/cfg.c
index c8f520529eec..a4ca425e4f3f 100644
--- a/trunk/net/mac80211/cfg.c
+++ b/trunk/net/mac80211/cfg.c
@@ -1136,6 +1136,10 @@ static int ieee80211_set_txq_params(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
+	/* enable WMM or activate new settings */
+	local->hw.conf.flags |= IEEE80211_CONF_QOS;
+	drv_config(local, IEEE80211_CONF_CHANGE_QOS);
+
 	return 0;
 }