diff options
| author | Anders Roxell <anders.roxell@linaro.org> | 2013-11-25 13:14:58 +0100 |
|---|---|---|
| committer | Anders Roxell <anders.roxell@linaro.org> | 2013-11-25 13:14:58 +0100 |
| commit | 4fcea1cf4c9da385a2fa90dc631ff453bbfdbcb1 (patch) | |
| tree | db2b279c1ef40e8170883efd1c0bd118d1803aec /net/mac80211/tx.c | |
| parent | b153532021104be5cc1abc3b6b60c004739b31c7 (diff) | |
| parent | 3729ed7c6aa8c5b9eee8f832e4a246b8fa1d56b5 (diff) | |
Merge tag 'v3.10.19' into linux-lnglinux-lng-v3.10.19-final
This is the 3.10.19 stable release
Diffstat (limited to 'net/mac80211/tx.c')
| -rw-r--r-- | net/mac80211/tx.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 9972e07a2f96..e9d18c30071f 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -1100,7 +1100,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 || + } else if (info->flags & (IEEE80211_TX_CTL_INJECTED | + IEEE80211_TX_INTFL_NL80211_FRAME_TX) || tx->sdata->control_port_protocol == tx->skb->protocol) { tx->sta = sta_info_get_bss(sdata, hdr->addr1); } |