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

Commit 03bb7f42 authored Sep 29, 2013 by Felix Fietkau Committed by Johannes Berg Sep 30, 2013

mac80211: use sta_info_get_bss() for nl80211 tx and client probing



This allows calls for clients in AP_VLANs (e.g. for 4-addr) to succeed

Cc: stable@vger.kernel.org
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

parent aa5f66d5

net/mac80211/cfg.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -3518,7 +3518,7 @@ static int ieee80211_probe_client(struct wiphy wiphy, struct net_device dev,
	return -EINVAL;		return -EINVAL;
	}		}
	band = chanctx_conf->def.chan->band;		band = chanctx_conf->def.chan->band;
	sta = sta_info_get(sdata, peer);		sta = sta_info_get_bss(sdata, peer);
	if (sta) {		if (sta) {
	qos = test_sta_flag(sta, WLAN_STA_WME);		qos = test_sta_flag(sta, WLAN_STA_WME);
	} else {		} else {

net/mac80211/tx.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1120,7 +1120,8 @@ ieee80211_tx_prepare(struct ieee80211_sub_if_data *sdata,
	tx->sta = rcu_dereference(sdata->u.vlan.sta);		tx->sta = rcu_dereference(sdata->u.vlan.sta);
	if (!tx->sta && sdata->dev->ieee80211_ptr->use_4addr)		if (!tx->sta && sdata->dev->ieee80211_ptr->use_4addr)
	return TX_DROP;		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->sdata->control_port_protocol == tx->skb->protocol) {
	tx->sta = sta_info_get_bss(sdata, hdr->addr1);		tx->sta = sta_info_get_bss(sdata, hdr->addr1);
	}		}