diff options
| author | David S. Miller <davem@davemloft.net> | 2018-09-19 21:15:02 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-09-19 21:15:02 -0700 |
| commit | db161d930a194b05efa0129978d7ec5d6dea6fb5 (patch) | |
| tree | 39fd86f720388b7ab75008a19ca0a0e4f008a5c7 /drivers/net/ethernet/marvell/mvneta.c | |
| parent | 02f7f61e5af2fa4748d610b8e4b1af70a44dcbe3 (diff) | |
| parent | 09b8a45eda546d2d93ee75c9899aba22c4dcb814 (diff) | |
Merge branch 'phylink-ensure-the-carrier-is-off-when-starting-phylink'
Antoine Tenart says:
====================
net: phy: phylink: ensure the carrier is off when starting phylink
Following the discussion we had regarding the phylink issue related to
the carrier link state not being off when starting phylink, I sent a fix
patch a few days ago for the PPv2 driver:
https://lkml.org/lkml/2018/9/14/633
The idea was to send a patch which could go to the stable branches, but
a better solution would be to directly call netif_carrier_off() from
within phylink_start(). This is the aim of this series.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/marvell/mvneta.c')
| -rw-r--r-- | drivers/net/ethernet/marvell/mvneta.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c index fe3edb3c2bf4..89ed1df7b3e7 100644 --- a/drivers/net/ethernet/marvell/mvneta.c +++ b/drivers/net/ethernet/marvell/mvneta.c @@ -3791,9 +3791,6 @@ static int mvneta_open(struct net_device *dev) goto err_free_online_hp; } - /* In default link is down */ - netif_carrier_off(pp->dev); - ret = mvneta_mdio_probe(pp); if (ret < 0) { netdev_err(dev, "cannot probe MDIO bus\n"); |