aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2013-09-29 15:39:33 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-11-12 22:05:30 -0500
commit8d4f150d4e8d52a761e424f9f640c57cd118105f (patch)
treeb87ae0ccdda4ccb51fc17b2a8faeebb784f5f077
parentd7da0fc72d073181e65970edad0a9461542e02c6 (diff)
mac80211: use sta_info_get_bss() for nl80211 tx and client probing
commit 03bb7f42765ce596604f03d179f3137d7df05bba upstream. This allows calls for clients in AP_VLANs (e.g. for 4-addr) to succeed Signed-off-by: Felix Fietkau <nbd@openwrt.org> Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--net/mac80211/cfg.c2
-rw-r--r--net/mac80211/tx.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index ae36f8e11ae4..5ab17b82605d 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -3315,7 +3315,7 @@ static int ieee80211_probe_client(struct wiphy *wiphy, struct net_device *dev,
3315 return -EINVAL; 3315 return -EINVAL;
3316 } 3316 }
3317 band = chanctx_conf->def.chan->band; 3317 band = chanctx_conf->def.chan->band;
3318 sta = sta_info_get(sdata, peer); 3318 sta = sta_info_get_bss(sdata, peer);
3319 if (sta) { 3319 if (sta) {
3320 qos = test_sta_flag(sta, WLAN_STA_WME); 3320 qos = test_sta_flag(sta, WLAN_STA_WME);
3321 } else { 3321 } else {
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,
1100 tx->sta = rcu_dereference(sdata->u.vlan.sta); 1100 tx->sta = rcu_dereference(sdata->u.vlan.sta);
1101 if (!tx->sta && sdata->dev->ieee80211_ptr->use_4addr) 1101 if (!tx->sta && sdata->dev->ieee80211_ptr->use_4addr)
1102 return TX_DROP; 1102 return TX_DROP;
1103 } else if (info->flags & IEEE80211_TX_CTL_INJECTED || 1103 } else if (info->flags & (IEEE80211_TX_CTL_INJECTED |
1104 IEEE80211_TX_INTFL_NL80211_FRAME_TX) ||
1104 tx->sdata->control_port_protocol == tx->skb->protocol) { 1105 tx->sdata->control_port_protocol == tx->skb->protocol) {
1105 tx->sta = sta_info_get_bss(sdata, hdr->addr1); 1106 tx->sta = sta_info_get_bss(sdata, hdr->addr1);
1106 } 1107 }