Received-SPF: pass (google.com: best guess record for domain of linux-wireless-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= <toke@redhat.com>
To:     Johannes Berg <johannes@sipsolutions.net>
Cc:     =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= <toke@redhat.com>,
        linux-wireless@vger.kernel.org, Kan Yan <kyan@google.com>
Subject: [PATCH] mac80211: Add new sta_info getter by sta/vif addrs
Date:   Tue, 12 Nov 2019 14:08:35 +0100
Message-Id: <20191112130835.382062-1-toke@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
Sender: linux-wireless-owner@vger.kernel.org
Precedence: bulk

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=C3=B8iland-J=C3=B8rgensen <toke@redhat.com>
---
 net/mac80211/sta_info.c | 20 ++++++++++++++++++++
 net/mac80211/sta_info.h |  3 +++
 net/mac80211/status.c   | 10 ++--------
 3 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index bd11fef2139f..465d83b13582 100644
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -210,6 +210,26 @@ struct sta_info *sta_info_get_bss(struct ieee80211_sub=
_if_data *sdata,
 =09return NULL;
 }
=20
+struct sta_info *sta_info_get_by_addrs(struct ieee80211_local *local,
+=09=09=09=09       const u8 *sta_addr, const u8 *vif_addr)
+{
+=09struct rhlist_head *tmp;
+=09struct sta_info *sta;
+
+=09rcu_read_lock();
+=09for_each_sta_info(local, sta_addr, sta, tmp) {
+=09=09if (ether_addr_equal(vif_addr, sta->sdata->vif.addr)) {
+=09=09=09rcu_read_unlock();
+=09=09=09/* this is safe as the caller must already hold
+=09=09=09 * another rcu read section or the mutex
+=09=09=09 */
+=09=09=09return sta;
+=09=09}
+=09}
+=09rcu_read_unlock();
+=09return NULL;
+}
+
 struct sta_info *sta_info_get_by_idx(struct ieee80211_sub_if_data *sdata,
 =09=09=09=09     int idx)
 {
diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h
index 369c2dddce52..80e76569144e 100644
--- a/net/mac80211/sta_info.h
+++ b/net/mac80211/sta_info.h
@@ -725,6 +725,9 @@ struct sta_info *sta_info_get(struct ieee80211_sub_if_d=
ata *sdata,
 struct sta_info *sta_info_get_bss(struct ieee80211_sub_if_data *sdata,
 =09=09=09=09  const u8 *addr);
=20
+struct sta_info *sta_info_get_by_addrs(struct ieee80211_local *local,
+=09=09=09=09       const u8 *sta_addr, const u8 *vif_addr);
+
 #define for_each_sta_info(local, _addr, _sta, _tmp)=09=09=09\
 =09rhl_for_each_entry_rcu(_sta, _tmp,=09=09=09=09\
 =09=09=09       sta_info_hash_lookup(local, _addr), hash_node)
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, s=
truct sk_buff *skb)
 =09=09.skb =3D skb,
 =09=09.info =3D IEEE80211_SKB_CB(skb),
 =09};
-=09struct rhlist_head *tmp;
 =09struct sta_info *sta;
=20
 =09rcu_read_lock();
=20
-=09for_each_sta_info(local, hdr->addr1, sta, tmp) {
-=09=09/* skip wrong virtual interface */
-=09=09if (!ether_addr_equal(hdr->addr2, sta->sdata->vif.addr))
-=09=09=09continue;
-
+=09sta =3D sta_info_get_by_addrs(local, hdr->addr1, hdr->addr2);
+=09if (sta)
 =09=09status.sta =3D &sta->sta;
-=09=09break;
-=09}
=20
 =09__ieee80211_tx_status(hw, &status);
 =09rcu_read_unlock();
--=20
2.24.0