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;
 	}