From 3978a1b264945e9f3705c4e4d6fcb5438f0afa1a Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Wed, 28 Mar 2012 11:04:26 +0200
Subject: [PATCH] --- yaml --- r: 300683 b: refs/heads/master c:
 ded81f6ba934e792e441f20178683608cbc0b5cb h: refs/heads/master i:   300681:
 45f80c206b95f4bd3220a14b2b369fd2f33fb943   300679:
 8518122c29d0ed739325575baeadcbdb3ad77766 v: v3

---
 [refs]                     | 2 +-
 trunk/net/mac80211/iface.c | 6 +++++-
 trunk/net/mac80211/wme.c   | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index fa9f1a57b45f..d37ee2e35556 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 54bcbc695e2ca88e1c8f05a93d38a04ac6b1aa0e
+refs/heads/master: ded81f6ba934e792e441f20178683608cbc0b5cb
diff --git a/trunk/net/mac80211/iface.c b/trunk/net/mac80211/iface.c
index 401c01f0731e..efa9409865ac 100644
--- a/trunk/net/mac80211/iface.c
+++ b/trunk/net/mac80211/iface.c
@@ -1133,11 +1133,15 @@ int ieee80211_if_add(struct ieee80211_local *local, const char *name,
 	struct net_device *ndev;
 	struct ieee80211_sub_if_data *sdata = NULL;
 	int ret, i;
+	int txqs = 1;
 
 	ASSERT_RTNL();
 
+	if (local->hw.queues >= IEEE80211_NUM_ACS)
+		txqs = IEEE80211_NUM_ACS;
+
 	ndev = alloc_netdev_mqs(sizeof(*sdata) + local->hw.vif_data_size,
-				name, ieee80211_if_setup, local->hw.queues, 1);
+				name, ieee80211_if_setup, txqs, 1);
 	if (!ndev)
 		return -ENOMEM;
 	dev_net_set(ndev, wiphy_net(local->hw.wiphy));
diff --git a/trunk/net/mac80211/wme.c b/trunk/net/mac80211/wme.c
index b3d4ee044e7c..16b48395a468 100644
--- a/trunk/net/mac80211/wme.c
+++ b/trunk/net/mac80211/wme.c
@@ -108,7 +108,7 @@ u16 ieee80211_select_queue(struct ieee80211_sub_if_data *sdata,
 
 	if (local->hw.queues < 4 || skb->len < 6) {
 		skb->priority = 0; /* required for correct WPA/11i MIC */
-		return min_t(u16, local->hw.queues - 1, IEEE80211_AC_BE);
+		return 0;
 	}
 
 	rcu_read_lock();