net: mvpp2: a port can be disabled even if we use the link IRQ

We had a check in the mvpp2_mac_link_down() function (called by phylink)
to avoid disabling the port when link interrupts are used. It turned out
the interrupt can still be used with the port disabled. We can thus
remove this check.

Signed-off-by: Antoine Tenart <antoine.tenart@bootlin.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
index 6638a3339efc98e0fff7619bbc99e4f683d62ada..5a2638b7443af430fd1ce47b7cc8bc8e2f525715 100644 (file)
--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
@@ -4738,13 +4738,6 @@ static void mvpp2_mac_link_down(struct net_device *dev, unsigned int mode,
        mvpp2_egress_disable(port);
        mvpp2_ingress_disable(port);
 
-       /* When using link interrupts to notify phylink of a MAC state change,
-        * we do not want the port to be disabled (we want to receive further
-        * interrupts, to be notified when the port will have a link later).
-        */
-       if (!port->has_phy)
-               return;
-
        mvpp2_port_disable(port);
 }