From nobody Mon Feb 9 22:04:16 2026 Received: from mail-oa1-f42.google.com (mail-oa1-f42.google.com [209.85.160.42]) (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 DDDD737F0E5 for ; Thu, 15 Jan 2026 14:38:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768487910; cv=none; b=ajH7qqQrQJQrVCzi2e5EygJirFkC0CrD67g7sCtG+PPzubxCLZStE2jQr+Ccf/U+qCl0XvCK0lVZMd3NhoWMeO+cwdTxdSZ+oaXyu6YKE8cO1kHuBnlTjIaBtzSQKRDt8viVLQzUGc9HJgV2KpjK0QN0CK8PKMl0PBudfUK9x7g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768487910; c=relaxed/simple; bh=iHjMCRl1osOPGeWzfnK2KNM/9EoiAxwpcSWI+XP02wM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Xg87OWHrtyk6kUSM5XhGzGWMcurbDKQHb6A/1N0uJeN0lDn6e3ZLxklC+y9u4q/2Bj2RYBpTsZtEDrNdyUTl91CmFI/tzrJT2p3Fvh/qq57LMP96N9ezBnsBcpnX1WCvax3+uhh6id1K9FRjm1vAbnBvre8/sH0lawk1RIM7PNg= 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.42 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-f42.google.com with SMTP id 586e51a60fabf-3f5aaa0c8d7so777178fac.3 for ; Thu, 15 Jan 2026 06:38:25 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768487903; x=1769092703; 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=a/GYuhAPyxh2VtKR9ECrwYwGFXjwcnfw71zewQTg4IU=; b=fmYkrx9ugfKX5XBcbkapO5PDIhOIQJcaSo5qaQDVa8JPtaON8/JRI2rIuOtHs3J+SL mJ/43yo6fJyaMfez6bdgrCdxFMZOdT2k2nB2Q6jB4lcZhF6gYOuKWFmJYDH16aW/MsMx qAH71n6DB2qAwA7rjlouMfXsgoe8vmxnJBm5MztPH22RIijxmJHSDC3t7o2kqbOvpp2V sjZKqJiPZLtVA33v2NMISAk+XSgTXmYX6e+4gJLAgb8hThXzzSvHbuO2jxp7L28V1e5B QbTCe+uEdCvgrohKw1U6j+M0Cty8Xm3MNDZ9ZboTWepOR9qb6YweWgmCPtp8DMywc8fE 2WYw== X-Forwarded-Encrypted: i=1; AJvYcCVu+AaojAHjc9T0GdYKg27r39umeNsjTJv9eqQvo0jBoPQuoN73rsMHe3fdq8xuw3ttEc30qElRcaO7mbA=@vger.kernel.org X-Gm-Message-State: AOJu0Yyq5K3tvpccAfThm5BY5JElfe7BmNKx2H3PvA9V95Sdt5ahU3KR vqcVeQJI0K+CWSdYMoaq7FU4+1RV1Cf1K17pV7KURYgAIZIuAiWQLsxS X-Gm-Gg: AY/fxX4i3SDNy+6G7ThxlTT+G2eFD5Qnm7+7cEXipr0g2UVZzlgZvhWLatIsN2Vxgpd nHsiQ3kqBZzEeheQNg03gH8E938aRKiRgFZAY6++a5OgyURH4g/KP8mF+Jx7D4TCLLvKGtHNQM0 CNW/YsUq7SFuKAn1Zr7im7n/VImhMLdF9bSiSd1JpTqI09gMnO8UlbjpA/KnXdy3eKPPmT/p9Vv gCvUF29/cP6GxNkSspb0L3Jnjbk8rG/gey6lItPMzCtt5sWPQ+gzwxJbjp/uS80XjxtIRXW4o8t FJHqVJ9DBu51Ajr9SEnKVbrz6w7EvxR4j0WzAQLC0XKstA0I0hPKmPkStMvqMzcHlLv4Mpvcyb0 3MvNY3AK/K6Bkav/N29K4OyCBbWryb9RAengc/BvjlCfrteH0MtWzgFjzVY8gv2ZOIDOd8q46SI 8K3KDXT+H94ck= X-Received: by 2002:a05:6870:864b:b0:3f6:2118:2d37 with SMTP id 586e51a60fabf-40407155e60mr4009310fac.42.1768487902673; Thu, 15 Jan 2026 06:38:22 -0800 (PST) Received: from localhost ([2a03:2880:10ff:3::]) by smtp.gmail.com with ESMTPSA id 586e51a60fabf-4041a20051csm3187622fac.17.2026.01.15.06.38.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Jan 2026 06:38:22 -0800 (PST) From: Breno Leitao Date: Thu, 15 Jan 2026 06:37:56 -0800 Subject: [PATCH net-next 9/9] net: txgbe: 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-9-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=1635; i=leitao@debian.org; h=from:subject:message-id; bh=iHjMCRl1osOPGeWzfnK2KNM/9EoiAxwpcSWI+XP02wM=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBpaPvS2jwDA4B5OVdm2pYfwE5wwEoA1TjfN+vFk Oq4iqdDPU6JAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaWj70gAKCRA1o5Of/Hh3 baEtD/0e4jxGdtSnXlNdd3Ym+AmQnqmw+uQARxVH3fvJRkHoecl3Hzt6HnkNMpJ2bHcL+Ykuo+2 bqDVJi17xCAxz/JJ+E5uhNl7rq1nzJiOdALOcbtS+q0vaAqaZANFIQTUTAtwvr8Vcykq8fnNkr0 2xiADYMIU5s+WuQsMpxl097cT8oXChiukHlT6HsJ222668dm5nRiPA0evqv/2pWsVDaAywkAi6x aeiwdgG4iQxbfanDh2VKer1hvyDYRelxSgXXwz9N4xwcSk8Wfz5aDDHNrzSYqDMGdS+E+kjPat0 t4kMwgKvDihLCIWfhFIASs4E9SQRkuqb8Jl9NPamj3g0kSm4VqPztopV3u/iPeb9hidjshOk1GS qxDrEiy97dK97aot5HKc9ujq+XVUI/Q51g0H3img2C95IaK5r7LWia1OALMEcV2cBy/rbsNPfas K0QBWLVLDq2PqiUc25Jxy+TG+ctt4emx4tKPDjc0Pe1pk1H3Tgi06WXLVavvwsW9ksgo8O7Sf6a Db19Wi8PouSxa3fu+u38JygBavrl/AFKs1l0aVN5h73ufNH1bOfS1xHmgvxnchF0HmnRm3G+CHb KvdDaYueCtvOsJYb1eivSnDKOoF+M7LQRcakwSN6tgiUiFJI8r9TH1aKmpkYtvWyA4rRbcHIk/q pdghbi7qVDQhMoQ== 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/wangxun/txgbe/txgbe_ethtool.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/wangxun/txgbe/txgbe_ethtool.c b/drivers/n= et/ethernet/wangxun/txgbe/txgbe_ethtool.c index f3cb00109529..59d758acccf0 100644 --- a/drivers/net/ethernet/wangxun/txgbe/txgbe_ethtool.c +++ b/drivers/net/ethernet/wangxun/txgbe/txgbe_ethtool.c @@ -193,6 +193,13 @@ static int txgbe_get_ethtool_fdir_all(struct txgbe *tx= gbe, return 0; } =20 +static u32 txgbe_get_rx_ring_count(struct net_device *dev) +{ + struct wx *wx =3D netdev_priv(dev); + + return wx->num_rx_queues; +} + static int txgbe_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *c= md, u32 *rule_locs) { @@ -201,10 +208,6 @@ static int txgbe_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 wx->num_rx_queues; - ret =3D 0; - break; case ETHTOOL_GRXCLSRLCNT: cmd->rule_cnt =3D txgbe->fdir_filter_count; ret =3D 0; @@ -587,6 +590,7 @@ static const struct ethtool_ops txgbe_ethtool_ops =3D { .set_channels =3D txgbe_set_channels, .get_rxnfc =3D txgbe_get_rxnfc, .set_rxnfc =3D txgbe_set_rxnfc, + .get_rx_ring_count =3D txgbe_get_rx_ring_count, .get_rxfh_fields =3D wx_get_rxfh_fields, .set_rxfh_fields =3D wx_set_rxfh_fields, .get_rxfh_indir_size =3D wx_rss_indir_size, --=20 2.47.3