diff options
| author | Toke Høiland-Jørgensen <toke@redhat.com> | 2019-11-12 14:08:35 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2019-11-22 12:53:53 +0100 |
| commit | 5072f73cb6ee0867d2d11996a244eba48bfda931 (patch) | |
| tree | dc427d33af298d813eb9ec842aabf9c5118cb54e /net/mac80211/status.c | |
| parent | b226a826d83d66806fae20fc3518dace8b86bacb (diff) | |
| download | linux-5072f73cb6ee0867d2d11996a244eba48bfda931.tar.bz2 | |
mac80211: Add new sta_info getter by sta/vif addrs
In ieee80211_tx_status() we don't have an sdata struct when looking up the
destination sta. Instead, we just do a lookup by the vif addr that is the
source of the packet being completed. Factor this out into a new sta_info
getter helper, since we need to use it for accounting AQL as well.
Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com>
Link: https://lore.kernel.org/r/20191112130835.382062-1-toke@redhat.com
[remove internal rcu_read_lock(), document instead]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/status.c')
| -rw-r--r-- | net/mac80211/status.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/net/mac80211/status.c b/net/mac80211/status.c index ab8ba5835ca0..0e51def35b8a 100644 --- a/net/mac80211/status.c +++ b/net/mac80211/status.c @@ -1073,19 +1073,13 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb) .skb = skb, .info = IEEE80211_SKB_CB(skb), }; - struct rhlist_head *tmp; struct sta_info *sta; rcu_read_lock(); - for_each_sta_info(local, hdr->addr1, sta, tmp) { - /* skip wrong virtual interface */ - if (!ether_addr_equal(hdr->addr2, sta->sdata->vif.addr)) - continue; - + sta = sta_info_get_by_addrs(local, hdr->addr1, hdr->addr2); + if (sta) status.sta = &sta->sta; - break; - } __ieee80211_tx_status(hw, &status); rcu_read_unlock(); |