aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEugenia Emantayev <eugenia@mellanox.com>2018-01-08 09:00:26 -0500
committerDavid S. Miller <davem@davemloft.net>2018-01-09 11:54:50 -0500
commitbacc7943311e7536a9ef25f06a6cfdea9d228d88 (patch)
tree8cded4b9519635f9c91fe78641256b4919494519
parent7589fd5c8c2802c370f18ab5a9c571eb34aa9a35 (diff)
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: Eugenia Emantayev <eugenia@mellanox.com> Signed-off-by: Tariq Toukan <tariqt@mellanox.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c15
1 files changed, 0 insertions, 15 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c b/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
index 8f05efa5c829..1554780d1810 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
@@ -296,7 +296,6 @@ int mlx5e_ethtool_set_ringparam(struct mlx5e_priv *priv,
296 struct mlx5e_channels new_channels = {}; 296 struct mlx5e_channels new_channels = {};
297 u32 rx_pending_wqes; 297 u32 rx_pending_wqes;
298 u32 min_rq_size; 298 u32 min_rq_size;
299 u32 max_rq_size;
300 u8 log_rq_size; 299 u8 log_rq_size;
301 u8 log_sq_size; 300 u8 log_sq_size;
302 u32 num_mtts; 301 u32 num_mtts;
@@ -315,8 +314,6 @@ int mlx5e_ethtool_set_ringparam(struct mlx5e_priv *priv,
315 314
316 min_rq_size = mlx5e_rx_wqes_to_packets(priv, rq_wq_type, 315 min_rq_size = mlx5e_rx_wqes_to_packets(priv, rq_wq_type,
317 1 << mlx5_min_log_rq_size(rq_wq_type)); 316 1 << mlx5_min_log_rq_size(rq_wq_type));
318 max_rq_size = mlx5e_rx_wqes_to_packets(priv, rq_wq_type,
319 1 << mlx5_max_log_rq_size(rq_wq_type));
320 rx_pending_wqes = mlx5e_packets_to_rx_wqes(priv, rq_wq_type, 317 rx_pending_wqes = mlx5e_packets_to_rx_wqes(priv, rq_wq_type,
321 param->rx_pending); 318 param->rx_pending);
322 319
@@ -326,12 +323,6 @@ int mlx5e_ethtool_set_ringparam(struct mlx5e_priv *priv,
326 min_rq_size); 323 min_rq_size);
327 return -EINVAL; 324 return -EINVAL;
328 } 325 }
329 if (param->rx_pending > max_rq_size) {
330 netdev_info(priv->netdev, "%s: rx_pending (%d) > max (%d)\n",
331 __func__, param->rx_pending,
332 max_rq_size);
333 return -EINVAL;
334 }
335 326
336 num_mtts = MLX5E_REQUIRED_MTTS(rx_pending_wqes); 327 num_mtts = MLX5E_REQUIRED_MTTS(rx_pending_wqes);
337 if (priv->channels.params.rq_wq_type == MLX5_WQ_TYPE_LINKED_LIST_STRIDING_RQ && 328 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,
347 1 << MLX5E_PARAMS_MINIMUM_LOG_SQ_SIZE); 338 1 << MLX5E_PARAMS_MINIMUM_LOG_SQ_SIZE);
348 return -EINVAL; 339 return -EINVAL;
349 } 340 }
350 if (param->tx_pending > (1 << MLX5E_PARAMS_MAXIMUM_LOG_SQ_SIZE)) {
351 netdev_info(priv->netdev, "%s: tx_pending (%d) > max (%d)\n",
352 __func__, param->tx_pending,
353 1 << MLX5E_PARAMS_MAXIMUM_LOG_SQ_SIZE);
354 return -EINVAL;
355 }
356 341
357 log_rq_size = order_base_2(rx_pending_wqes); 342 log_rq_size = order_base_2(rx_pending_wqes);
358 log_sq_size = order_base_2(param->tx_pending); 343 log_sq_size = order_base_2(param->tx_pending);