net: phy: marvell: Show complete link partner advertising
authorThomas Bogendoerfer <tbogendoerfer@suse.de>
Mon, 12 Jun 2017 12:54:57 +0000 (14:54 +0200)
committerDavid S. Miller <davem@davemloft.net>
Mon, 12 Jun 2017 16:07:36 +0000 (12:07 -0400)
Give back all modes advertised by the link partner. This change brings
the marvell phy driver in line with all other phy drivers.

Signed-off-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/phy/marvell.c

index 4c5246f..8400403 100644 (file)
@@ -1139,7 +1139,6 @@ static int marvell_read_status_page_an(struct phy_device *phydev,
        int status;
        int lpa;
        int lpagb;
-       int adv;
 
        status = phy_read(phydev, MII_M1011_PHY_STATUS);
        if (status < 0)
@@ -1153,12 +1152,6 @@ static int marvell_read_status_page_an(struct phy_device *phydev,
        if (lpagb < 0)
                return lpagb;
 
-       adv = phy_read(phydev, MII_ADVERTISE);
-       if (adv < 0)
-               return adv;
-
-       lpa &= adv;
-
        if (status & MII_M1011_PHY_STATUS_FULLDUPLEX)
                phydev->duplex = DUPLEX_FULL;
        else