1 files changed, 3 insertions, 11 deletions

diff --git a/drivers/net/mlx4/en_netdev.c b/drivers/net/mlx4/en_netdev.c
index 11b793ad2e1b..ebada3c7aff2 100644
--- a/drivers/net/mlx4/en_netdev.c
+++ b/drivers/net/mlx4/en_netdev.c
@@ -369,7 +369,6 @@ static struct net_device_stats *mlx4_en_get_stats(struct net_device *dev)
 
 static void mlx4_en_set_default_moderation(struct mlx4_en_priv *priv)
 {
-        struct mlx4_en_dev *mdev = priv->mdev;
         struct mlx4_en_cq *cq;
         int i;
 
@@ -379,15 +378,8 @@ static void mlx4_en_set_default_moderation(struct mlx4_en_priv *priv)
          *   satisfy our coelsing target.
          * - moder_time is set to a fixed value.
          */
-        priv->rx_frames = (mdev->profile.rx_moder_cnt ==
-                           MLX4_EN_AUTO_CONF) ?
-                                MLX4_EN_RX_COAL_TARGET /
-                                priv->dev->mtu + 1 :
-                                mdev->profile.rx_moder_cnt;
-        priv->rx_usecs = (mdev->profile.rx_moder_time ==
-                          MLX4_EN_AUTO_CONF) ?
-                                MLX4_EN_RX_COAL_TIME :
-                                mdev->profile.rx_moder_time;
+        priv->rx_frames = MLX4_EN_RX_COAL_TARGET / priv->dev->mtu + 1;
+        priv->rx_usecs = MLX4_EN_RX_COAL_TIME;
         mlx4_dbg(INTR, priv, "Default coalesing params for mtu:%d - "
                              "rx_frames:%d rx_usecs:%d\n",
                  priv->dev->mtu, priv->rx_frames, priv->rx_usecs);
@@ -411,7 +403,7 @@ static void mlx4_en_set_default_moderation(struct mlx4_en_priv *priv)
         priv->pkt_rate_high = MLX4_EN_RX_RATE_HIGH;
         priv->rx_usecs_high = MLX4_EN_RX_COAL_TIME_HIGH;
         priv->sample_interval = MLX4_EN_SAMPLE_INTERVAL;
-        priv->adaptive_rx_coal = mdev->profile.auto_moder;
+        priv->adaptive_rx_coal = 1;
         priv->last_moder_time = MLX4_EN_AUTO_CONF;
         priv->last_moder_jiffies = 0;
         priv->last_moder_packets = 0;