Received: by 2002:a05:7412:3784:b0:e2:908c:2ebd with SMTP id jk4csp2825690rdb; Wed, 4 Oct 2023 12:36:49 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHQ3wyNmyCWCREDQTcSJClRWboes2R6y6cW1M/WLBx20uFXUVMgfs3RmyiXIpzsTS106+XN X-Received: by 2002:a17:903:11c8:b0:1c7:23c9:a7e1 with SMTP id q8-20020a17090311c800b001c723c9a7e1mr3837272plh.26.1696448209004; Wed, 04 Oct 2023 12:36:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696448208; cv=none; d=google.com; s=arc-20160816; b=H521RZye9t3XC5CFiFh2QiIQF1Hb0QmTlEhRddTRiFIKHLBFpZt1j2EP0O/n3EAiOC HUf+FP5R3f9NAn6AUA4dPX0xCZwuZB9+WS/QTxIxKyZmd1E471CnU4njE39w+iCF98Kc bCoTWwRNzDZ4aAK2/zFrH2mdyY37iPw2nxSdKP19LXO+tVZSMYU/8mq0qqyCL3Apxmk3 i6VhKxJ2mhCru46Tesk9BR8kEYVorVPJu7Vouk1P9wSCGDO2JNQonLtVnTozx9OxxTAg 8Tq1TrWLeT/bQF1fjTdoY7yAAHVF2NCsZU4d5zh/Z2rhJBn8qCjeX6dF5bbR08BSOz+i 4SVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:user-agent :content-transfer-encoding:references:in-reply-to:date:to:from :subject:message-id:dkim-signature; bh=LnhOXVDLLomVsMwt+u5YAe+yWz54aDiRcmXmw7Loxbc=; fh=7fg7tl4V75ikI9HbgSjaWG0L3NUqEorwYjMuQbGFyhU=; b=bo57r/8bBuj06RLTYV20gonr40AwTIgjJw4LQtvdjiCeMYa0XtX8xvM0sAV9xDpTJw HbXXb9AD16rNp8FxQu1xxZA74H7qIzCsr5ZssjixJRwbaJKgei7H/LNWsZ1F3zdlvvO+ UkZYuiqj4TJd2uXw/nQmsEzH8qaJtgN2CUImWDNfk9tGwDfTrl9hKLoxR/zuR6BzDuM0 VH1nOSgH934LWP07nhneezQv6Sz8x8bQlZLfxXQb1XY/cfpVIVHqT2Ie7K+OiZoTj/2C n67wW+6BDBpnPTpK8tR5i5ueSgSCr3Ylpl/HVVcRs1f4/TP6oIOmN+NuAcmd8AyG9Elt 9HcQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sipsolutions.net header.s=mail header.b=F+MLhq6a; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=REJECT dis=NONE) header.from=sipsolutions.net Return-Path: Received: from groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id kk3-20020a170903070300b001b8ba81d04dsi4142037plb.395.2023.10.04.12.36.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Oct 2023 12:36:48 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@sipsolutions.net header.s=mail header.b=F+MLhq6a; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=REJECT dis=NONE) header.from=sipsolutions.net Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id A3E4980990DA; Wed, 4 Oct 2023 12:36:46 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243847AbjJDTgh (ORCPT + 53 others); Wed, 4 Oct 2023 15:36:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37930 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233525AbjJDTgY (ORCPT ); Wed, 4 Oct 2023 15:36:24 -0400 Received: from sipsolutions.net (s3.sipsolutions.net [IPv6:2a01:4f8:242:246e::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A7D3FA9 for ; Wed, 4 Oct 2023 12:36:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sipsolutions.net; s=mail; h=MIME-Version:Content-Transfer-Encoding: Content-Type:References:In-Reply-To:Date:To:From:Subject:Message-ID:Sender: Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-To: Resent-Cc:Resent-Message-ID; bh=LnhOXVDLLomVsMwt+u5YAe+yWz54aDiRcmXmw7Loxbc=; t=1696448180; x=1697657780; b=F+MLhq6aw1ETOL8X7XOmsei8ISrp5m3aiRnuFvUelZL7fj7 c74CYdlIMtcqsfT9VLc1CTn4f6Tk7GmT3vknNDnMbg79VbyUg6GrYEjFRcWVHVfIeozAODla+oVDv 8pWZjcGtlLf3cY+zhz6m9kjoUd8ISfKOrjpqOYsVDWSZBY7clBOEZi48tkPe+H8/3jXtPSQWG01un bWfE9VHQG2HPqCYBfjDdtCTudUFtqtZ2iO48lEILmQUByz26e8TcodurrKEqOr45HvYwF1ad51mxV 0mKaf4zG4nzVrBOgovHtZ+iZ8kSWv/k/E78XVJr4EZ/LDEIqWn1ZACAXoppHvltg==; Received: by sipsolutions.net with esmtpsa (TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.97-RC0) (envelope-from ) id 1qo7fO-00000004UZk-0oHA; Wed, 04 Oct 2023 21:36:18 +0200 Message-ID: <5b1aeb36dbc7316e5de0b0cfdf429b754c5cfd82.camel@sipsolutions.net> Subject: Re: [PATCH] mac80211: ethtool: check link sta if deflink sta not found. From: Johannes Berg To: greearb@candelatech.com, linux-wireless@vger.kernel.org Date: Wed, 04 Oct 2023 21:36:17 +0200 In-Reply-To: <20231003215839.981227-1-greearb@candelatech.com> References: <20231003215839.981227-1-greearb@candelatech.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.48.4 (3.48.4-1.fc38) MIME-Version: 1.0 X-malware-bazaar: not-scanned X-Spam-Status: No, score=2.7 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Wed, 04 Oct 2023 12:36:46 -0700 (PDT) X-Spam-Level: ** On Tue, 2023-10-03 at 14:58 -0700, greearb@candelatech.com wrote: > From: Ben Greear >=20 > 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. >=20 > Use link-0 for sta if it is available to do a better job of reporting > ethtool stats. >=20 > Signed-off-by: Ben Greear > --- > net/mac80211/ethtool.c | 7 +++++++ > 1 file changed, 7 insertions(+) >=20 > 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 =3D 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 =3D=3D NL80211_IFTYPE_STATION) { > sta =3D sta_info_get_bss(sdata, sdata->deflink.u.mgd.bssid); Just don't even try this, link[0] is always valid. > + if (!sta) { > + link =3D sdata_dereference(sdata->link[0], sdata); but link[0] is a bad idea anyway ... what if the AP only assigned link 1 and 2? Or you connected only there? I'm not even sure this is really worth fixing, do you really want a random link's statistics? johannes