ethtool: remove ETHTOOL_GRXRINGS fallback through get_rxnfc

All drivers that need to report the RX ring count now implement the
get_rx_ring_count callback directly. Remove the legacy fallback path
that obtained this information by calling get_rxnfc with ETHTOOL_GRXRINGS.

This simplifies the code and makes get_rx_ring_count the only way
to retrieve the RX ring count.

Note: ethtool_get_rx_ring_count() returns int to allow returning
-EOPNOTSUPP, while the callback returns u32. The implicit conversion
is safe since RX ring counts will not exceed INT_MAX while we are still
alive.

Signed-off-by: Breno Leitao <leitao@debian.org>
Link: https://patch.msgid.link/20260126-grxring_final-v1-1-0981cb24512e@debian.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/net/ethtool/common.c b/net/ethtool/common.c
index 4036561b078b555ee790d7463885f54cfd741ddc..c5ed88bccbb41148b1617beceedb94e524e443e9 100644 (file)
--- a/net/ethtool/common.c
+++ b/net/ethtool/common.c
@@ -637,21 +637,11 @@ int __ethtool_get_link(struct net_device *dev)
 int ethtool_get_rx_ring_count(struct net_device *dev)
 {
        const struct ethtool_ops *ops = dev->ethtool_ops;
-       struct ethtool_rxnfc rx_rings = {};
-       int ret;
-
-       if (ops->get_rx_ring_count)
-               return ops->get_rx_ring_count(dev);
 
-       if (!ops->get_rxnfc)
+       if (!ops->get_rx_ring_count)
                return -EOPNOTSUPP;
 
-       rx_rings.cmd = ETHTOOL_GRXRINGS;
-       ret = ops->get_rxnfc(dev, &rx_rings, NULL);
-       if (ret < 0)
-               return ret;
-
-       return rx_rings.data;
+       return ops->get_rx_ring_count(dev);
 }
 
 static int ethtool_get_rxnfc_rule_count(struct net_device *dev)