From nobody Tue Dec 2 00:46:52 2025 Received: from mail-oi1-f180.google.com (mail-oi1-f180.google.com [209.85.167.180]) (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 D47C231B101 for ; Mon, 24 Nov 2025 18:19:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764008359; cv=none; b=a3ALIhk4GjYBqb7J2xZyArlwOZxaUn+jWvsTtoGjwJXm6BJHpd3USSgX0cq0NLl1O0phEHQhXpqEbuQua9rV9497zbf/+QvDfQGYVQz6SJ0ztVTfl3dlYwePp99IvYyaCeVbwuC68vsb42y++kov1RdCJgZ6upDAY1vG+LlJZsU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764008359; c=relaxed/simple; bh=OgPWRRZOtLlIvXpnH4N2Q5x7CGVehFLkmP7HegABHlM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=cQ+AJmQEUIbolNSAJwnMwUKP3zTkjOWiskUFDODZHDIGjLblF5K1pxXDyo6iuQ6AAtYkLsa9EsL7P12MhRIGTjElJv8/yOA2Beefg4oyCHFSjrMIKvs/p27+XOOG+Go6HovLo0ANTosAFetRMlqeuPJ7XbF+cfGeGIv/L0qxFRM= 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.180 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-f180.google.com with SMTP id 5614622812f47-450b8afe3e0so2201013b6e.0 for ; Mon, 24 Nov 2025 10:19:17 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764008357; x=1764613157; 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=gjNV26TJAFnOjL0zQpnAU5UQK41rA5W+DqVt0zsSBLA=; b=UNQiuHx9peTxQaXMqCrs5HK5KabjN5nWt+NaZY7OJBLODEhgxlXp4OH6Wmy2pJ0By/ jVA0yBynBh8LOhkDhVArxWPDVHS8ky8wb/5mCwNxfyNPT4A1XzVAaCb1al2wHTjPLbM7 lZid38X0A80uIg7/1+Uo3Kc6thLMnNjChGTr4mXOenhs4S9Q8wp/eTBUZ3zbVEoFN0Lk hmogEd+GJUlnMKBJba+HvfNVKRhz4QNh3JmSi0NjK86puW5n7axjb4n7N/iHb92xFJQs lSlNhctFrjD4SaASfFoCMtFIlWdH2v7fqauuQNB55CX8FWsSlfSoxKNIYcl7FrAA76n5 ibug== X-Forwarded-Encrypted: i=1; AJvYcCXhO51HhuqzzujpXZ3PMbrS7BW9Dx598y6zKR5QziSRtypJxDnC0fLraPOlPmj6fcfR0JXmPa6AcUXwKZU=@vger.kernel.org X-Gm-Message-State: AOJu0YzxWxmk8zzN+HSVB1zvj8CKrVeMtvpIGRFN7pVkkkJznxExarLn l5imu2iq01+kcflv+jjkqPMqNz6yvmySYqM4Mb0FxGiPEuPf+hVnjeec X-Gm-Gg: ASbGncvK4Xqg2ULnZMNDMXBYyr+mq12DM64XibvdlrMXzShjZNzbFuzyx+B/6kNZ8AM oON1SzJNS4ISmmdwTp4O5JOoCG7Z3lwDVSlyp7IJtpClaNioPgkkp9L2/Ku7YMff4IL97WAEO2x 030V+UJvFYltbLtaDy5/Qt98zNSK36gwRSLswMGDgojJIV7BD3+XvRVRTQl5UqoxSRlG8tK27gn myvTQqTyWARlpDftZAbvziTY4LXmHoVsYpB5iWTFaCroYrlHQyn7YgbE/jWX2QHc4rkcKwmfa0o 1JEobPHnyudHJNFsop/ZLds1BOS2W6e7ZO4XrpQYfWEMp+ogIVpSCc0P0CdAEAXrcLJ0sOtPxzW M6iCSq2okSgcIM56hQzVEeqN8rTtgTLTIWryJbUuTyWp5qAil6ETIvX8A4oIQsEJw5kwfZmfwx1 YZq9yfshWnpmFX X-Google-Smtp-Source: AGHT+IGeDs1bSrKcyEMR1LAWNGoD6UADmOpn9FxqxKFcwWK9IsLkIF4vrHt1pJ6fEsXB9A/emNN7Lw== X-Received: by 2002:a05:6808:6f93:b0:450:c79d:92de with SMTP id 5614622812f47-45112b450c6mr5811607b6e.41.1764008356831; Mon, 24 Nov 2025 10:19:16 -0800 (PST) Received: from localhost ([2a03:2880:10ff:3::]) by smtp.gmail.com with ESMTPSA id 586e51a60fabf-3ec9c2d0e96sm6447817fac.2.2025.11.24.10.19.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Nov 2025 10:19:16 -0800 (PST) From: Breno Leitao Date: Mon, 24 Nov 2025 10:19:09 -0800 Subject: [PATCH net-next 5/8] igb: 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-5-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=1841; i=leitao@debian.org; h=from:subject:message-id; bh=OgPWRRZOtLlIvXpnH4N2Q5x7CGVehFLkmP7HegABHlM=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBpJKGdk1P/ro4oqgHCLx8bpaolNi+8AH6vUG7RL FiDoNPbbwyJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaSShnQAKCRA1o5Of/Hh3 bTpJD/9vLs9JgKf5MYB4HIFfvDAbTn13yYgo3usgPaeAT6+qx/GEG9fGYnkTEF2fxf8scfvcb7I Yp1aBgYZEqtVEs4Z2LoIVVYKSF/5XWgT/NJihnJur2xjdPykcUQWDVYvdgn063U5qfrHkq6Xgpz 5lHxvoulLpkeYh1dOETlf5NtQrlL+A7qzW7WDIR1NBgI1T263ZRmzPZJ7RH0HyPeQI/1UGA3V+m FvU6opgv+GhdM1xfnpxHjDuxVXZ/Zmiipd60NA31Qa+iACTox+6tyqnhRNbKpZz3ushWvQrYE5o yvgZOrtm1cGiYibd+nr525ZQQLA6wK47y4vZqIBQbTIyy9IBrlxbwH+o0T0VILcG+uEpv6fhqhH qW7EEgG4om+xwn+gJNnYHW3CeGq6HAUe0VTx0xDKitcaj7ogLijxyAE3fOQhKcL93bT2kXQrNcr DXZ+qiqoiqRAffug0g1bhh+8R53cBAhZDz7ccdnsOUXA8Z5DlrjXIgp56JsqZntBi5/aVIoMLO4 tItSuQSDDc5O4S9mUgqaSzZ7vaZVwJj+mmGEC9fxmjaQchRozK9yr+ZbkeDmjp2t3/cgBnI8A3r i8M/ZNpE5/a+hNq4BHxPo2ids5v+5SfCq5NHfVRduoU0Xwxq34XifHEaS5teEPlxZx1J3yQ37xN zrAM6wxMoEvZThw== 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 igb with the new ethtool API for querying RX ring parameters. Signed-off-by: Breno Leitao --- drivers/net/ethernet/intel/igb/igb_ethtool.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/intel/igb/igb_ethtool.c b/drivers/net/eth= ernet/intel/igb/igb_ethtool.c index 10e2445e0ded..b507576b28b2 100644 --- a/drivers/net/ethernet/intel/igb/igb_ethtool.c +++ b/drivers/net/ethernet/intel/igb/igb_ethtool.c @@ -2541,6 +2541,13 @@ static int igb_get_rxfh_fields(struct net_device *de= v, return 0; } =20 +static u32 igb_get_rx_ring_count(struct net_device *dev) +{ + struct igb_adapter *adapter =3D netdev_priv(dev); + + return adapter->num_rx_queues; +} + static int igb_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd, u32 *rule_locs) { @@ -2548,10 +2555,6 @@ static int igb_get_rxnfc(struct net_device *dev, str= uct ethtool_rxnfc *cmd, int ret =3D -EOPNOTSUPP; =20 switch (cmd->cmd) { - case ETHTOOL_GRXRINGS: - cmd->data =3D adapter->num_rx_queues; - ret =3D 0; - break; case ETHTOOL_GRXCLSRLCNT: cmd->rule_cnt =3D adapter->nfc_filter_count; ret =3D 0; @@ -3473,6 +3476,7 @@ static const struct ethtool_ops igb_ethtool_ops =3D { .get_ts_info =3D igb_get_ts_info, .get_rxnfc =3D igb_get_rxnfc, .set_rxnfc =3D igb_set_rxnfc, + .get_rx_ring_count =3D igb_get_rx_ring_count, .get_eee =3D igb_get_eee, .set_eee =3D igb_set_eee, .get_module_info =3D igb_get_module_info, --=20 2.47.3