1 files changed, 2 insertions, 1 deletions

diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index 6e85faed053d..23d1da376eb3 100644
--- a/net/mac80211/iface.c
+++ b/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;
         }