]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
net: mediatek: convert to use .get_rx_ring_count
authorBreno Leitao <leitao@debian.org>
Thu, 15 Jan 2026 14:37:50 +0000 (06:37 -0800)
committerJakub Kicinski <kuba@kernel.org>
Sun, 18 Jan 2026 02:10:15 +0000 (18:10 -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/20260115-grxring_big_v2-v1-3-b3e1b58bced5@debian.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/mediatek/mtk_eth_soc.c

index e68997a29191b2a8ce0868873dcfe95c79e10e56..99abec2198d0304dc29c691808e3dc1c58756f29 100644 (file)
@@ -4625,18 +4625,20 @@ static void mtk_get_ethtool_stats(struct net_device *dev,
        } while (u64_stats_fetch_retry(&hwstats->syncp, start));
 }
 
+static u32 mtk_get_rx_ring_count(struct net_device *dev)
+{
+       if (dev->hw_features & NETIF_F_LRO)
+               return MTK_MAX_RX_RING_NUM;
+
+       return 0;
+}
+
 static int mtk_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd,
                         u32 *rule_locs)
 {
        int ret = -EOPNOTSUPP;
 
        switch (cmd->cmd) {
-       case ETHTOOL_GRXRINGS:
-               if (dev->hw_features & NETIF_F_LRO) {
-                       cmd->data = MTK_MAX_RX_RING_NUM;
-                       ret = 0;
-               }
-               break;
        case ETHTOOL_GRXCLSRLCNT:
                if (dev->hw_features & NETIF_F_LRO) {
                        struct mtk_mac *mac = netdev_priv(dev);
@@ -4741,6 +4743,7 @@ static const struct ethtool_ops mtk_ethtool_ops = {
        .set_pauseparam         = mtk_set_pauseparam,
        .get_rxnfc              = mtk_get_rxnfc,
        .set_rxnfc              = mtk_set_rxnfc,
+       .get_rx_ring_count      = mtk_get_rx_ring_count,
        .get_eee                = mtk_get_eee,
        .set_eee                = mtk_set_eee,
 };