]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
net: xgbe: convert to use .get_rx_ring_count
authorBreno Leitao <leitao@debian.org>
Thu, 15 Jan 2026 14:37:53 +0000 (06:37 -0800)
committerJakub Kicinski <kuba@kernel.org>
Sun, 18 Jan 2026 02:10:16 +0000 (18:10 -0800)
Use the newly introduced .get_rx_ring_count ethtool ops callback instead
of handling ETHTOOL_GRXRINGS directly in .get_rxnfc().

Since ETHTOOL_GRXRINGS was the only command handled by xgbe_get_rxnfc(),
remove the function entirely.

Signed-off-by: Breno Leitao <leitao@debian.org>
Link: https://patch.msgid.link/20260115-grxring_big_v2-v1-6-b3e1b58bced5@debian.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c

index 46b69166e74af8b3080ccec4a662578925484e70..a9f4fcc4daae3cc42470fe29500975889fa68c3d 100644 (file)
@@ -417,20 +417,11 @@ static int xgbe_set_coalesce(struct net_device *netdev,
        return 0;
 }
 
-static int xgbe_get_rxnfc(struct net_device *netdev,
-                         struct ethtool_rxnfc *rxnfc, u32 *rule_locs)
+static u32 xgbe_get_rx_ring_count(struct net_device *netdev)
 {
        struct xgbe_prv_data *pdata = netdev_priv(netdev);
 
-       switch (rxnfc->cmd) {
-       case ETHTOOL_GRXRINGS:
-               rxnfc->data = pdata->rx_ring_count;
-               break;
-       default:
-               return -EOPNOTSUPP;
-       }
-
-       return 0;
+       return pdata->rx_ring_count;
 }
 
 static u32 xgbe_get_rxfh_key_size(struct net_device *netdev)
@@ -757,7 +748,7 @@ static const struct ethtool_ops xgbe_ethtool_ops = {
        .get_strings = xgbe_get_strings,
        .get_ethtool_stats = xgbe_get_ethtool_stats,
        .get_sset_count = xgbe_get_sset_count,
-       .get_rxnfc = xgbe_get_rxnfc,
+       .get_rx_ring_count = xgbe_get_rx_ring_count,
        .get_rxfh_key_size = xgbe_get_rxfh_key_size,
        .get_rxfh_indir_size = xgbe_get_rxfh_indir_size,
        .get_rxfh = xgbe_get_rxfh,