From nobody Mon Feb 9 20:32:36 2026 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 92A0C3A4F33 for ; Thu, 15 Jan 2026 14:38:23 +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=1768487909; cv=none; b=jw3qeoMOda+hHjPR064XnqicHrUPcQEwzwJ3pkO1XkGnxRqG4FcIZUKmPyFJFuC314+Bsibdty/SmNYyJ3EIhcAZKKHTdMkW758p+37EdMN/7P0/XX3Sw9dbSQKqsgbE6oJHdWwU7Nc4/m4rFRjAABpI9tm/Cw7g516WhjFO1zs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768487909; c=relaxed/simple; bh=mTt9g4AIDDCE/wyHFNRn7ITIDqk1FNXdFvVq0NDOWRs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=o/srZ2STBWSfS0+hi+q+Cb98S3yac5ZorLVNi+VEPyOUaxnFkNyYpsKaYYNI6y6LgRklOFTN3nOghNGMJhbVGzBD6WQ7AvKrfPWOVkcREU3RSbZ/vMhVnBay4Wubg4FLPcmYWf3GyfieZeila3vcQsKP/5Jo4I9MDeDNhvg6puA= 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-7c76f65feb5so783005a34.0 for ; Thu, 15 Jan 2026 06:38:22 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768487900; x=1769092700; 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=otSP3WumEJ9ljtBMFrQYAuqQcsR+pe8+cqNgEJVYYfU=; b=DQN1HJLU/3I8+x1pUrPssaA4OXnC2aYqm/CbYrW2itbFvhJrZEpUqJo6fL/ns3De2l d9f3tb9fc3Hd5Mr6fjVPfAnCWRhN/e6OBJ0ks5CB+uKyhgs3wD9gqR1KICbBehgtZU2u jQt6vdRkgB3fAvSylGSFixK0JR9b3EEw8lARkzhRSjtNyS5G6VDsrTctXw8jYTejzG0k YC6l+qDiqSKST8WF5zl7BwNbPaEXKz4wc8PE7HMkKaFV2QaiC0AjWVuSVebaqg6ixD65 DWqTK+ZLAIQbMWY0j4piFTBKw4P/LHjcFKlHHZhxfGoEJk9viaAdvDQRoGetTH2GbZLj mqpg== X-Forwarded-Encrypted: i=1; AJvYcCXSIGqK23KgQgoqgsG1XCww32rKojkF4vnSYR0guYH3t8njhZCmR1I/0BponmNw88RQ7e2uD6vewEj7njE=@vger.kernel.org X-Gm-Message-State: AOJu0YzANJHkj/DrYmzFxwG7y8+gmm4gEAzIlJDiEE40RW5Mf/341Pw+ /2pKMn3VDNXgLnkOJm2JP8GwTfD1bo1ZmCAcXaGaDzZPk7BNuJZ5bkKD X-Gm-Gg: AY/fxX7VZKAhu8LYUX3uydq0u18IOsYDhcNVD8OSC6GNv0kfgApzwapt2MnsYvEhNNL dossOJD1OAsJXckSdKwGr2t2MsZSOHnhcN8ZOuc20Oe/n2NJAIIWXVYVwpiVGP+Mzy7tHaVAN9z FWVXu93ssiRwFYxXoq2wGlyGNDpnhDa7q8O3FbMNSFFKDrcxiS8Xi58hSs1jRAUN85/sb9f8cNu PGMyhU/GrfB828fXq5+yTaQaKH8W/Jc2fOpAWsnKmiYFo2loYKdviiKqyrAjjwKt/I13AgZfwGG UDXjXcG5culpjpkyFt+Fh1PHYzskxOro2hY1QUFMiGubToEd9nT9rl4BA/flFgkwWeKfFPnUrX5 d9ErkDjLxQe5SQpbQgy3F50kPSzZtKNMbN5eUUYH4wLC/LnOY7O6+iY7XI5gA8kY0RJ0L3FmePP QaMQ== X-Received: by 2002:a05:6830:358e:b0:7cf:da97:57d5 with SMTP id 46e09a7af769-7cfda9757ecmr957520a34.34.1768487900523; Thu, 15 Jan 2026 06:38:20 -0800 (PST) Received: from localhost ([2a03:2880:10ff:55::]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-7cfd68b13fesm1559488a34.3.2026.01.15.06.38.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Jan 2026 06:38:20 -0800 (PST) From: Breno Leitao Date: Thu, 15 Jan 2026 06:37:54 -0800 Subject: [PATCH net-next 7/9] net: cxgb4: 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: <20260115-grxring_big_v2-v1-7-b3e1b58bced5@debian.org> References: <20260115-grxring_big_v2-v1-0-b3e1b58bced5@debian.org> In-Reply-To: <20260115-grxring_big_v2-v1-0-b3e1b58bced5@debian.org> To: Ajit Khaparde , Sriharsha Basavapatna , Somnath Kotur , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Felix Fietkau , Sean Wang , Lorenzo Bianconi , Matthias Brugger , AngeloGioacchino Del Regno , Shay Agroskin , Arthur Kiyanovski , David Arinzon , Saeed Bishara , Bryan Whitehead , UNGLinuxDriver@microchip.com, Shyam Sundar S K , Raju Rangoju , Potnuri Bharat Teja , Nicolas Ferre , Claudiu Beznea , Jiawen Wu , Mengyuan Lou Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, Breno Leitao X-Mailer: b4 0.15-dev-47773 X-Developer-Signature: v=1; a=openpgp-sha256; l=1593; i=leitao@debian.org; h=from:subject:message-id; bh=mTt9g4AIDDCE/wyHFNRn7ITIDqk1FNXdFvVq0NDOWRs=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBpaPvSKI56w6S51MA1g4GESPyU+3R/PgLYWFpyg RPCz4ftjtyJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaWj70gAKCRA1o5Of/Hh3 bT6nEACvWlpHECCXJWCsSIz2b2fYD3jmE+YC812EOVG5+Zgom6pRSjYRnpNtdw6aB4pt4AqHazt HZFziZXiPwrVJ2KHKtvLJZoxKPasMBVoOXL66e2D5tK5/mI0KYr9tm7YPRiMH5dGlcGJKU6XNsA G6N+dTc7KGSezfQbek6Bd8dWIpoxHoewdIhlkQFtiQ/X0GnV8CP+YBxfN8e7VxS6ORKI9Eu2w1E KRO2JjSj1cz2bfntjyD/I3tzznYWFgp1+ghvduFHDLRfEOFyjxdMyJ9/2hwXO/SiLOUDqhFIK2I xHata1GinUobVH5wC/JDB4I24G7sUoqrW1vUQVFScu8p+i90ajthRDbJFsAIEJ3AdeAWWu3VKMI 57ArKtwl6Qv6V7N6KfHRPi8sFD6PdAv2wVDq4w/LJbAzSfug48nxIM664m9EihWEaVEvEZLpiDZ A/ODC9UEICyZdjzs/yEz6P3R3/Oyjrh5u0HffU7u8PEUU48MpBTkw/WaTy+sTzjhAAm3+DYsLGT YxghWqGbpydPH6FaGSUgKB8ISAEFYnUsA3Zy0MBeZ4UbwKOTxFAIC3JhDyrH2GLh70WwgTyGEjC ZMISm3UWHjF23jaIfJBhLLEk7ANEUDZd0JZ3YumtwhGKWR0ZvjOj/uQRxh1k5rkMRlHSNhqRCZv YJxvQ2AHmSnZF5g== 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/chelsio/cxgb4/cxgb4_ethtool.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c b/drivers/n= et/ethernet/chelsio/cxgb4/cxgb4_ethtool.c index 23326235d4ab..faf8f7e86520 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c @@ -1784,6 +1784,13 @@ static int cxgb4_get_rxfh_fields(struct net_device *= dev, return 0; } =20 +static u32 get_rx_ring_count(struct net_device *dev) +{ + const struct port_info *pi =3D netdev_priv(dev); + + return pi->nqsets; +} + static int get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *info, u32 *rules) { @@ -1793,9 +1800,6 @@ static int get_rxnfc(struct net_device *dev, struct e= thtool_rxnfc *info, int ret =3D 0; =20 switch (info->cmd) { - case ETHTOOL_GRXRINGS: - info->data =3D pi->nqsets; - return 0; case ETHTOOL_GRXCLSRLCNT: info->rule_cnt =3D adap->ethtool_filters->port[pi->port_id].in_use; @@ -2200,6 +2204,7 @@ static const struct ethtool_ops cxgb_ethtool_ops =3D { .get_regs =3D get_regs, .get_rxnfc =3D get_rxnfc, .set_rxnfc =3D set_rxnfc, + .get_rx_ring_count =3D get_rx_ring_count, .get_rxfh_indir_size =3D get_rss_table_size, .get_rxfh =3D get_rss_table, .set_rxfh =3D set_rss_table, --=20 2.47.3