summaryrefslogtreecommitdiff
path: root/net/mac80211/wme.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2012-03-28 13:04:26 +0400
committerJohn W. Linville <linville@tuxdriver.com>2012-04-10 22:54:10 +0400
commitded81f6ba934e792e441f20178683608cbc0b5cb (patch)
tree61f464547c5eb15cbb8496a92220a2ceae40cda9 /net/mac80211/wme.c
parent54bcbc695e2ca88e1c8f05a93d38a04ac6b1aa0e (diff)
downloadlinux-ded81f6ba934e792e441f20178683608cbc0b5cb.tar.xz
mac80211: decouple # of netdev queues from HW queues
When we get more hardware queues, we'll still want to only have netdev queues per AC, so set it up in that way. If the hardware doesn't support QoS (by not supporting at least 4 queues) the netdevs get a single queue only (this is no change in behavior as there are no drivers with 2 or 3 queues today.) Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/wme.c')
-rw-r--r--net/mac80211/wme.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/wme.c b/net/mac80211/wme.c
index b3d4ee044e7c..16b48395a468 100644
--- a/net/mac80211/wme.c
+++ b/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();