Commit 467c3f00 authored by Breno Leitao's avatar Breno Leitao Committed by Jakub Kicinski
Browse files

mlx4: extract GRXRINGS from .get_rxnfc 



Commit 84eaf435 ("net: ethtool: add get_rx_ring_count callback to
optimize RX ring queries") added specific support for GRXRINGS callback,
simplifying .get_rxnfc.

Remove the handling of GRXRINGS in .get_rxnfc() by moving it to the new
.get_rx_ring_count().

This simplifies the RX ring count retrieval and aligns mlx4 with the new
ethtool API for querying RX ring parameters. This is compiled tested
only.

Signed-off-by: default avatarBreno Leitao <leitao@debian.org>
Reviewed-by: default avatarTariq Toukan <tariqt@nvidia.com>
Link: https://patch.msgid.link/20251113-mlx_grxrings-v1-1-0017f2af7dd0@debian.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent c9dfb92d

drivers/net/ethernet/mellanox/mlx4/en_ethtool.c

+8 −3
Original line number Diff line number Diff line
@@ -1727,6 +1727,13 @@ static int mlx4_en_get_num_flows(struct mlx4_en_priv *priv) 


}



static u32 mlx4_en_get_rx_ring_count(struct net_device *dev)

{

	struct mlx4_en_priv *priv = netdev_priv(dev);



	return priv->rx_ring_num;

}



static int mlx4_en_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd,

			     u32 *rule_locs)

{
@@ -1743,9 +1750,6 @@ static int mlx4_en_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd, 
		return -EINVAL;



	switch (cmd->cmd) {

	case ETHTOOL_GRXRINGS:

		cmd->data = priv->rx_ring_num;

		break;

	case ETHTOOL_GRXCLSRLCNT:

		cmd->rule_cnt = mlx4_en_get_num_flows(priv);

		break;
@@ -2154,6 +2158,7 @@ const struct ethtool_ops mlx4_en_ethtool_ops = { 
	.set_ringparam = mlx4_en_set_ringparam,

	.get_rxnfc = mlx4_en_get_rxnfc,

	.set_rxnfc = mlx4_en_set_rxnfc,

	.get_rx_ring_count = mlx4_en_get_rx_ring_count,

	.get_rxfh_indir_size = mlx4_en_get_rxfh_indir_size,

	.get_rxfh_key_size = mlx4_en_get_rxfh_key_size,

	.get_rxfh = mlx4_en_get_rxfh,