From 31b88952e775a812c37f0438d8db2f98f4655168 Mon Sep 17 00:00:00 2001
From: Luciano Coelho <coelho@ti.com>
Date: Thu, 12 Apr 2012 16:09:49 +0300
Subject: [PATCH] --- yaml --- r: 300991 b: refs/heads/master c:
 bb3e10fb585f1911fedf5fcc4411dcf8d8d63f54 h: refs/heads/master i:   300989:
 6f5de644f339c4a699e75e9d534cadcc541fe703   300987:
 73244495fb23a222042219ed3752e58d01d28a3d   300983:
 fd48eaddd500eb1941183c932169c3883ec38bbb   300975:
 7f884138a63f7984174366127d77f57dd1aeb2ad   300959:
 1abc1bb324bcacc2b55c815944b81e2aece07898   300927:
 4996065920e980383a6c8f83ee460eb51083a1b8 v: v3

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

diff --git a/[refs] b/[refs]
index 859c2415b630..eaf7090a6ee3 100644
--- 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
index 6e85faed053d..23d1da376eb3 100644
--- 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;
 	}