net: cxgb4: convert to use .get_rx_ring_count

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-7-b3e1b58bced5@debian.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c
index 23326235d4ab5d79af3d53b570dd82d5efb30111..faf8f7e86520c4b5deadbfaa43dfcb12da948b06 100644 (file)
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c
@@ -1784,6 +1784,13 @@ static int cxgb4_get_rxfh_fields(struct net_device *dev,
        return 0;
 }
 
+static u32 get_rx_ring_count(struct net_device *dev)
+{
+       const struct port_info *pi = netdev_priv(dev);
+
+       return pi->nqsets;
+}
+
 static int get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *info,
                     u32 *rules)
 {
@@ -1793,9 +1800,6 @@ static int get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *info,
        int ret = 0;
 
        switch (info->cmd) {
-       case ETHTOOL_GRXRINGS:
-               info->data = pi->nqsets;
-               return 0;
        case ETHTOOL_GRXCLSRLCNT:
                info->rule_cnt =
                       adap->ethtool_filters->port[pi->port_id].in_use;
@@ -2200,6 +2204,7 @@ static const struct ethtool_ops cxgb_ethtool_ops = {
        .get_regs          = get_regs,
        .get_rxnfc         = get_rxnfc,
        .set_rxnfc         = set_rxnfc,
+       .get_rx_ring_count = get_rx_ring_count,
        .get_rxfh_indir_size = get_rss_table_size,
        .get_rxfh          = get_rss_table,
        .set_rxfh          = set_rss_table,