From 25441ffaf4fac1d8364db686b5c937f5773405d5 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Mon, 7 May 2012 17:45:29 +0200 Subject: [PATCH] --- yaml --- r: 306781 b: refs/heads/master c: a9d3c05cca51d80ef2b9eddabf794c9458e36c2c h: refs/heads/master i: 306779: 0b0fd5bd0e1644e2c641056c08a76c12a04f0657 v: v3 --- [refs] | 2 +- trunk/net/mac80211/iface.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6c65fcd4dac5..6e5795c3b1cf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 044e68c0cd01a70fd4929ce19ce52ba5df839b22 +refs/heads/master: a9d3c05cca51d80ef2b9eddabf794c9458e36c2c diff --git a/trunk/net/mac80211/iface.c b/trunk/net/mac80211/iface.c index 3e05a8bfddf0..c550945dd703 100644 --- a/trunk/net/mac80211/iface.c +++ b/trunk/net/mac80211/iface.c @@ -206,8 +206,10 @@ static void ieee80211_set_default_queues(struct ieee80211_sub_if_data *sdata) for (i = 0; i < IEEE80211_NUM_ACS; i++) { if (local->hw.flags & IEEE80211_HW_QUEUE_CONTROL) sdata->vif.hw_queue[i] = IEEE80211_INVAL_HW_QUEUE; - else + else if (local->hw.queues >= IEEE80211_NUM_ACS) sdata->vif.hw_queue[i] = i; + else + sdata->vif.hw_queue[i] = 0; } sdata->vif.cab_queue = IEEE80211_INVAL_HW_QUEUE; }