ethtool: remove ETHTOOL_GRXRINGS fallback through get_rxnfc
Subsystems (3)
PATCH 1/1 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.
--- net/ethtool/common.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-)
net/ethtool/common.c +2 -12
@@ -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)
---
base-commit: bf2e36c9dab95e41516fbcf7b1cc804539b2d021
change-id: 20260126-grxring_final-e203b87c5d03
Best regards,
Signature · 1 line
Breno Leitao <[email protected]>
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Quoted 8 lines · On Mon, 26 Jan 2026 02:00:15 -0800 you wrote:
All drivers that need to report the RX ring count now implement the
get_rx_ring_countcallback directly. Remove the legacy fallback path that obtained this information by callingget_rxnfcwithETHTOOL_GRXRINGS.This simplifies the code and makes
get_rx_ring_countthe only way to retrieve the RX ring count.[...]
Here is the summary with links:
- [net-next] ethtool: remove ETHTOOL_GRXRINGS fallback through get_rxnfc
https://git.kernel.org/netdev/net-next/c/1f6b527baf6f
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html