1 files changed, 10 insertions, 8 deletions

diff --git a/drivers/net/mlx4/en_netdev.c b/drivers/net/mlx4/en_netdev.c
index 93f4abd990a9..c48b0f4b17b7 100644
--- a/drivers/net/mlx4/en_netdev.c
+++ b/drivers/net/mlx4/en_netdev.c
@@ -414,6 +414,7 @@ static void mlx4_en_auto_moderation(struct mlx4_en_priv *priv)
         unsigned long avg_pkt_size;
         unsigned long rx_packets;
         unsigned long rx_bytes;
+        unsigned long rx_byte_diff;
         unsigned long tx_packets;
         unsigned long tx_pkt_diff;
         unsigned long rx_pkt_diff;
@@ -437,6 +438,8 @@ static void mlx4_en_auto_moderation(struct mlx4_en_priv *priv)
         rx_pkt_diff = ((unsigned long) (rx_packets -
                                         priv->last_moder_packets));
         packets = max(tx_pkt_diff, rx_pkt_diff);
+        rx_byte_diff = rx_bytes - priv->last_moder_bytes;
+        rx_byte_diff = rx_byte_diff ? rx_byte_diff : 1;
         rate = packets * HZ / period;
         avg_pkt_size = packets ? ((unsigned long) (rx_bytes -
                                  priv->last_moder_bytes)) / packets : 0;
@@ -447,10 +450,13 @@ static void mlx4_en_auto_moderation(struct mlx4_en_priv *priv)
                 /* If tx and rx packet rates are not balanced, assume that
                  * traffic is mainly BW bound and apply maximum moderation.
                  * Otherwise, moderate according to packet rate */
-                if (2 * tx_pkt_diff > 3 * rx_pkt_diff ||
-                    2 * rx_pkt_diff > 3 * tx_pkt_diff) {
+                if (2 * tx_pkt_diff > 3 * rx_pkt_diff &&
+                    rx_pkt_diff / rx_byte_diff <
+                    MLX4_EN_SMALL_PKT_SIZE)
+                        moder_time = priv->rx_usecs_low;
+                else if (2 * rx_pkt_diff > 3 * tx_pkt_diff)
                         moder_time = priv->rx_usecs_high;
-                } else {
+                else {
                         if (rate < priv->pkt_rate_low)
                                 moder_time = priv->rx_usecs_low;
                         else if (rate > priv->pkt_rate_high)
@@ -616,8 +622,7 @@ int mlx4_en_start_port(struct net_device *dev)
 
                 /* Configure ring */
                 tx_ring = &priv->tx_ring[i];
-                err = mlx4_en_activate_tx_ring(priv, tx_ring, cq->mcq.cqn,
-                                               priv->rx_ring[0].srq.srqn);
+                err = mlx4_en_activate_tx_ring(priv, tx_ring, cq->mcq.cqn);
                 if (err) {
                         en_err(priv, "Failed allocating Tx ring\n");
                         mlx4_en_deactivate_cq(priv, cq);
@@ -1005,9 +1010,6 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port,
         if (err)
                 goto out;
 
-        /* Populate Rx default RSS mappings */
-        mlx4_en_set_default_rss_map(priv, &priv->rss_map, priv->rx_ring_num *
-                                                RSS_FACTOR, priv->rx_ring_num);
         /* Allocate page for receive rings */
         err = mlx4_alloc_hwq_res(mdev->dev, &priv->res,
                                 MLX4_EN_PAGE_SIZE, MLX4_EN_PAGE_SIZE);