]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
net/mlx5e: Remove redundant checks in set_ringparam
authorEugenia Emantayev <eugenia@mellanox.com>
Mon, 8 Jan 2018 14:00:26 +0000 (16:00 +0200)
committerDavid S. Miller <davem@davemloft.net>
Tue, 9 Jan 2018 16:54:50 +0000 (11:54 -0500)
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>
drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c

index 8f05efa5c829bccb67ddd8b24dc2997adfe4a6c8..1554780d181068c575c951bb2a4d787dfdfcdfe2 100644 (file)
@@ -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);