From nobody Tue Feb 10 06:26:51 2026 Received: from mail-ot1-f52.google.com (mail-ot1-f52.google.com [209.85.210.52]) (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 A5AEB368261 for ; Fri, 9 Jan 2026 17:42:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767980540; cv=none; b=b814fmp7B8te/cPPe7F6KqdNw+K5dGAalcnF/nOTkHQDA3Zo+uUCkiu/RhDLzMZ+srCENzpHGIndTSXnMhcqXS7DtinvrXmBvxdSDreX1gifj/BP51nfIHB6LUt7H7+oYiJkM9BRRgybTO6BfQuRnxeDaqx7HOSZNiim0dY0Oto= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767980540; c=relaxed/simple; bh=jMza/r3EvKf50z8/tcO6sHnGSe78CwAvNmAS4XWR4Lo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=pzXg5MacBUskgUo9tOwj6hAzw3YTM/JJ5WMyYwyT7tqx1h0jZVzw0P7VbgH4EUDOy5lIxj4FcsfZ+SCRnNNaeX5qkNvQJ4EQgzstIoak/PJHHCNu2cooOMZHi7WhxB4CjLqU78nBAsSocjxATf97dQPT0OfSvtx7e5+lkpDwEUY= 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.52 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-f52.google.com with SMTP id 46e09a7af769-7ce0ef9d4eeso1936532a34.1 for ; Fri, 09 Jan 2026 09:42:14 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767980534; x=1768585334; 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=uu2wFVKAgPkThyAIJMzLLfAz/XvxjD6o0/STOeVSXIg=; b=Ti7OfAHaUHJiooGCEb4+W4z/sRZoO6yxzfl4VW2jRvbj2PG7egB8Lb3TpIVBgv9u+a PBqtpHPCNMiu++ptQNHEtFTq4p/4FadHIncGECK84J10XItsC0OMRLjFgmNYBfpgcnW+ 92VCAZtiDNAz9M0pTI5GuoqNSun0ALidnYQll50wo5Q/kAX9zyMFeMfjuJmmAUg1Jjah xjn9r341Ty71ww+bxV13u1Nlf5H1CSxBBq7CmKeoTf5U7QpCfx7mfwp9YGt6ujA2jZ5w UN99H1x1ftXMAK3HxlG5lRsWc/P+e93IeNv1NT2Cih+wMEx+PijITtT/10o6UhiSNtnq HlQA== X-Forwarded-Encrypted: i=1; AJvYcCWPZDoHMPq2B3lulZaa7+q62E9hIy4vqs7iQZhjC4jY/LX1BzFY1IauRGcoZpguyv3Mlico9IveJXQ0d7U=@vger.kernel.org X-Gm-Message-State: AOJu0YzZ42fQIGTHCHObM9eCJkd6lEP/mbtcUWiIhb58vqAJET9hT03Z aBFFa5OIZZ8iYNjIboyY8xeuR8pVhC1RLTHhvkOlQaX7P+8/Auhov58T X-Gm-Gg: AY/fxX5A+sVi6tcyS8nFqe/JSgJ4RQj2mkyrtwerJ7HUYVVvylGwEPiAq7KGGo2BBsW 3LncHNgzpSwwmBJy5ZmnlLzM4Mv/zRvxBlBUsxO6W4E3nwN84SpD/Q2oXiygy7mh3z7/bI9mMuB wnoqprhh6PbgY7WRzEtj9xfcG/VP7wLg2j6+g/jKZXsYgz+D+UVDMhPgVu7SRqqKvuN52Lpw0Vp DUJTvjF5zR8URZg8V3vQVlxwec/s2ThaUk+aWncfEefXviMbFZ8drycbbV5bTrUNM9rRcV7vThn 8sOtnwH8BaYQvxVEvM9GMjHgqh8p3zZ3wLlilMOyhH6AGnyibeLiwKRXiSyIqHFzhur5/bsZLEr 6B5fsKOS/6t0z0zKXVbL9q+k/fEw7u4XRYZlbOcdSNOgrxxrH6rkFakPDRICe8uwlKMNXmZb0Ub eIng== X-Google-Smtp-Source: AGHT+IF6nk4ZAg3DcXwJ37L/Rb8Xo4H5ujozgvKbA892I3x9uVUx6WOdqOrphoRwZJNcoyR3f6a93Q== X-Received: by 2002:a9d:4791:0:b0:7c7:68d8:f711 with SMTP id 46e09a7af769-7ce50bcba3dmr6628704a34.18.1767980533617; Fri, 09 Jan 2026 09:42:13 -0800 (PST) Received: from localhost ([2a03:2880:10ff:72::]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-7ce47835588sm7636882a34.13.2026.01.09.09.42.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jan 2026 09:42:13 -0800 (PST) From: Breno Leitao Date: Fri, 09 Jan 2026 09:40:54 -0800 Subject: [PATCH net-next 3/8] net: enic: 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: <20260109-grxring_big_v1-v1-3-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=1593; i=leitao@debian.org; h=from:subject:message-id; bh=jMza/r3EvKf50z8/tcO6sHnGSe78CwAvNmAS4XWR4Lo=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBpYT3wt1Cc6uJDREiG//Dw0GMEt7bsa08fIalnw 2/UlgN3DNqJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaWE98AAKCRA1o5Of/Hh3 bZuzEACMHzJVnozTbV2Q9CVaGLDAjFnABTcJ98IlgbXW4VCuRS56p9RvMGwKImq2MJxUwE/la9z kYCTFin/jn953/oQ3a+b9lQi86MzjvgPdMwjrppZ2IlODOyuCZXSve1rPDv0xV5OSKSwwYbQjGZ ko0BLimuPpTSbPeU+JX2wfA37VIF/fk1PrgN7Iap99iAuZAYNZivMYjPFGAGVw6X43Hc26NrJFH HL40fSjkYAUeu50OUML9TQZ2/budKrCMT7KCNrdxhWQ7OUdTqKtLzxiQUwgqO7Tc+P2syb6sVzY XL0l45KvLkiNcjBwCZaDozMBUIoLZbgzlTEvimCSkdfvyueO6NGdWooM4qNl4O2eVsNmX4PvdE4 eGuM2ku/sfK8p4dJMqo2zYyQZRlxX0Xxko7KukaDsZzzj9XubePSEl09pNmTpgVM6phw07uADW1 Ez99+wW8CvcbkY6ihNIV3sAo8Tlc8Yhj8JjHQWN2F8vWzCCWDkCjq2VNQ0G4zZzCo9DswUw/VEB JkOWl6Z1AmOSv+p+tooFJ0uoN3/pJdj2eFA+D8WMZU1y6FBd7jppH/85hWUcfeJwCwvCaF0Ymlo D1rV22+q7gUiC69/WASuTxHJAAeOqHMVxKyBCfrUhEGcHF9PHWlRJqNJ76oBB1xg7qD5e/aU87t Z4/dE80kNA197ow== 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/cisco/enic/enic_ethtool.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/cisco/enic/enic_ethtool.c b/drivers/net/e= thernet/cisco/enic/enic_ethtool.c index a50f5dad34d5..471613899ec0 100644 --- a/drivers/net/ethernet/cisco/enic/enic_ethtool.c +++ b/drivers/net/ethernet/cisco/enic/enic_ethtool.c @@ -573,6 +573,13 @@ static int enic_get_rx_flow_hash(struct net_device *de= v, return 0; } =20 +static u32 enic_get_rx_ring_count(struct net_device *dev) +{ + struct enic *enic =3D netdev_priv(dev); + + return enic->rq_count; +} + static int enic_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cm= d, u32 *rule_locs) { @@ -580,9 +587,6 @@ static int enic_get_rxnfc(struct net_device *dev, struc= t ethtool_rxnfc *cmd, int ret =3D 0; =20 switch (cmd->cmd) { - case ETHTOOL_GRXRINGS: - cmd->data =3D enic->rq_count; - break; case ETHTOOL_GRXCLSRLCNT: spin_lock_bh(&enic->rfs_h.lock); cmd->rule_cnt =3D enic->rfs_h.max - enic->rfs_h.free; @@ -689,6 +693,7 @@ static const struct ethtool_ops enic_ethtool_ops =3D { .get_coalesce =3D enic_get_coalesce, .set_coalesce =3D enic_set_coalesce, .get_rxnfc =3D enic_get_rxnfc, + .get_rx_ring_count =3D enic_get_rx_ring_count, .get_rxfh_key_size =3D enic_get_rxfh_key_size, .get_rxfh =3D enic_get_rxfh, .set_rxfh =3D enic_set_rxfh, --=20 2.47.3