1 files changed, 14 insertions, 5 deletions

diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index 03785cd14b7c..bfb2bb00c493 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -1065,12 +1065,15 @@ static void fec_enet_work(struct work_struct *work)
                 container_of(work,
                              struct fec_enet_private,
                              delay_work.delay_work.work);
+        struct net_device *ndev = fep->netdev;
 
         if (fep->delay_work.timeout) {
                 fep->delay_work.timeout = false;
                 rtnl_lock();
-                fec_restart(fep->netdev, fep->full_duplex);
-                netif_wake_queue(fep->netdev);
+                if (netif_device_present(ndev) || netif_running(ndev)) {
+                        fec_restart(ndev, fep->full_duplex);
+                        netif_wake_queue(ndev);
+                }
                 rtnl_unlock();
         }
 
@@ -1504,7 +1507,14 @@ static void fec_enet_adjust_link(struct net_device *ndev)
                 return;
         }
 
-        if (phy_dev->link) {
+        /*
+         * If the netdev is down, or is going down, we're not interested
+         * in link state events, so just mark our idea of the link as down
+         * and ignore the event.
+         */
+        if (!netif_running(ndev) || !netif_device_present(ndev)) {
+                fep->link = 0;
+        } else if (phy_dev->link) {
                 if (!fep->link) {
                         fep->link = phy_dev->link;
                         status_change = 1;
@@ -2184,6 +2194,7 @@ fec_enet_open(struct net_device *ndev)
                 return ret;
         }
 
+        fec_restart(ndev, fep->full_duplex);
         napi_enable(&fep->napi);
         phy_start(fep->phy_dev);
         netif_start_queue(ndev);
@@ -2350,8 +2361,6 @@ static int fec_set_features(struct net_device *netdev,
                         fec_stop(netdev);
                         fec_restart(netdev, fep->phy_dev->duplex);
                         netif_wake_queue(netdev);
-                } else {
-                        fec_restart(netdev, fep->phy_dev->duplex);
                 }
         }