From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-oo1-f44.google.com (mail-oo1-f44.google.com [209.85.161.44]) (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 A191B363C4B for ; Fri, 9 Jan 2026 17:42:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.161.44 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767980536; cv=none; b=VfeM3tU6iObnYA/14gnZN6HWYtjp9bWTTzdnOYYoJeVumR5xjt9bR0w0DK/LMQ5lT03/LqqqiJZc71ohhCNtRLBZvP2AOw2zOURfcHAfDIG3A89u2c5bxXyNOQultTQdEWMaWVkBb0LhRrheNZUGfP2cT2dJycw4tQh2BsvXd+Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767980536; c=relaxed/simple; bh=/W39sZu5PiC94Dg94iQF+SfXW/RFread4SOmLjCKJqc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=jh4VyHjUxyFYbfW3n9gY/vAj1V+y9iaj3p+sNw4dJA3izxXsi1TcYNDgd8gRY6q0bngM72FmFaCimhAIqiUIolDx1tmj39pTAl+Y1jiLfwaRLYiqfBbo+Uu8mE8DpSnAAZRTDnLbshrhPtJFkXAF/Cab0lc7fUydAhE0mhQTFZU= 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.161.44 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-oo1-f44.google.com with SMTP id 006d021491bc7-65f65b11f98so417086eaf.1 for ; Fri, 09 Jan 2026 09:42:13 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767980532; x=1768585332; 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=Fec7V7gjGWK3dIHKk+zJHhv5pDHSDQ9jRQW30nfAS24=; b=QebgsXamzT8tpAUQwOrdfqSml8BQfuNKjdQZ50ywPYgwnuyMhkOZtqapaolH9WN5jf 4/Z6JGTLP1xI4INlugsazpxhj6AKmEul9IyJ8I5eaIR9Zhj/lxiT/MD+m+xydtv96TI7 Beh5PzisuiAJcVPf4lMAer38vWzqbuAODnVJ5TLIh7Umnl4XZaZduPMmzN4+sfWA4KU1 CJL29y8m00Lfml93FBy3wN1/q3IIp6ToFTEBp2osb3AkwvMHFn4qwMcAL+fYrmdEN8xa YF9uQYx9QwdZa/rsbjZtWaP0iDfecTe3JPiNJ0re3a4GUJHCS1v4BmfZSA1GoQzDo8MP 4VgA== X-Forwarded-Encrypted: i=1; AJvYcCUXz7NRMq6BjrFAWtDVJfwks2o1KbUZXYsy5aV5tjRJ53mH9Y2oVbC+l/sCPFj7liQW85016GeyhkanEc4=@vger.kernel.org X-Gm-Message-State: AOJu0YyOl/2WVY+UiS9U2FmkSOEkUaAZd/V+g/fl3Z87UoJtMd8ebxXB mXSY4EkZf1KhsPhdpbaIvDXhwqjXLt+HFdG23uO+qGdrSut6YK8GBwnR X-Gm-Gg: AY/fxX5elj8pgz13Duztbk2AsVuoU3fFIHMPmllZhRoCDU8Z/ETCMrg9qh19iwoGK7+ B75KLfX19XqUbai2wtsgbBMghyac/plAhIzQ4xVA85xZBr0FZUJlUdpv7pu+wQypMwVXQHGOhIR /tFJHWZpZD1bzNFvVHM8MT4ZguwBVBI9xMLxZS22JsQggf//Ov3pneDjVYSDQ4j/l0wLM0teyVe 3aTGazLI3H2vDCp/zVBAjnPg77YohTtFTdBXeDBFseIKp0Y0Jzzs5s8P1f7qdu88SgdUtJZBjb5 LLEyOoj/Giy37mNHJrvnMu3jKG08W/PK9dZJ3RFTXJJe2i8YboXB7ukmWfdoTaci8OE+m6asYUJ th75jjFTLCJUVmXxNmCfKX9U/wcaJ0WJaSZykXSd6vyuKg6Lj6vjRb5cWEjYkjkyZTQTmjO/9cF DEcQ== X-Google-Smtp-Source: AGHT+IGHbQ8hY9Cq8uo1LPnUd4l/0H2L3ZuFt15Z28tehbZIR3IPzgLBrPxe6dvbNhgMNlEbj1w9jA== X-Received: by 2002:a05:6820:229e:b0:659:9a49:8e01 with SMTP id 006d021491bc7-65f55073d4emr5851768eaf.67.1767980532566; Fri, 09 Jan 2026 09:42:12 -0800 (PST) Received: from localhost ([2a03:2880:10ff:51::]) by smtp.gmail.com with ESMTPSA id 006d021491bc7-65f48bbb218sm4397689eaf.1.2026.01.09.09.42.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jan 2026 09:42:12 -0800 (PST) From: Breno Leitao Date: Fri, 09 Jan 2026 09:40:53 -0800 Subject: [PATCH net-next 2/8] net: hinic: 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: 7bit Message-Id: <20260109-grxring_big_v1-v1-2-a0f77f732006@debian.org> References: <20260109-grxring_big_v1-v1-0-a0f77f732006@debian.org> In-Reply-To: <20260109-grxring_big_v1-v1-0-a0f77f732006@debian.org> To: Sunil Goutham , Geetha sowjanya , Subbaraya Sundeep , hariprasad , Bharat Bhushan , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Cai Huoqing , Christian Benvenuti , Satish Kharat , Dimitris Michailidis , Manish Chopra , Jian Shen , Salil Mehta , Jijie Shao Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Breno Leitao X-Mailer: b4 0.15-dev-47773 X-Developer-Signature: v=1; a=openpgp-sha256; l=2043; i=leitao@debian.org; h=from:subject:message-id; bh=/W39sZu5PiC94Dg94iQF+SfXW/RFread4SOmLjCKJqc=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBpYT3wFFWdJqRk9EYrWhwgzwAc665QmRIbC5YEA r51cf1WZBuJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaWE98AAKCRA1o5Of/Hh3 bRmHD/sFc2pQWGYlagF6WZjau/Bzyp8poV9OtJniZw8bl0zDIdX2Aqarp11DZNy9AEGUA8FkxWO MT942ZN/1Hib3tip8Cl0kB2rC0LqhucuQnlx9SXmLTjU8OwNAr/EVwATVwfPl/ZtmUW9vGAtIvR GvnnHlIreV2lm6iyquu8S+nTf/qVHCFMHI0EGCanyGqbvayn3PpUXU5NHvRnlt6HoLDfoqrnFlO e72hfTztXH4Mh1C4bhU+6CVzabVuDhV3QD9+wxzlzSJD/5hscfnKkXeScASsjphBRpaYpkcZn2w lFAE9d7tpTOnEcMMrh/6QHJCqcYOTF4qgUX+1TjLwMdUM74aNCYTuNKhgyb49zrvWOjtVRvH9yo mS+DKaTNeEMwhh6zM6PfOysZQKkO5iN9kyHSeVFjjq5m34pT2+G2kRVHoovFsdnzG/04FxmIVNy qTPrBaQJqHxfq2WDOmHSp9oR3rt0pnexwusxjCYPYNiCW3FzdVLQeEZXMQKn3vnnDGpGBg1XAok BLW5/dkMY1uDsdM85ruzbr+EzA2e/KsLl0jJWODD4sm+9YWDBNvQPXTYw/XbffMJrKjzzfNnDKB dzegCeh+0xHKoGbqueqV8TZpr5HcII44bRRzfzGWZIdljIFpgONKrNFCW7qXH64hztVJrmDV60U GGwYcf7VGhG+lgw== 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/huawei/hinic/hinic_ethtool.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/drivers/net/ethernet/huawei/hinic/hinic_ethtool.c b/drivers/net/ethernet/huawei/hinic/hinic_ethtool.c index e9f338e9dbe7..f28528df5aac 100644 --- a/drivers/net/ethernet/huawei/hinic/hinic_ethtool.c +++ b/drivers/net/ethernet/huawei/hinic/hinic_ethtool.c @@ -1101,22 +1101,11 @@ static int __set_rss_rxfh(struct net_device *netdev, return 0; } -static int hinic_get_rxnfc(struct net_device *netdev, - struct ethtool_rxnfc *cmd, u32 *rule_locs) +static u32 hinic_get_rx_ring_count(struct net_device *netdev) { struct hinic_dev *nic_dev = netdev_priv(netdev); - int err = 0; - switch (cmd->cmd) { - case ETHTOOL_GRXRINGS: - cmd->data = nic_dev->num_qps; - break; - default: - err = -EOPNOTSUPP; - break; - } - - return err; + return nic_dev->num_qps; } static int hinic_get_rxfh(struct net_device *netdev, @@ -1779,7 +1768,7 @@ static const struct ethtool_ops hinic_ethtool_ops = { .set_pauseparam = hinic_set_pauseparam, .get_channels = hinic_get_channels, .set_channels = hinic_set_channels, - .get_rxnfc = hinic_get_rxnfc, + .get_rx_ring_count = hinic_get_rx_ring_count, .get_rxfh_key_size = hinic_get_rxfh_key_size, .get_rxfh_indir_size = hinic_get_rxfh_indir_size, .get_rxfh = hinic_get_rxfh, @@ -1812,7 +1801,7 @@ static const struct ethtool_ops hinicvf_ethtool_ops = { .set_per_queue_coalesce = hinic_set_per_queue_coalesce, .get_channels = hinic_get_channels, .set_channels = hinic_set_channels, - .get_rxnfc = hinic_get_rxnfc, + .get_rx_ring_count = hinic_get_rx_ring_count, .get_rxfh_key_size = hinic_get_rxfh_key_size, .get_rxfh_indir_size = hinic_get_rxfh_indir_size, .get_rxfh = hinic_get_rxfh, -- 2.47.3