diff --git a/[refs] b/[refs]
index d15dfa2f2beb..b76cd8628061 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 397a7a24ef8c2967a3e8090013f9c54714110c48
+refs/heads/master: de74a1d9032f4d37ea453ad2a647e1aff4cd2591
diff --git a/trunk/net/mac80211/tx.c b/trunk/net/mac80211/tx.c
index f476aa6a771d..71385bfc15d6 100644
--- a/trunk/net/mac80211/tx.c
+++ b/trunk/net/mac80211/tx.c
@@ -2785,6 +2785,7 @@ ieee80211_get_buffered_bc(struct ieee80211_hw *hw,
 				cpu_to_le16(IEEE80211_FCTL_MOREDATA);
 		}
 
+		sdata = IEEE80211_DEV_TO_SUB_IF(skb->dev);
 		if (!ieee80211_tx_prepare(sdata, &tx, skb))
 			break;
 		dev_kfree_skb_any(skb);