diff options
| author | David S. Miller <davem@davemloft.net> | 2021-04-26 12:00:00 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-04-26 12:00:00 -0700 |
| commit | 6876a18d3361e1893187970e1881a1d88d894d3f (patch) | |
| tree | c79dfb4843b82d9346cae1dce68d9b1cfece1715 /drivers/net/ethernet/marvell/prestera/prestera_main.c | |
| parent | 0ea1041bfa3aa2971f858edd9e05477c2d3d54a0 (diff) | |
| parent | bbd6f0a948139970f4a615dff189d9a503681a39 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Diffstat (limited to 'drivers/net/ethernet/marvell/prestera/prestera_main.c')
| -rw-r--r-- | drivers/net/ethernet/marvell/prestera/prestera_main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/marvell/prestera/prestera_main.c b/drivers/net/ethernet/marvell/prestera/prestera_main.c index f08c420a5803..2768c78528a5 100644 --- a/drivers/net/ethernet/marvell/prestera/prestera_main.c +++ b/drivers/net/ethernet/marvell/prestera/prestera_main.c @@ -431,7 +431,8 @@ static void prestera_port_handle_event(struct prestera_switch *sw, netif_carrier_on(port->dev); if (!delayed_work_pending(caching_dw)) queue_delayed_work(prestera_wq, caching_dw, 0); - } else { + } else if (netif_running(port->dev) && + netif_carrier_ok(port->dev)) { netif_carrier_off(port->dev); if (delayed_work_pending(caching_dw)) cancel_delayed_work(caching_dw); |