diff options
| author | Fugang Duan <fugang.duan@nxp.com> | 2017-05-03 15:34:57 +0800 |
|---|---|---|
| committer | Leonard Crestez <leonard.crestez@nxp.com> | 2018-08-24 12:41:33 +0300 |
| commit | 17bc02904f362eadede3150b02d80809840c2b7f (patch) | |
| tree | 15555971240167c2479e74920fef25f58e68c20f /drivers/net/ethernet/freescale/fec_main.c | |
| parent | f0705f8d97cbb6f5f200494915e9326605b4165d (diff) | |
MLK-14770 net: fec: revert the patch "net: fec: avoid mac re-inited after system resume back"
The patch commit:586fbe526860 introduce the issue that suspend/resume
is failed on i.MX6SX sabreauto/sdb board. Now revert it.
Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
Diffstat (limited to 'drivers/net/ethernet/freescale/fec_main.c')
| -rw-r--r-- | drivers/net/ethernet/freescale/fec_main.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c index d6c419d8f06c..51a0401f0dbf 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -1774,13 +1774,11 @@ static void fec_enet_adjust_link(struct net_device *ndev) if (fep->full_duplex != phy_dev->duplex) { fep->full_duplex = phy_dev->duplex; - fep->require_init = true; status_change = 1; } if (phy_dev->speed != fep->speed) { fep->speed = phy_dev->speed; - fep->require_init = true; status_change = 1; } @@ -1788,9 +1786,7 @@ static void fec_enet_adjust_link(struct net_device *ndev) if (status_change) { napi_disable(&fep->napi); netif_tx_lock_bh(ndev); - /* avoid to re-init MAC after resume back */ - if (fep->require_init) - fec_restart(ndev); + fec_restart(ndev); netif_wake_queue(ndev); netif_tx_unlock_bh(ndev); napi_enable(&fep->napi); @@ -3809,7 +3805,6 @@ static int __maybe_unused fec_resume(struct device *dev) pinctrl_pm_select_default_state(&fep->pdev->dev); } fec_restart(ndev); - fep->require_init = false; netif_tx_lock_bh(ndev); netif_device_attach(ndev); netif_tx_unlock_bh(ndev); |