---

yaml --- r: 311423 b: refs/heads/master c: 5c8e904 h: refs/heads/master i: 311421: 527d9fb 311419: d5504c0 311415: 1cb84d6 311407: 199a75f 311391: 5078971 311359: f286e50 311295: de55070 v: v3
git-mirror · Jun 25, 2012 · 986f016 · 986f016
1 parent d887cf5
commit 986f016
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -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);