From b26e6f019c90fb7bb4efc2152022e01f7d656c70 Mon Sep 17 00:00:00 2001 From: Yevgeny Petrilin Date: Tue, 22 Mar 2011 22:37:28 +0000 Subject: [PATCH] --- yaml --- r: 242631 b: refs/heads/master c: 39f17b44aaaa6bc47ded0bbb17fc617ec6cf08bb h: refs/heads/master i: 242629: 6bdba495fc442b8de90e398012049021054777e4 242627: f5cf063ce17a0613e1e95be5a84460de2d874ea9 242623: d52890e01a580ce984cb2e84973de8575a7540ad v: v3 --- [refs] | 2 +- trunk/drivers/net/mlx4/en_netdev.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 216c3ec89b47..a528a53d258f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b6055006b26de15aaa66870809b3d63b334737ce +refs/heads/master: 39f17b44aaaa6bc47ded0bbb17fc617ec6cf08bb diff --git a/trunk/drivers/net/mlx4/en_netdev.c b/trunk/drivers/net/mlx4/en_netdev.c index 897f576b8b17..56627c26d918 100644 --- a/trunk/drivers/net/mlx4/en_netdev.c +++ b/trunk/drivers/net/mlx4/en_netdev.c @@ -801,7 +801,6 @@ static int mlx4_en_open(struct net_device *dev) priv->rx_ring[i].packets = 0; } - mlx4_en_set_default_moderation(priv); err = mlx4_en_start_port(dev); if (err) en_err(priv, "Failed starting port:%d\n", priv->port); @@ -932,7 +931,6 @@ static int mlx4_en_change_mtu(struct net_device *dev, int new_mtu) en_dbg(DRV, priv, "Change MTU called with card down!?\n"); } else { mlx4_en_stop_port(dev); - mlx4_en_set_default_moderation(priv); err = mlx4_en_start_port(dev); if (err) { en_err(priv, "Failed restarting port:%d\n", @@ -1080,6 +1078,7 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port, en_warn(priv, "Using %d RX rings\n", prof->rx_ring_num); priv->registered = 1; + mlx4_en_set_default_moderation(priv); queue_delayed_work(mdev->workqueue, &priv->stats_task, STATS_DELAY); return 0;