diff options
| author | Todd Poynor <toddpoynor@google.com> | 2012-05-08 11:36:40 -0700 |
|---|---|---|
| committer | Todd Poynor <toddpoynor@google.com> | 2012-05-08 11:36:40 -0700 |
| commit | 52f91d889a2c2a0f9e0b5e97fa7be8b584834016 (patch) | |
| tree | e9c820e826581e430c53f523651fc9e2465a4b37 /net/mac80211 | |
| parent | 434b9914eec503fc0eaaa52908765bca6430d22b (diff) | |
| parent | bea37381fd9a34c6660e5195d31beea86aa3dda3 (diff) | |
| download | kernel_samsung_aries-52f91d889a2c2a0f9e0b5e97fa7be8b584834016.zip kernel_samsung_aries-52f91d889a2c2a0f9e0b5e97fa7be8b584834016.tar.gz kernel_samsung_aries-52f91d889a2c2a0f9e0b5e97fa7be8b584834016.tar.bz2 | |
Merge commit 'v3.0.31' into android-3.0
Diffstat (limited to 'net/mac80211')
| -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 3104c84..da878c1 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -1222,7 +1222,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 || + tx->sdata->control_port_protocol == tx->skb->protocol) { tx->sta = sta_info_get_bss(sdata, hdr->addr1); } if (!tx->sta) |