Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bacc7943 authored by Eugenia Emantayev's avatar Eugenia Emantayev Committed by David S. Miller
Browse files

net/mlx5e: Remove redundant checks in set_ringparam 



Since the checks are done in upper layer ethtool code,
checks in driver are not needed any more.

Signed-off-by: default avatarEugenia Emantayev <eugenia@mellanox.com>
Signed-off-by: default avatarTariq Toukan <tariqt@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7589fd5c

drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c

+0 −15
Original line number Diff line number Diff line
@@ -296,7 +296,6 @@ int mlx5e_ethtool_set_ringparam(struct mlx5e_priv *priv, 
	struct mlx5e_channels new_channels = {};

	u32 rx_pending_wqes;

	u32 min_rq_size;

	u32 max_rq_size;

	u8 log_rq_size;

	u8 log_sq_size;

	u32 num_mtts;
@@ -315,8 +314,6 @@ int mlx5e_ethtool_set_ringparam(struct mlx5e_priv *priv, 


	min_rq_size = mlx5e_rx_wqes_to_packets(priv, rq_wq_type,

					       1 << mlx5_min_log_rq_size(rq_wq_type));

	max_rq_size = mlx5e_rx_wqes_to_packets(priv, rq_wq_type,

					       1 << mlx5_max_log_rq_size(rq_wq_type));

	rx_pending_wqes = mlx5e_packets_to_rx_wqes(priv, rq_wq_type,

						   param->rx_pending);
@@ -326,12 +323,6 @@ int mlx5e_ethtool_set_ringparam(struct mlx5e_priv *priv, 
			    min_rq_size);

		return -EINVAL;

	}

	if (param->rx_pending > max_rq_size) {

		netdev_info(priv->netdev, "%s: rx_pending (%d) > max (%d)\n",

			    __func__, param->rx_pending,

			    max_rq_size);

		return -EINVAL;

	}



	num_mtts = MLX5E_REQUIRED_MTTS(rx_pending_wqes);

	if (priv->channels.params.rq_wq_type == MLX5_WQ_TYPE_LINKED_LIST_STRIDING_RQ &&
@@ -347,12 +338,6 @@ int mlx5e_ethtool_set_ringparam(struct mlx5e_priv *priv, 
			    1 << MLX5E_PARAMS_MINIMUM_LOG_SQ_SIZE);

		return -EINVAL;

	}

	if (param->tx_pending > (1 << MLX5E_PARAMS_MAXIMUM_LOG_SQ_SIZE)) {

		netdev_info(priv->netdev, "%s: tx_pending (%d) > max (%d)\n",

			    __func__, param->tx_pending,

			    1 << MLX5E_PARAMS_MAXIMUM_LOG_SQ_SIZE);

		return -EINVAL;

	}



	log_rq_size = order_base_2(rx_pending_wqes);

	log_sq_size = order_base_2(param->tx_pending);