diff --git a/[refs] b/[refs]
index bda5fe54facb..8f05a952a5a0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bf7cd94dcc71682cd6af4a9028f95307b7db41c5
+refs/heads/master: 8ffb5c001a6d1ef142ef550861e0b97e291f6469
diff --git a/trunk/net/mac80211/iface.c b/trunk/net/mac80211/iface.c
index 86c83084542a..a1f7194295fe 100644
--- a/trunk/net/mac80211/iface.c
+++ b/trunk/net/mac80211/iface.c
@@ -294,7 +294,8 @@ static int ieee80211_check_queues(struct ieee80211_sub_if_data *sdata)
 		}
 	}
 
-	if ((sdata->vif.type != NL80211_IFTYPE_AP) ||
+	if ((sdata->vif.type != NL80211_IFTYPE_AP &&
+	     sdata->vif.type != NL80211_IFTYPE_MESH_POINT) ||
 	    !(sdata->local->hw.flags & IEEE80211_HW_QUEUE_CONTROL)) {
 		sdata->vif.cab_queue = IEEE80211_INVAL_HW_QUEUE;
 		return 0;