From nobody Tue Dec 2 00:46:50 2025 Received: from mail-oa1-f54.google.com (mail-oa1-f54.google.com [209.85.160.54]) (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 D879D31B819 for ; Mon, 24 Nov 2025 18:19:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764008360; cv=none; b=KQXftC4GgfdYeELbsrH0YrTsLhCKgxJcVHI35PM2A1ABSpijKzTxJhHxSkMWpKjnopQvPWXYKIARX2IKud+BxBDHsxfZh/WsGafkjUnzK/t/uVLGwbjfbgDsi0Veef2cKL4lpnSiJVvZoCcBjoLLlRRvMPkdn5FRmDlElZ7Qj2w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764008360; c=relaxed/simple; bh=r7kjPpO3EmMUKZOQEZlWjxTq3oyKJiuHGfOq2mFvYMA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=O2NljbdzUtVeBRwciyjEEfi4wlmkeykoy5uXFdgjEaNxBgbGn2MXl6lI4D+oraC52Vr5RAtN6R8U4BeipTDWDhRcw3cMBz1ybGg8aduzM4u+NcmLJ9x31u91P1kypizcsw8OE3PdfPfDxEEKbQKwvnEnqM3WYDynveMTPicD6/E= 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.160.54 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-oa1-f54.google.com with SMTP id 586e51a60fabf-3e0f19a38d0so2947130fac.0 for ; Mon, 24 Nov 2025 10:19:18 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764008358; x=1764613158; 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=XdOK/+JSUKsUAuFyuE3vjj9D8Qk2MEeTKmCgASJ6/Kc=; b=ii04LlcpVjj5Yq0Ob7M2rzBiHXokzQhTTX3SBWB4KtU1XoIQW6XiQjBj/EKeEnI3Wy DRXoZtuVSuaBrycI1MfV5m1kz02yWeRMbQoy/ThuElhXEvk3NOu6otqdyjTwszoHUrj/ WxQ/OCnGDeLltJEq0oyciZ1+lcNTZe/GJji0FXQZrBy1xt0syyrFy5QsnbwXtAETR7BP gjCX+E3wcjPekFH89Vac6rnfm1LhXz/N+kaLaUo5xF0eQRRDK4xJVba1nTrm/ncPWw9t hR1oFdX2TmE1ePwd/Yn2DKnpXtMcdLGjigcM4riuo75FVA5HoSke8gF6DpT+JDOJnmHd ONdw== X-Forwarded-Encrypted: i=1; AJvYcCW+NnPyANt6YJGUHDP+rnKYrDhkt3jhizJSWz65LyyV7HBlbn83VvJ4DNi/E6j319h9mU+/mKiUBBYxzgQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yxc3SBzwB7KKSSVu4SmpCur1ewDuDcHcgVPr16Up3XTeaKEN6O9 InCxFSazLkw+QpYP9CBwJ2V/XrqjqH+4Ewtd7h2NRLvKIA3auPm53o5c X-Gm-Gg: ASbGncvpGmb0tgP98Q9Q1BNoeY/PlBIeVOPYMfqA769zZe/R5JIDGop2XoXtVhSHk4c UZvIJJhQkOCePrRnCZqePiQu3UtMQu66JV+A0ZPEyXlwm2/N8bUKHrtmjwdbykVdSH7iyhewMi3 WyTEsiiIENJnN3eNaYKGDAbzjQ4qDPAbyrhuIYjVk/etc9zIt9ebxxyb/snixELnSda91E0MGMz KZvG41pwgMoZSaNQlURwlPpFr9tK1zuMt3ZK2SyeR6ex6EYfisaZIC2KiyAZcUOVZTbkB93U0Vg 9OYbvcZCANSp4ncObLmfuBSNNp6/fn5+xBHobyWorisaWVepFQ5Se/cAmKjuE4uu7qSTl1jNlwL GDkSdvRHmID6Jga2BHNPvIbra3Vwn/ncY0al6h1Q0yE3PHp01mt83vA4hqz0KdnbRBribgQyK0Z gKpHzp0Fx/N0JHKQ== X-Google-Smtp-Source: AGHT+IFsMYMZsraWZeN3BUvD1HXeX+FpLoZiZgRtlLXlHtafV46HeiFiZHENmrqbuDEprBt45CmkCg== X-Received: by 2002:a05:6870:a2d1:b0:3e7:e20a:39fb with SMTP id 586e51a60fabf-3ed1fd4ff6cmr52374fac.11.1764008357879; Mon, 24 Nov 2025 10:19:17 -0800 (PST) Received: from localhost ([2a03:2880:10ff:72::]) by smtp.gmail.com with ESMTPSA id 586e51a60fabf-3ec9dc8e103sm6508744fac.19.2025.11.24.10.19.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Nov 2025 10:19:17 -0800 (PST) From: Breno Leitao Date: Mon, 24 Nov 2025 10:19:10 -0800 Subject: [PATCH net-next 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: <20251124-gxring_intel-v1-6-89be18d2a744@debian.org> References: <20251124-gxring_intel-v1-0-89be18d2a744@debian.org> In-Reply-To: <20251124-gxring_intel-v1-0-89be18d2a744@debian.org> To: aleksander.lobakin@intel.com, Tony Nguyen , Przemek Kitszel , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: michal.swiatkowski@linux.intel.com, michal.kubiak@intel.com, maciej.fijalkowski@intel.com, intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-team@meta.com, Breno Leitao X-Mailer: b4 0.15-dev-a6db3 X-Developer-Signature: v=1; a=openpgp-sha256; l=1850; i=leitao@debian.org; h=from:subject:message-id; bh=r7kjPpO3EmMUKZOQEZlWjxTq3oyKJiuHGfOq2mFvYMA=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBpJKGdKv15ipu1j1gMS0Jhfn4ft7Ly7jrvTdWd7 8Q8gdOtGemJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaSShnQAKCRA1o5Of/Hh3 bZXdD/9kWqQNyNoVCNuwu1DAB8IoqQYDXO4gblgkYeyAIwCF/DUfqZrg2iDMn9NHesx6ez06K6C M7wn38DzZvlSqJrfMIrYg6xL73sziCXQiH3hM1ltLbzw+q9AYTeyCygU1+iPTBvK7LeGOl34Toe d3JTPQt5UvVZAbvPAB5AKdxPYyvwRmLfx53TLQZ0eB7ax9HF6HJZpJhSeq3ltsZ+QeXG21Loz2e lVGA5pO53PT+o2NnOEUu82x2yXl6PbDwiMhvBh9y1PEYrJ8ZsfsG+vUTEhsVIUgCByfZURwbyKK tweLnG8+7BJK7PmNr69HoIiOPS0QKy/v2D6JBaLkDJvULUj+qX2f2fgw+YnxwTWUV3NMHP5X74s c8wdVpFdmvJ2K5rVpgAF7LrLszl5E4arCAM/gTLAIvw5PBm7Jh0Qh1s6RGJKStuwbDeD0SV/O7x mVUOcHYDJsRuNw+57hNhso1Nj3Egq49AG6ib6/qpU7C8LdwKOovDoZSFqufrpn3s1K0LWmyaJis 8gYTMHTFYxZMG2gYceACrWq85RHj1FVmgG7aWS4rTR/y/yj5djXjMV7l2aaOId+/1o5XqSacFyv P1MyNAswjYdYpGQpB3S+E/Z/pOcLkRNdumq5dCRm66Z+OcW95Z5fehVxmtoCH8vrl6O1kQItFqO 3BFnOwlIYyUIs8g== 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 --- 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