1d109f9eb2
SVN-Revision: 19110
16 lines
454 B
Diff
16 lines
454 B
Diff
--- a/net/mac80211/tx.c
|
|
+++ b/net/mac80211/tx.c
|
|
@@ -1051,8 +1051,11 @@ ieee80211_tx_prepare(struct ieee80211_su
|
|
|
|
hdr = (struct ieee80211_hdr *) skb->data;
|
|
|
|
- if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN)
|
|
+ if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN) {
|
|
tx->sta = rcu_dereference(sdata->u.vlan.sta);
|
|
+ if (!tx->sta && sdata->dev->ieee80211_ptr->use_4addr)
|
|
+ return TX_DROP;
|
|
+ }
|
|
if (!tx->sta)
|
|
tx->sta = sta_info_get(sdata, hdr->addr1);
|
|
|