Commit 1227bbc5 authored by Roi Dayan's avatar Roi Dayan Committed by Saeed Mahameed

net/mlx5e: Move netif_carrier_off() out of mlx5e_priv_init()

It's not part of priv initialization.
Signed-off-by: default avatarRoi Dayan <roid@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent c9fd1e33
...@@ -5483,9 +5483,6 @@ int mlx5e_priv_init(struct mlx5e_priv *priv, ...@@ -5483,9 +5483,6 @@ int mlx5e_priv_init(struct mlx5e_priv *priv,
if (!priv->wq) if (!priv->wq)
goto err_free_cpumask; goto err_free_cpumask;
/* netdev init */
netif_carrier_off(netdev);
return 0; return 0;
err_free_cpumask: err_free_cpumask:
...@@ -5523,6 +5520,8 @@ mlx5e_create_netdev(struct mlx5_core_dev *mdev, unsigned int txqs, unsigned int ...@@ -5523,6 +5520,8 @@ mlx5e_create_netdev(struct mlx5_core_dev *mdev, unsigned int txqs, unsigned int
mlx5_core_err(mdev, "mlx5e_priv_init failed, err=%d\n", err); mlx5_core_err(mdev, "mlx5e_priv_init failed, err=%d\n", err);
goto err_free_netdev; goto err_free_netdev;
} }
netif_carrier_off(netdev);
dev_net_set(netdev, mlx5_core_net(mdev)); dev_net_set(netdev, mlx5_core_net(mdev));
return netdev; return netdev;
...@@ -5630,6 +5629,7 @@ mlx5e_netdev_attach_profile(struct mlx5e_priv *priv, ...@@ -5630,6 +5629,7 @@ mlx5e_netdev_attach_profile(struct mlx5e_priv *priv,
mlx5_core_err(mdev, "mlx5e_priv_init failed, err=%d\n", err); mlx5_core_err(mdev, "mlx5e_priv_init failed, err=%d\n", err);
return err; return err;
} }
netif_carrier_off(netdev);
priv->profile = new_profile; priv->profile = new_profile;
priv->ppriv = new_ppriv; priv->ppriv = new_ppriv;
err = new_profile->init(priv->mdev, priv->netdev); err = new_profile->init(priv->mdev, priv->netdev);
......
...@@ -76,6 +76,7 @@ int mlx5i_init(struct mlx5_core_dev *mdev, struct net_device *netdev) ...@@ -76,6 +76,7 @@ int mlx5i_init(struct mlx5_core_dev *mdev, struct net_device *netdev)
{ {
struct mlx5e_priv *priv = mlx5i_epriv(netdev); struct mlx5e_priv *priv = mlx5i_epriv(netdev);
netif_carrier_off(netdev);
mlx5e_set_netdev_mtu_boundaries(priv); mlx5e_set_netdev_mtu_boundaries(priv);
netdev->mtu = netdev->max_mtu; netdev->mtu = netdev->max_mtu;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment