From nobody Tue Dec 2 00:25:36 2025 Received: from mail-ot1-f50.google.com (mail-ot1-f50.google.com [209.85.210.50]) (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 40D432F1FD1 for ; Tue, 25 Nov 2025 10:20:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764066004; cv=none; b=mf5lr5hH5ZiOognCPsgk2o3f2GifYAam6kDZPxJ1gb6KH51js03FS/lrged4T9QeJEo8XcZsJEzqRwc86J8qHqCvONSPbWoIU/HF04hrFQZX4/cTcEfwSa+xlfYY7Jh3nrecNhYlRUiYDCv5FQnS2BztJtDnpwSKdTgRGkkBS40= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764066004; c=relaxed/simple; bh=Q0AZpTNUFttrJLNx9FvORT21hZNYuuTH+qlH8H7VieA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=nMNgtcLUM7CmdaU7HrDcH3Df5WDUxa3y/bv4dzPlQwmmXaczvyqykA0oeVI24zdgs0abejnKeUW/XmCNECYfpTKDMgKx+/PfhlW6btbM5eMimE7ab9xTRdDww5dduSe2VfjgrxScoiyDeo+xV5ilj/Ce32PffiCZpB+xbo7r/sY= 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.210.50 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-ot1-f50.google.com with SMTP id 46e09a7af769-7c765f41346so2084782a34.3 for ; Tue, 25 Nov 2025 02:20:02 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764066001; x=1764670801; 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=8Yu7gPJkUQ7vuyCmZzm/NNLqbPOpqaQrxUJ4JkhHxnk=; b=bvpQkpb7d6B2wcaeU8FI+9ycDz1PCgfnwyVaP0Xa2/MhMc4oQLEUtkGFYR1cP5LMo6 pAv2+bjramMCgvbH4jtCVniEQ/67bGTXNJ2ni2/Oz63z1QX1Rzt/FlEDKj4koV2eAxyV VRanMqR+s8HuzhEhHLPoJvzeFDxYjo6IFoXS77DOkIuDyQhMTF7kT6p+I46y4aHs7G5R TJIcb1TnSJEKLqhqLIcH2v3uUU2/HCEf4UeLVch+PqNRXz3IigXxkTeV1NIzsG770xQv 29OwsnB+wYfSRNkNSbe6WuFSZCbfssTh5HBeWqjKy/SnSNdxJK7BU/FYH8FbBX5lo69V vY5g== X-Forwarded-Encrypted: i=1; AJvYcCVxF+5vJPpn9/aAInY6N2Z8VQt4mnkQEPFXIAX7GUQp9ncqiQueR0/5GLA3s8H3juvjfkHxto5c7J/mFb8=@vger.kernel.org X-Gm-Message-State: AOJu0YySpy57D0fX2PsVACPw1XW+GDKwo+1+848TmY47Ft0zPzF8m2DH PHfh+kkalShc4rgR4sRiEj7rg+1EHN5r361ZpPT5a6mrFtUm9skRxA7i X-Gm-Gg: ASbGncvpKupc+Je9ntrJcSju154hNOpSWX7EM6aeGPcjzwaFB9V0c74MqbQ8n5hinPN DfBaELWawrmfwEZxSnlRVRJJidFF7L172DAvf1EkjyvFsALLcVPG+Nm/n7jo28yHqbvOUKwPdst diq8GW07i4FP8oIUXI0Ey5wSb/KMHtl0tHSnGrbSMV7sB5cFlpQbsnOHUWv4adXpjB5EvcvpffQ ZX6D0lYNZPomk/gVF/iIA105+exMLmYWXwznAnktf2IMaU1sJl7iZrMdEFbwDulYcKjp8AS+IkY H8p2Fsc1sLQzY2vrzZ7eC8cGuMhPrCLZoD/brD4u3qlauHWw5zRFQF9EiQ2Kk5TepMpzaF4S4Qr l8MbTvsO4PJl2Sv3tDej+EKJqBWBjT6HlNIyXqAm5UWobzSEYTugTy9LU2VyU2DdCd7zqoGQnwZ 1Pa2SfF9EwkCvWaQ== X-Google-Smtp-Source: AGHT+IFYidAJStx/3yLbtUGaORWltJ3sPJCt+ub5ZDeRVPCOV25y2qZl0pgExiFfidEWvGeNPQgc7Q== X-Received: by 2002:a05:6830:a90:b0:7c7:1c77:f107 with SMTP id 46e09a7af769-7c798cc684dmr8246144a34.34.1764066001247; Tue, 25 Nov 2025 02:20:01 -0800 (PST) Received: from localhost ([2a03:2880:10ff:5b::]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-7c78d400b2fsm6117096a34.22.2025.11.25.02.20.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Nov 2025 02:20:00 -0800 (PST) From: Breno Leitao Date: Tue, 25 Nov 2025 02:19:49 -0800 Subject: [PATCH net-next v2 6/8] igc: extract GRXRINGS from .get_rxnfc 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: <20251125-gxring_intel-v2-6-f55cd022d28b@debian.org> References: <20251125-gxring_intel-v2-0-f55cd022d28b@debian.org> In-Reply-To: <20251125-gxring_intel-v2-0-f55cd022d28b@debian.org> To: aleksander.lobakin@intel.com, Tony Nguyen , Przemek Kitszel , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-team@meta.com, Breno Leitao , Aleksandr Loktionov X-Mailer: b4 0.15-dev-a6db3 X-Developer-Signature: v=1; a=openpgp-sha256; l=1918; i=leitao@debian.org; h=from:subject:message-id; bh=Q0AZpTNUFttrJLNx9FvORT21hZNYuuTH+qlH8H7VieA=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBpJYLIRfG2UeA7ILtyLTVPFkpMX69FPiKLhzY5p DWiH7FBcluJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaSWCyAAKCRA1o5Of/Hh3 bSZhD/0emHaiSZYsdU/B4gJdVA27ND+ZjOBWi7ZzZhXpt8NirHhjrt/kqoyxYR1506PQIgx/jU6 oUVL46lADAMbXim0ui+0FungfV0L2yXRUjnLeFppXmp8FYKQsPjXECqKklesgdCEIgMqQQA/11C 6MKn367INNE2kOXJh0gFA7vFNaCGPy7PLjJl8tYwMCNwSGPnVzLxRkHFs1GEpfrbXyyvRE13hu6 23Ggl111gePbkwJAknUfY7f69TKJRX0dn/gh1WJK2nLoJ1yJfq8GMan2LQ9DO4e3VWTdmbjrskn 5UVh0ISbounYP5X6ubpGJ6REPB8GbSv1smiqZXajN8YOYlRCMWHccfoIoxhGwo7MLCT3o1Nnc4A hvYIoFjn7Ai3TmE/25WDGgDIyB76QbmawwUflu12uk2CEXHJG4TVox6YuO6OSNVB56rLFpMTRJs /8NsrYNcrwIoSFVPuAq4xlR3UBn4MXWTgwNAusTs9cR6D8wVR7YuMAWTIhNISTw1y0yJvTZEwNX KEYUx3JddG/X+SjcSrf92w99XvLHsi50gAQ2lQZEQChr5FujdTussekfS+sXd6DKcO1g2K8eWHT UWaI0+z0rGeXJMEkgl+Jc65mQL3J0ph9iO07RaFv2LR69kfcW15lnZK6pW4yOKnpwCI6I5UNPJk dKfM//WFoI/ROig== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D Commit 84eaf4359c36 ("net: ethtool: add get_rx_ring_count callback to optimize RX ring queries") added specific support for GRXRINGS callback, simplifying .get_rxnfc. Remove the handling of GRXRINGS in .get_rxnfc() by moving it to the new .get_rx_ring_count(). This simplifies the RX ring count retrieval and aligns igc with the new ethtool API for querying RX ring parameters. Signed-off-by: Breno Leitao Signed-off-by: Aleksandr Loktionov --- drivers/net/ethernet/intel/igc/igc_ethtool.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/intel/igc/igc_ethtool.c b/drivers/net/eth= ernet/intel/igc/igc_ethtool.c index bb783042d1af..e94c1922b97a 100644 --- a/drivers/net/ethernet/intel/igc/igc_ethtool.c +++ b/drivers/net/ethernet/intel/igc/igc_ethtool.c @@ -1091,15 +1091,19 @@ static int igc_ethtool_get_rxfh_fields(struct net_d= evice *dev, return 0; } =20 +static u32 igc_ethtool_get_rx_ring_count(struct net_device *dev) +{ + struct igc_adapter *adapter =3D netdev_priv(dev); + + return adapter->num_rx_queues; +} + static int igc_ethtool_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd, u32 *rule_locs) { struct igc_adapter *adapter =3D netdev_priv(dev); =20 switch (cmd->cmd) { - case ETHTOOL_GRXRINGS: - cmd->data =3D adapter->num_rx_queues; - return 0; case ETHTOOL_GRXCLSRLCNT: cmd->rule_cnt =3D adapter->nfc_rule_count; return 0; @@ -2170,6 +2174,7 @@ static const struct ethtool_ops igc_ethtool_ops =3D { .set_coalesce =3D igc_ethtool_set_coalesce, .get_rxnfc =3D igc_ethtool_get_rxnfc, .set_rxnfc =3D igc_ethtool_set_rxnfc, + .get_rx_ring_count =3D igc_ethtool_get_rx_ring_count, .get_rxfh_indir_size =3D igc_ethtool_get_rxfh_indir_size, .get_rxfh =3D igc_ethtool_get_rxfh, .set_rxfh =3D igc_ethtool_set_rxfh, --=20 2.47.3