From nobody Tue Feb 10 02:27:37 2026 Received: from mail-oi1-f175.google.com (mail-oi1-f175.google.com [209.85.167.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 89A274949FC for ; Wed, 21 Jan 2026 15:56:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769010994; cv=none; b=e7XlDFntfq5/gYl2HWXPmlSfUucg00ng6yn6NMIXSV+l+53AmtFHLOG0cY4lSK++KJpdySFP7PR4Pmn9df+z1JjCbUj/TllPJpVlv/rapexYC4Mw50UExtDxkO0F8MzfRtCWtxpiT9g1jpz3qr6n/ggI8BSE9IjlSEDhGuAZ14M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769010994; c=relaxed/simple; bh=kqzS/7eXjKQG4xiemTDsmFZRs2ALv2BsjFw/ViIR5ug=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=U6cxLHdLNm6iqZ5nYeHY+A647/qafd01e+2Jz0kqZNVd3kmlHdwXduiDU1VKHD5T0HgbsRqqIBIr8pUvfqNYyVp3JXZegg3V6lv/nrVUJ3Cf6oQIuZPsHOGksOKB7toTEAmHuUcfjW8YysmGII5A0LI4S44PFmu2LUt0hqdsVE4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.167.175 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-oi1-f175.google.com with SMTP id 5614622812f47-45c83c49213so10728b6e.3 for ; Wed, 21 Jan 2026 07:56:31 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769010989; x=1769615789; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=BvlsW4lqNl+1+09mnU3bYFr4itCF0ttr+C2yEDPsR5w=; b=P5/YhrAoWCI2V1kiYpcNaW+DiiGu/5pggr4kR0o/WDn/cPK+cMmjwjbHhO0POu7nh5 dd78Bn3267+SEuo4uhT36O8/Lm0F2g5Dp9tQSkWluL4zJoCFA987aThG1Cc0P+YjUwq/ 2E/gRDjMnTpkyLgATq+oIkZeMtEvS1x8aZOP4zop+nmwLErbtjQnFeA6syxaz0i4w36o XTLaoUzkHTOJY/LA7mSuUQKYF7HO7gz9gpdDpD+0P9Sbhtt1yQ/DM6aYllKhKNsQBLAl uGGFjqqlg6hMeFSyhqvIifb3ar4yP3bEjs5Rrt2lqLNb7j5wai5fu1RzW8WzCkczBS2a YuIQ== X-Forwarded-Encrypted: i=1; AJvYcCUYtZ89xYwRVj4ERQ6Ds1ESHZBcD+QNVP/+Jv6Aq8Vn6XdgHVd5oZktdp0XDP68MaivcnljEOSIhOCXD/U=@vger.kernel.org X-Gm-Message-State: AOJu0YzT9YiiQRQgrqN/pEJLuuKt267zklJVn2dUf2RtPacGpR0eaJAP rNONXhUkt1mCFIFoM0dmsruwrgF3vxeHHjroao3Sf7xu0ViejmYKndfK X-Gm-Gg: AZuq6aJ5/XImgOJkOQli5PWKZirpKVy43AtgTCQ3zSdj+lV7PK7LKc4g3dWPNxSSxTu Hw4H8BdA3yCNFInMyQNl52rq98X1yP2qYEPvJ+IvW5bxrvyylg2M039uqwWh2Rlc72VF9uod2b6 NnlfXadDAFojthYkwCRe1xUPQHggbqTCOPBOFz0C2la0s2mW3X4SRvb0THtT2Y7O+j7RC2hcHGh L47FO5tNL5fMMRHsgto5TyueG/Y43p2dbtM0/TdoFZcRjMgoFCoYgNzjI2QH06EzAmhHK9EueCI xBPVP7Zb0MvU8/PZqGmAyJHWw3zT38bGs7aN6XIVuXJA9nWs8Q9jpqsmeYyONhAoc8VMHVwQblx Jm5Y/qWZT9KOgYJeQ8HRMXUsXsJRMqoStAyzmJUwCmIGw4WnD5wcdY1A5GPzpohN64Ak4hE4GIp zd X-Received: by 2002:a05:6808:1207:b0:450:f17d:860e with SMTP id 5614622812f47-45c9c146db5mr7453499b6e.47.1769010989362; Wed, 21 Jan 2026 07:56:29 -0800 (PST) Received: from localhost ([2a03:2880:10ff:9::]) by smtp.gmail.com with ESMTPSA id 5614622812f47-45c9dec6619sm8684288b6e.3.2026.01.21.07.56.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Jan 2026 07:56:28 -0800 (PST) From: Breno Leitao Date: Wed, 21 Jan 2026 07:54:46 -0800 Subject: [PATCH net-next 9/9] net: sfc: falcon: convert to use .get_rx_ring_count Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260121-grxring_big_v4-v1-9-07655be56bcf@debian.org> References: <20260121-grxring_big_v4-v1-0-07655be56bcf@debian.org> In-Reply-To: <20260121-grxring_big_v4-v1-0-07655be56bcf@debian.org> To: Ajit Khaparde , Sriharsha Basavapatna , Somnath Kotur , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Igor Russkikh , Simon Horman , "K. Y. Srinivasan" , Haiyang Zhang , Wei Liu , Dexuan Cui , Long Li , Alexander Duyck , kernel-team@meta.com, Edward Cree , Brett Creeley Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, oss-drivers@corigine.com, linux-hyperv@vger.kernel.org, linux-net-drivers@amd.com, Breno Leitao X-Mailer: b4 0.15-dev-47773 X-Developer-Signature: v=1; a=openpgp-sha256; l=1636; i=leitao@debian.org; h=from:subject:message-id; bh=kqzS/7eXjKQG4xiemTDsmFZRs2ALv2BsjFw/ViIR5ug=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBpcPci73BBafszurpkpislh2ZdfEde9KM1z3BTH bEi/YHQ4KqJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaXD3IgAKCRA1o5Of/Hh3 bW8xD/9h5DYoUj0BnDZx0DxqyEswo0Yz24BdyMadcONl2aU6A/5L0TN0u8VNDwSsWgG+fnZxzfR 0kHcfXVG8VstKhv6WBMC4KO1magMR4Lx3JYC22oDObaXt2v5Y0T7QAFhVc5PKptaqbhRPvlEcZN 1unciuhewFPcqJbCk6kpIvhbnNIY1YQA+YL3S5AVwJLGQFEl648DGshte1NMUainY1FRJzIOXZJ 4GrJrJkkpb9DrbLw5/tOn/HudzHV5/eCLJJj4M7K+AqBwreaMY1wzbe3mO0amtQgxgkEFEKIgty 0InW+tYXBOA/7shGFBMmhLckz6+yyDQz4tX5Z6F6EisOINVh+IghhbpQY9+5krZdeEmjm0ksSf8 smqvc/Qh/olyNs/+9DSROujp3XnNIyKb1mU37/30xZ3U7at0PE0hyenclY51b2lnpKU+YSR+eZB bT8VP4nh7dJjCb8vSM21cU0LGpf1s8nkWKllnCNL34XZXQ0moTharhlQpikpXe+R6URX5SEgh2o 8NpNLahAV7Az19qYncrEyF56TzKpBQNX3WfsPoM99oCxmkNP49P7Qs5qZI0dB8mwx1kmqtMWALQ fBl93SueB5K5ODRvXlBT/rrqhdsnXPaQ+1y6DKBTLMeK89Kb0y/0QFD7LrTz9A1HY4wHRz2RILz CB90w3nUtgxXUwQ== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D Use the newly introduced .get_rx_ring_count ethtool ops callback instead of handling ETHTOOL_GRXRINGS directly in .get_rxnfc(). Signed-off-by: Breno Leitao --- drivers/net/ethernet/sfc/falcon/ethtool.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/sfc/falcon/ethtool.c b/drivers/net/ethern= et/sfc/falcon/ethtool.c index 27d1cd6f24ca1..0493640315454 100644 --- a/drivers/net/ethernet/sfc/falcon/ethtool.c +++ b/drivers/net/ethernet/sfc/falcon/ethtool.c @@ -974,6 +974,13 @@ ef4_ethtool_get_rxfh_fields(struct net_device *net_dev, return 0; } =20 +static u32 ef4_ethtool_get_rx_ring_count(struct net_device *net_dev) +{ + struct ef4_nic *efx =3D netdev_priv(net_dev); + + return efx->n_rx_channels; +} + static int ef4_ethtool_get_rxnfc(struct net_device *net_dev, struct ethtool_rxnfc *info, u32 *rule_locs) @@ -981,10 +988,6 @@ ef4_ethtool_get_rxnfc(struct net_device *net_dev, struct ef4_nic *efx =3D netdev_priv(net_dev); =20 switch (info->cmd) { - case ETHTOOL_GRXRINGS: - info->data =3D efx->n_rx_channels; - return 0; - case ETHTOOL_GRXCLSRLCNT: info->data =3D ef4_filter_get_rx_id_limit(efx); if (info->data =3D=3D 0) @@ -1348,6 +1351,7 @@ const struct ethtool_ops ef4_ethtool_ops =3D { .reset =3D ef4_ethtool_reset, .get_rxnfc =3D ef4_ethtool_get_rxnfc, .set_rxnfc =3D ef4_ethtool_set_rxnfc, + .get_rx_ring_count =3D ef4_ethtool_get_rx_ring_count, .get_rxfh_indir_size =3D ef4_ethtool_get_rxfh_indir_size, .get_rxfh =3D ef4_ethtool_get_rxfh, .set_rxfh =3D ef4_ethtool_set_rxfh, --=20 2.47.3