From 986f016606060b67f6c62073f0b52137ff8c566a Mon Sep 17 00:00:00 2001
From: Yevgeny Petrilin <yevgenyp@mellanox.co.il>
Date: Mon, 25 Jun 2012 00:24:11 +0000
Subject: [PATCH] --- yaml --- r: 311423 b: refs/heads/master c:
 5c8e9046662889265c0ff390c144188721cb0844 h: refs/heads/master i:   311421:
 527d9fb20de8df6d01409ce18580f31768a66654   311419:
 d5504c0236673ec761f6c57221395062a475c262   311415:
 1cb84d63577a8834eb797edc3ab9e458b40ada91   311407:
 199a75fbbf87b6d4932d5f1c88d1701cc748dc93   311391:
 5078971ee6fcaba1333e5609142f0ae7d141e9b6   311359:
 f286e50404d8806efff8e230822cd6b55f601fcc   311295:
 de550706fd0d95da2db70795dad6a9a747602e17 v: v3

---
 [refs]                                               | 2 +-
 trunk/drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 96c90cea46ff..06455d57c0e6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6de0298ec9c1edaf330b71b57346241ece8f3346
+refs/heads/master: 5c8e9046662889265c0ff390c144188721cb0844
diff --git a/trunk/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/trunk/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
index 926d8aac941c..a80280eee06e 100644
--- a/trunk/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
+++ b/trunk/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
@@ -1204,9 +1204,11 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port,
 	en_warn(priv, "Using %d RX rings\n", prof->rx_ring_num);
 
 	/* Configure port */
+	mlx4_en_calc_rx_buf(dev);
 	err = mlx4_SET_PORT_general(mdev->dev, priv->port,
-				    MLX4_EN_MIN_MTU,
-				    0, 0, 0, 0);
+				    priv->rx_skb_size + ETH_FCS_LEN,
+				    prof->tx_pause, prof->tx_ppp,
+				    prof->rx_pause, prof->rx_ppp);
 	if (err) {
 		en_err(priv, "Failed setting port general configurations "
 		       "for port %d, with error %d\n", priv->port, err);