net: phy: don't double-read link status register if link is up

The link status register latches link-down events. Therefore, if link
is reported as being up, there's no need for a second read.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/phy/phy-c45.c b/drivers/net/phy/phy-c45.c
index 706a92a..eff9e5a 100644 (file)
--- a/drivers/net/phy/phy-c45.c
+++ b/drivers/net/phy/phy-c45.c
@@ -148,6 +148,8 @@ int genphy_c45_read_link(struct phy_device *phydev)
                        val = phy_read_mmd(phydev, devad, MDIO_STAT1);
                        if (val < 0)
                                return val;
+                       else if (val & MDIO_STAT1_LSTATUS)
+                               continue;
                }
 
                val = phy_read_mmd(phydev, devad, MDIO_STAT1);

diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index d490cd2..9369e13 100644 (file)
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -1735,8 +1735,12 @@ int genphy_update_link(struct phy_device *phydev)
         */
        if (!phy_polling_mode(phydev)) {
                status = phy_read(phydev, MII_BMSR);
-               if (status < 0)
+               if (status < 0) {
                        return status;
+               } else if (status & BMSR_LSTATUS) {
+                       phydev->link = 1;
+                       return 0;
+               }
        }
 
        /* Read link and autonegotiation status */