mlx4_en: Returning real Max in get_ringparam

Signed-off-by: Yevgeny Petrilin <yevgenyp@mellanox.co.il>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/mlx4/en_params.c b/drivers/net/mlx4/en_params.c
index cfeef0f1bacc6ae38a23a74caefb6646a40361fd..c1bd040b9e05df2b7c1bfe25e23e53411743dfed 100644 (file)
--- a/drivers/net/mlx4/en_params.c
+++ b/drivers/net/mlx4/en_params.c
@@ -399,8 +399,10 @@ static int mlx4_en_set_ringparam(struct net_device *dev,
 
        rx_size = roundup_pow_of_two(param->rx_pending);
        rx_size = max_t(u32, rx_size, MLX4_EN_MIN_RX_SIZE);
+       rx_size = min_t(u32, rx_size, MLX4_EN_MAX_RX_SIZE);
        tx_size = roundup_pow_of_two(param->tx_pending);
        tx_size = max_t(u32, tx_size, MLX4_EN_MIN_TX_SIZE);
+       tx_size = min_t(u32, tx_size, MLX4_EN_MAX_TX_SIZE);
 
        if (rx_size == priv->prof->rx_ring_size &&
            tx_size == priv->prof->tx_ring_size)
@@ -440,8 +442,8 @@ static void mlx4_en_get_ringparam(struct net_device *dev,
        struct mlx4_en_dev *mdev = priv->mdev;
 
        memset(param, 0, sizeof(*param));
-       param->rx_max_pending = mdev->dev->caps.max_rq_sg;
-       param->tx_max_pending = mdev->dev->caps.max_sq_sg;
+       param->rx_max_pending = MLX4_EN_MAX_RX_SIZE;
+       param->tx_max_pending = MLX4_EN_MAX_TX_SIZE;
        param->rx_pending = mdev->profile.prof[priv->port].rx_ring_size;
        param->tx_pending = mdev->profile.prof[priv->port].tx_ring_size;
 }

diff --git a/drivers/net/mlx4/mlx4_en.h b/drivers/net/mlx4/mlx4_en.h
index 08bf321a9e62b36eb145b1ac5c001048f6ccbcff..e9af32d41ca44aee1fa0024aa261a76ab3133b07 100644 (file)
--- a/drivers/net/mlx4/mlx4_en.h
+++ b/drivers/net/mlx4/mlx4_en.h
@@ -115,6 +115,10 @@ enum {
 };
 #define MLX4_EN_MAX_RX_FRAGS   4
 
+/* Maximum ring sizes */
+#define MLX4_EN_MAX_TX_SIZE    8192
+#define MLX4_EN_MAX_RX_SIZE    8192
+
 /* Minimum ring size for our page-allocation sceme to work */
 #define MLX4_EN_MIN_RX_SIZE    (MLX4_EN_ALLOC_SIZE / SMP_CACHE_BYTES)
 #define MLX4_EN_MIN_TX_SIZE    (4096 / TXBB_SIZE)