summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorDavid Dueck <davidcdueck@googlemail.com>2013-11-05 17:23:02 +0100
committerJoe Hershberger <joe.hershberger@ni.com>2013-11-22 17:03:20 -0600
commit3a530d1b3e947c09e882dda8883aa608458a598c (patch)
treedb29fa262506e0326a45f87b19bdc89ccb05b963 /drivers/net
parentc583ee16cb5db73fc299bb679ecb75a5abb3ca47 (diff)
downloadtalos-obmc-uboot-3a530d1b3e947c09e882dda8883aa608458a598c.tar.gz
talos-obmc-uboot-3a530d1b3e947c09e882dda8883aa608458a598c.zip
phy: Use supported field during autonegotiation
The current code incorrectly detects gigabit capabilities for some 100Mbit/s phys. (lan8720a) Signed-off-by: David Dueck <davidcdueck@googlemail.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/phy/phy.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 62925bb286..c691fbbbc6 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -275,13 +275,14 @@ int genphy_parse_link(struct phy_device *phydev)
int mii_reg = phy_read(phydev, MDIO_DEVAD_NONE, MII_BMSR);
/* We're using autonegotiation */
- if (mii_reg & BMSR_ANEGCAPABLE) {
+ if (phydev->supported & SUPPORTED_Autoneg) {
u32 lpa = 0;
int gblpa = 0;
u32 estatus = 0;
/* Check for gigabit capability */
- if (mii_reg & BMSR_ERCAP) {
+ if (phydev->supported & (SUPPORTED_1000baseT_Full |
+ SUPPORTED_1000baseT_Half)) {
/* We want a list of states supported by
* both PHYs in the link
*/
OpenPOWER on IntegriCloud