diff --git a/[refs] b/[refs]
index f61a2be323a3..4ea27b7fd224 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 17ad353b8d9843731258b5d23556667b764939e9
+refs/heads/master: b4d57adb727ec7c34020390eeb0eeb9e0a2959bc
diff --git a/trunk/net/mac80211/tx.c b/trunk/net/mac80211/tx.c
index e7b1cdc7651b..85e382aa894e 100644
--- a/trunk/net/mac80211/tx.c
+++ b/trunk/net/mac80211/tx.c
@@ -1133,6 +1133,8 @@ ieee80211_tx_prepare(struct ieee80211_sub_if_data *sdata,
 		tx->sta = rcu_dereference(sdata->u.vlan.sta);
 		if (!tx->sta && sdata->dev->ieee80211_ptr->use_4addr)
 			return TX_DROP;
+	} else if (info->flags & IEEE80211_TX_CTL_INJECTED) {
+		tx->sta = sta_info_get_bss(sdata, hdr->addr1);
 	}
 	if (!tx->sta)
 		tx->sta = sta_info_get(sdata, hdr->addr1);