Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b4d57adb authored by Felix Fietkau's avatar Felix Fietkau Committed by John W. Linville
Browse files

mac80211: fix sta lookup with AP VLAN interfaces and injected frames 



When injecting frames, mac80211 currently looks for the first AP
interface that matches the source address of the injected frame.
This breaks when such a frame is directed at a STA that has been moved
to a VLAN. This patch fixes it by using sta_info_get_bss instead of
sta_info_get, which also finds stations belonging to a VLAN interface
of the same BSS as the AP interface.

Signed-off-by: default avatarFelix Fietkau <nbd@openwrt.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 17ad353b

net/mac80211/tx.c

+2 −0
Original line number Diff line number Diff line
@@ -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);