diff --git a/[refs] b/[refs]
index 55ea1e34cbb4..644e81008ac5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c815797663b72e3ac1736f1886538152bc48e4af
+refs/heads/master: 2b436312f0919c05804fed5aa4b7f255db196e7a
diff --git a/trunk/net/mac80211/iface.c b/trunk/net/mac80211/iface.c
index 60f1ce5e5e52..68f51c3af49f 100644
--- a/trunk/net/mac80211/iface.c
+++ b/trunk/net/mac80211/iface.c
@@ -653,7 +653,11 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
 
 	ieee80211_recalc_ps(local, -1);
 
-	if (dev) {
+	if (sdata->vif.type == NL80211_IFTYPE_MONITOR ||
+	    sdata->vif.type == NL80211_IFTYPE_AP_VLAN) {
+		/* XXX: for AP_VLAN, actually track AP queues */
+		netif_tx_start_all_queues(dev);
+	} else if (dev) {
 		unsigned long flags;
 		int n_acs = IEEE80211_NUM_ACS;
 		int ac;