From nobody Mon Feb 9 22:19:59 2026 Received: from mail-oa1-f41.google.com (mail-oa1-f41.google.com [209.85.160.41]) (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 DBD743A4F4A for ; Thu, 15 Jan 2026 14:38:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768487908; cv=none; b=WLT3IyF6bjFCC7SIrVEOp0HXa7a+JGRhwPxMul6iSLFvXSQAH5xjTUdY+c0Y+X7EuaUUf0YLO+NrtAvgsReCDG3ElSx7QSHfDN+JVlcqvNAt1qx2sRuxoe4tGiR2cj1TvuveUmroGh4+0afQbESMWUCi0mWI5gmldk9curIeKJg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768487908; c=relaxed/simple; bh=EDM5owIVyL2DjajXDu3o5iZ+GCzD1U2tQZv0qOHfOAk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=W8/gWx3RlymMdP6FGsnw6qH8rGMwIqT/UsEiMDLy/SZcZwDy+TjoPBJhnOFrUQAmB2bXYhdQ8XJtEjOM/VTG6ZmWd3QLQhvsrl2o+/eiyi3qwQ7TlZXL8MU1xS8NR83tJUd/0uHmYpljtPr3VASTH5Xa8wCUoFY6pCiyNDg5P1E= 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.41 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-f41.google.com with SMTP id 586e51a60fabf-4043bcd09f2so352455fac.3 for ; Thu, 15 Jan 2026 06:38:23 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768487901; x=1769092701; 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=I3QziLtppri025RUH9iC7KG4n81ulsbjnXMb8+qxeEw=; b=kDu3HUih59ctbAMB1VWE17as7Pn1jehDf05XYaOJc7QRA2+C1LY28y0W38JSwTBjvP fwXf5JeokbfYcTDUw91rkD9/rMwQvx+crhS7E4kOFtr5klzdIK9+3yzKCrc1IK7YHLcd 5KleGKPbbiIJVyzLyGhzpbCqAjweM8uhSsqz7sMWPatklMVLlqf+2veZMkuJmXk+f5Bo vIhsO6Yx5TntDNEYar51N4PduPSZvTZZjtxF4uwpKwWxuKyQ6Q2cfTZISl/OaZGBXeSy KrwCl7SZcyQ0SqNbK2orqLrp9E+7C+djYYA3iJre9ArGuAWSJtsnI6CKh7MjgC2o4mEh TOug== X-Forwarded-Encrypted: i=1; AJvYcCXQ667TT5BkLS/is7ZJpg0TsEeK5rtoyg8BW1N4r4hPMT0qo+e/+eHbXTAv8348LRrrOCckUVNYoOs3rSE=@vger.kernel.org X-Gm-Message-State: AOJu0Yw7upHtgxpSI0s9Euo0eWRkQjxncCaNJXxYFfQt1xaseRbL40o2 Rot00FZRBQbEeEJfjNMkWbWxvL0VbUeFCUx7sa+1sJ5tA1v6ODis2Axx X-Gm-Gg: AY/fxX5H+kwcEDsAcEKQ5iWqQnw8CYhd7XgDu4IFgKoOhNJ9bHiMnQKKnaW3qwdjs9X Au2kvuOEK92LluWGq98tS092Gg+dvsNgzGmkCS0d9xeC0PKBes37RE/Pk+NRILV5HhXEQVuhpfR 43YgXb+J2Bw4jaThEk4CH9ut993gT27TwxsjYDo8xB9e9a8vItJAV96RN7WIz/6bIkxtu3iKMCL 4LS7hJWRYhnBeSgfORXB63IHNt9f5jQoICx2SaRLfPMbyHb1yK/9bxwf1WNJF9FEt9TD7sWhcby P+IScT8xk6VRO96O05WxB6mKMBk8TK8KnrTMmAcpuelYlI+WkBYjYNTdxo+4+y4rzXXhcPdXrdy UFumzLOigNFsVappKlEeOVj2yTyfaGErGSVlK5+qL6E5TgNTBBZ0Nzv4k9TT6fTk00UYimXYONV SvFg== X-Received: by 2002:a05:6820:7508:b0:65d:1697:e6ce with SMTP id 006d021491bc7-6610068d279mr3919809eaf.23.1768487901584; Thu, 15 Jan 2026 06:38:21 -0800 (PST) Received: from localhost ([2a03:2880:10ff:74::]) by smtp.gmail.com with ESMTPSA id 586e51a60fabf-404427177f0sm400425fac.9.2026.01.15.06.38.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Jan 2026 06:38:21 -0800 (PST) From: Breno Leitao Date: Thu, 15 Jan 2026 06:37:55 -0800 Subject: [PATCH net-next 8/9] net: macb: 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-8-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=1512; i=leitao@debian.org; h=from:subject:message-id; bh=EDM5owIVyL2DjajXDu3o5iZ+GCzD1U2tQZv0qOHfOAk=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBpaPvSl1e/Mq8M8IDjFCUaBOsQM77krGX3tiyP7 UJQ2NGca2SJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaWj70gAKCRA1o5Of/Hh3 bTjfD/wMzBjLyL7mbyJwNKwc6wxg6I5YpP5F0V0MfH3hnmp955ZI8DFLIKq/u+nPJlokYB22aYt 1Bplo+zYTfN+TGaRW6KNauxtNSk3BMTcqkeiTWWZ4SI13BT2RJWkI1x0pNcKsCDTy/jzwKVXUmH pZFIl2VCZP/VGdI90bGpuzJ2NCJX5OznIHaPnZUrsn3NWmViPkOxaKvchYbloRkbSONSAQPT5eH 4XaveFvRvIWR8a6jhKCJwHvJ4z+ovYTCY4nQSEXt9Yb7plU9XNWh3jufYzDXv/gtbHdGhZZDxHJ 2rgPBil9vZwKsxd99nkO3TwH/fQ+btPcSNDi7+bNovV9eGPzEa0GKHYNPIbvxbSppQ57nrQXOCX U8HHIZuBgGueWGZjo67G3GUZ+otCCqpD9X5Zkbiy4dLYoZOjAJdZPoFFvds34Pfoq7hd96IZe7D 5Tn9iZXKP6RzqTskPCc1IwSgqO6hWUnkmrPArVr6yS7mgPf4Ed3TQWv9TjlqWcXN0/Rmvaz16Po uYu+x+fenatWmWeGgp5Vq71IelJuxVfwLYkrWbgF1ltF8+/lc51g/6Kv0WeVl6OXVRixs3En+RP fKnKPBRdciCbDxzoocETR6oC14LkfWfBT2KUEBpglwPpNa45J9T43hsUu2t55DfC44qRxs9/1yJ pIRQaqI/0N1tTeg== 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 Acked-by: Nicolas Ferre --- drivers/net/ethernet/cadence/macb_main.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/etherne= t/cadence/macb_main.c index 2d5f3eb09530..8135c5c2a51a 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -3850,6 +3850,13 @@ static int gem_get_all_flow_entries(struct net_devic= e *netdev, return 0; } =20 +static u32 gem_get_rx_ring_count(struct net_device *netdev) +{ + struct macb *bp =3D netdev_priv(netdev); + + return bp->num_queues; +} + static int gem_get_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *= cmd, u32 *rule_locs) { @@ -3857,9 +3864,6 @@ static int gem_get_rxnfc(struct net_device *netdev, s= truct ethtool_rxnfc *cmd, int ret =3D 0; =20 switch (cmd->cmd) { - case ETHTOOL_GRXRINGS: - cmd->data =3D bp->num_queues; - break; case ETHTOOL_GRXCLSRLCNT: cmd->rule_cnt =3D bp->rx_fs_list.count; break; @@ -3941,6 +3945,7 @@ static const struct ethtool_ops gem_ethtool_ops =3D { .set_ringparam =3D macb_set_ringparam, .get_rxnfc =3D gem_get_rxnfc, .set_rxnfc =3D gem_set_rxnfc, + .get_rx_ring_count =3D gem_get_rx_ring_count, }; =20 static int macb_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) --=20 2.47.3