diff options
| author |   Eugenia Emantayev <eugenia@mellanox.com> | 2013-06-25 12:09:31 +0300 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2013-06-25 16:29:39 -0700 |
| commit | 4801ae70d80dc815997e3cb6bca1dfe36d1594fd (patch) | |
| tree | e4b6f90539bc44fb7d36872e2bcff3bf54f9690d /drivers/net/ethernet/mellanox/mlx4/en_netdev.c | |
| parent | net/mlx4_en: Do not query stats when device port is down (diff) | |
| download | linux-dev-4801ae70d80dc815997e3cb6bca1dfe36d1594fd.tar.xz linux-dev-4801ae70d80dc815997e3cb6bca1dfe36d1594fd.zip | |
net/mlx4_en: Move register_netdev() to the end of initialization function
To avoid a race between the open function and everything that happens after
register_netdev() move it to be the last operation called.
Signed-off-by: Eugenia Emantayev <eugenia@mellanox.com>
Signed-off-by: Amir Vadai <amirv@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx4/en_netdev.c')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c index c0b02d7bcc2f..1f0f8170d79d 100644 --- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c @@ -2323,6 +2323,8 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port, mdev->pndev[port] = dev; netif_carrier_off(dev); + mlx4_en_set_default_moderation(priv); + err = register_netdev(dev); if (err) { en_err(priv, "Netdev registration failed for port %d\n", port); @@ -2354,7 +2356,6 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port, en_err(priv, "Failed Initializing port\n"); goto out; } - mlx4_en_set_default_moderation(priv); queue_delayed_work(mdev->workqueue, &priv->stats_task, STATS_DELAY); if (mdev->dev->caps.flags2 & MLX4_DEV_CAP_FLAG2_TS) |