summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorThomas Bogendoerfer <tbogendoerfer@suse.de>2017-06-12 14:54:57 +0200
committerDavid S. Miller <davem@davemloft.net>2017-06-12 12:07:36 -0400
commita1fa1a00b31c9155501d81f5396b2f6d76871fbe (patch)
tree31af7c4f524821ec16f255467b136aa49c0769b7 /drivers
parente0090a9e979de5202c7d16c635dea2f005221073 (diff)
downloadop-kernel-dev-a1fa1a00b31c9155501d81f5396b2f6d76871fbe.zip
op-kernel-dev-a1fa1a00b31c9155501d81f5396b2f6d76871fbe.tar.gz
net: phy: marvell: Show complete link partner advertising
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/phy/marvell.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index 4c5246f..8400403 100644
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -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
OpenPOWER on IntegriCloud