---

yaml --- r: 300991 b: refs/heads/master c: bb3e10f h: refs/heads/master i: 300989: 6f5de64 300987: 7324449 300983: fd48ead 300975: 7f88413 300959: 1abc1bb 300927: 4996065 v: v3
git-mirror · Apr 16, 2012 · 31b8895 · 31b8895
1 parent be94ae7
commit 31b8895
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8e8b41f9d8c8e63fc92f899ace8da91a490ac573
+refs/heads/master: bb3e10fb585f1911fedf5fcc4411dcf8d8d63f54
diff --git a/trunk/net/mac80211/iface.c b/trunk/net/mac80211/iface.c
@@ -163,7 +163,8 @@ static int ieee80211_check_queues(struct ieee80211_sub_if_data *sdata)
 			return -EINVAL;
 	}
 
-	if (sdata->vif.type != NL80211_IFTYPE_AP) {
+	if ((sdata->vif.type != NL80211_IFTYPE_AP) ||
+	    !(sdata->local->hw.flags & IEEE80211_HW_QUEUE_CONTROL)) {
 		sdata->vif.cab_queue = IEEE80211_INVAL_HW_QUEUE;
 		return 0;
 	}