aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/marvell/mvpp2
diff options
context:
space:
mode:
authorAntoine Tenart <antoine.tenart@bootlin.com>2018-09-19 11:39:32 +0200
committerDavid S. Miller <davem@davemloft.net>2018-09-19 21:15:02 -0700
commitf8f5f588bb9b2f7fd7b019c125028517921d61e7 (patch)
tree204149d3262f50fba9664d9864c58a253277b22d /drivers/net/ethernet/marvell/mvpp2
parentnet: phy: phylink: ensure the carrier is off when starting phylink (diff)
downloadlinux-dev-f8f5f588bb9b2f7fd7b019c125028517921d61e7.tar.xz
linux-dev-f8f5f588bb9b2f7fd7b019c125028517921d61e7.zip
net: mvpp2: do not explicitly set the carrier state in open
This patch removes the explicit call to netif_carrier_off() in PPv2's open() path, as this is now handled in phylink_start(). Signed-off-by: Antoine Tenart <antoine.tenart@bootlin.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/marvell/mvpp2')
-rw-r--r--drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
index 6dc15a234e50..03ff053b1d8c 100644
--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
@@ -3193,7 +3193,6 @@ static void mvpp2_start_dev(struct mvpp2_port *port)
mvpp22_mode_reconfigure(port);
if (port->phylink) {
- netif_carrier_off(port->dev);
phylink_start(port->phylink);
} else {
/* Phylink isn't used as of now for ACPI, so the MAC has to be