diff --git a/[refs] b/[refs]
index 656fc778717e..c77c67e60863 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 645e77def93f1dd0e211c7244fbe152dac8a7100
+refs/heads/master: 7cbf9d017dbb5e3276de7d527925d42d4c11e732
diff --git a/trunk/net/mac80211/tx.c b/trunk/net/mac80211/tx.c
index c592a413bad9..0d74f2459585 100644
--- a/trunk/net/mac80211/tx.c
+++ b/trunk/net/mac80211/tx.c
@@ -2755,7 +2755,8 @@ ieee80211_get_buffered_bc(struct ieee80211_hw *hw,
 				cpu_to_le16(IEEE80211_FCTL_MOREDATA);
 		}
 
-		sdata = IEEE80211_DEV_TO_SUB_IF(skb->dev);
+		if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN)
+			sdata = IEEE80211_DEV_TO_SUB_IF(skb->dev);
 		if (!ieee80211_tx_prepare(sdata, &tx, skb))
 			break;
 		dev_kfree_skb_any(skb);