1 files changed, 20 insertions, 7 deletions

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 1b6d09aef427..3bc079a67a3d 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -715,7 +715,7 @@ void phy_state_machine(struct work_struct *work)
         struct delayed_work *dwork = to_delayed_work(work);
         struct phy_device *phydev =
                         container_of(dwork, struct phy_device, state_queue);
-        int needs_aneg = 0, do_suspend = 0;
+        bool needs_aneg = false, do_suspend = false, do_resume = false;
         int err = 0;
 
         mutex_lock(&phydev->lock);
@@ -727,7 +727,7 @@ void phy_state_machine(struct work_struct *work)
         case PHY_PENDING:
                 break;
         case PHY_UP:
-                needs_aneg = 1;
+                needs_aneg = true;
 
                 phydev->link_timeout = PHY_AN_TIMEOUT;
 
@@ -757,7 +757,7 @@ void phy_state_machine(struct work_struct *work)
                         phydev->adjust_link(phydev->attached_dev);
 
                 } else if (0 == phydev->link_timeout--)
-                        needs_aneg = 1;
+                        needs_aneg = true;
                 break;
         case PHY_NOLINK:
                 err = phy_read_status(phydev);
@@ -765,6 +765,17 @@ void phy_state_machine(struct work_struct *work)
                         break;
 
                 if (phydev->link) {
+                        if (AUTONEG_ENABLE == phydev->autoneg) {
+                                err = phy_aneg_done(phydev);
+                                if (err < 0)
+                                        break;
+
+                                if (!err) {
+                                        phydev->state = PHY_AN;
+                                        phydev->link_timeout = PHY_AN_TIMEOUT;
+                                        break;
+                                }
+                        }
                         phydev->state = PHY_RUNNING;
                         netif_carrier_on(phydev->attached_dev);
                         phydev->adjust_link(phydev->attached_dev);
@@ -780,7 +791,7 @@ void phy_state_machine(struct work_struct *work)
                         netif_carrier_on(phydev->attached_dev);
                 } else {
                         if (0 == phydev->link_timeout--)
-                                needs_aneg = 1;
+                                needs_aneg = true;
                 }
 
                 phydev->adjust_link(phydev->attached_dev);
@@ -816,7 +827,7 @@ void phy_state_machine(struct work_struct *work)
                         phydev->link = 0;
                         netif_carrier_off(phydev->attached_dev);
                         phydev->adjust_link(phydev->attached_dev);
-                        do_suspend = 1;
+                        do_suspend = true;
                 }
                 break;
         case PHY_RESUMING:
@@ -865,6 +876,7 @@ void phy_state_machine(struct work_struct *work)
                         }
                         phydev->adjust_link(phydev->attached_dev);
                 }
+                do_resume = true;
                 break;
         }
 
@@ -872,9 +884,10 @@ void phy_state_machine(struct work_struct *work)
 
         if (needs_aneg)
                 err = phy_start_aneg(phydev);
-
-        if (do_suspend)
+        else if (do_suspend)
                 phy_suspend(phydev);
+        else if (do_resume)
+                phy_resume(phydev);
 
         if (err < 0)
                 phy_error(phydev);