]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
net: funeth: convert to use .get_rx_ring_count
authorBreno Leitao <leitao@debian.org>
Fri, 9 Jan 2026 17:40:55 +0000 (09:40 -0800)
committerJakub Kicinski <kuba@kernel.org>
Sat, 10 Jan 2026 20:21:06 +0000 (12:21 -0800)
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 <leitao@debian.org>
Link: https://patch.msgid.link/20260109-grxring_big_v1-v1-4-a0f77f732006@debian.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/fungible/funeth/funeth_ethtool.c

index 1966dba512f8a475c70bf252b433a9a0c25a36b2..106adf7a870ff9fade39eb315315d2950d74c2d3 100644 (file)
@@ -946,17 +946,9 @@ static void fun_get_fec_stats(struct net_device *netdev,
 #undef TX_STAT
 #undef FEC_STAT
 
-static int fun_get_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *cmd,
-                        u32 *rule_locs)
+static u32 fun_get_rx_ring_count(struct net_device *netdev)
 {
-       switch (cmd->cmd) {
-       case ETHTOOL_GRXRINGS:
-               cmd->data = netdev->real_num_rx_queues;
-               return 0;
-       default:
-               break;
-       }
-       return -EOPNOTSUPP;
+       return netdev->real_num_rx_queues;
 }
 
 static int fun_set_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *info)
@@ -1169,8 +1161,8 @@ static const struct ethtool_ops fun_ethtool_ops = {
        .get_sset_count      = fun_get_sset_count,
        .get_strings         = fun_get_strings,
        .get_ethtool_stats   = fun_get_ethtool_stats,
-       .get_rxnfc           = fun_get_rxnfc,
        .set_rxnfc           = fun_set_rxnfc,
+       .get_rx_ring_count   = fun_get_rx_ring_count,
        .get_rxfh_indir_size = fun_get_rxfh_indir_size,
        .get_rxfh_key_size   = fun_get_rxfh_key_size,
        .get_rxfh            = fun_get_rxfh,