Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3;
From:   greearb@candelatech.com
To:     linux-wireless@vger.kernel.org
Cc:     Ben Greear <greearb@candelatech.com>
Subject: [PATCH] mac80211:  ethtool:  check link sta if deflink sta not found.
Date:   Tue,  3 Oct 2023 14:58:39 -0700
Message-Id: <20231003215839.981227-1-greearb@candelatech.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

From: Ben Greear <greearb@candelatech.com>

While testing with wifi-7 radio put into AX mode, link-0 is created.
sdata->deflink.u.mgd.bssid was 00 in this case, so sta was not
found.

Use link-0 for sta if it is available to do a better job of reporting
ethtool stats.

Signed-off-by: Ben Greear <greearb@candelatech.com>
---
 net/mac80211/ethtool.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/net/mac80211/ethtool.c b/net/mac80211/ethtool.c
index 6bd7fba8a867..1b58304fc68a 100644
--- a/net/mac80211/ethtool.c
+++ b/net/mac80211/ethtool.c
@@ -96,6 +96,7 @@ static void ieee80211_get_stats2(struct net_device *dev,
 	struct ieee80211_local *local = sdata->local;
 	struct station_info sinfo;
 	struct survey_info survey;
+	struct ieee80211_link_data *link;
 	int i, q;
 	int z;
 #define STA_STATS_SURVEY_LEN 7
@@ -128,6 +129,12 @@ static void ieee80211_get_stats2(struct net_device *dev,
 	if (sdata->vif.type == NL80211_IFTYPE_STATION) {
 		sta = sta_info_get_bss(sdata, sdata->deflink.u.mgd.bssid);
 
+		if (!sta) {
+			link = sdata_dereference(sdata->link[0], sdata);
+			if (link)
+				sta = sta_info_get_bss(sdata, link->u.mgd.bssid);
+		}
+
 		if (!(sta && !WARN_ON(sta->sdata->dev != dev)))
 			goto do_survey;
 
-- 
2.40.0