]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
net: hns: convert to use .get_rx_ring_count
authorBreno Leitao <leitao@debian.org>
Fri, 9 Jan 2026 17:40:58 +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-7-a0f77f732006@debian.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/hisilicon/hns/hns_ethtool.c

index 60a586a951a02129e632e9e4a9dacabd694012e4..23b295dedaefe33be324fda9c4f375ee9cf389e8 100644 (file)
@@ -1230,21 +1230,11 @@ hns_set_rss(struct net_device *netdev, struct ethtool_rxfh_param *rxfh,
                            rxfh->indir, rxfh->key, rxfh->hfunc);
 }
 
-static int hns_get_rxnfc(struct net_device *netdev,
-                        struct ethtool_rxnfc *cmd,
-                        u32 *rule_locs)
+static u32 hns_get_rx_ring_count(struct net_device *netdev)
 {
        struct hns_nic_priv *priv = netdev_priv(netdev);
 
-       switch (cmd->cmd) {
-       case ETHTOOL_GRXRINGS:
-               cmd->data = priv->ae_handle->q_num;
-               break;
-       default:
-               return -EOPNOTSUPP;
-       }
-
-       return 0;
+       return priv->ae_handle->q_num;
 }
 
 static const struct ethtool_ops hns_ethtool_ops = {
@@ -1273,7 +1263,7 @@ static const struct ethtool_ops hns_ethtool_ops = {
        .get_rxfh_indir_size = hns_get_rss_indir_size,
        .get_rxfh = hns_get_rss,
        .set_rxfh = hns_set_rss,
-       .get_rxnfc = hns_get_rxnfc,
+       .get_rx_ring_count = hns_get_rx_ring_count,
        .get_link_ksettings  = hns_nic_get_link_ksettings,
        .set_link_ksettings  = hns_nic_set_link_ksettings,
 };