diff options
| author |   Tariq Toukan <tariqt@mellanox.com> | 2016-03-02 00:13:33 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-03-01 17:27:59 -0500 |
| commit | ce89ef36d2544b4180fdb9ce9e2918196b0082f8 (patch) | |
| tree | c3dd970d805630ceea152fdf65f7c99e1a61ceaa /drivers/net/ethernet/mellanox/mlx5/core/en_main.c | |
| parent | net/mlx5e: Replace async events spinlock with synchronize_irq() (diff) | |
| download | linux-dev-ce89ef36d2544b4180fdb9ce9e2918196b0082f8.tar.xz linux-dev-ce89ef36d2544b4180fdb9ce9e2918196b0082f8.zip | |
net/mlx5e: Placement changed for carrier state updates
More proper to declare carrier state UP only after the channels
are ready for traffic.
Signed-off-by: Tariq Toukan <tariqt@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c index 38944b84c580..013be09a21be 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c @@ -1451,8 +1451,8 @@ int mlx5e_open_locked(struct net_device *netdev) goto err_close_channels; } - mlx5e_update_carrier(priv); mlx5e_redirect_rqts(priv); + mlx5e_update_carrier(priv); mlx5e_timestamp_init(priv); schedule_delayed_work(&priv->update_stats_work, 0); @@ -1491,8 +1491,8 @@ int mlx5e_close_locked(struct net_device *netdev) clear_bit(MLX5E_STATE_OPENED, &priv->state); mlx5e_timestamp_cleanup(priv); - mlx5e_redirect_rqts(priv); netif_carrier_off(priv->netdev); + mlx5e_redirect_rqts(priv); mlx5e_close_channels(priv); return 0; |