Commit 66f2c99a authored Apr 29, 2012 by Felix Fietkau Committed by John W. Linville Apr 30, 2012

mac80211: fix AP mode EAP tx for VLAN stations



EAP frames for stations in an AP VLAN are sent on the main AP interface
to avoid race conditions wrt. moving stations.
For that to work properly, sta_info_get_bss must be used instead of
sta_info_get when sending EAP packets.
Previously this was only done for cooked monitor injected packets, so
this patch adds a check for tx->skb->protocol to the same place.

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Cc: stable@vger.kernel.org
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent 4c1bcdb5

net/mac80211/tx.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1158,7 +1158,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)

Admin message