[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <1392999496-29753-1-git-send-email-cristian.bercaru@freescale.com>
Date: Fri, 21 Feb 2014 18:18:16 +0200
From: <cristian.bercaru@...escale.com>
To: <netdev@...r.kernel.org>
CC: Cristian Bercaru <cristian.bercaru@...escale.com>,
<madalin.bucur@...escale.com>, <shaohui.xie@...escale.com>,
<shruti@...escale.com>
Subject: [PATCH] net: phy: unmask link partner capabilities
From: Cristian Bercaru <cristian.bercaru@...escale.com>
Masking the link partner's capabilities with local capabilities can be
misleading in autonegotiation scenarios such as PAUSE frame
autonegotiation.
Therefore, this patch unmasks the link partner's capabilities.
Signed-off-by: Cristian Bercaru <cristian.bercaru@...escale.com>
---
drivers/net/phy/phy_device.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index a70b604..e57825e6 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -967,8 +967,6 @@ int genphy_read_status(struct phy_device *phydev)
if (adv < 0)
return adv;
- lpa &= adv;
-
phydev->speed = SPEED_10;
phydev->duplex = DUPLEX_HALF;
phydev->pause = 0;
@@ -979,13 +977,13 @@ int genphy_read_status(struct phy_device *phydev)
if (lpagb & LPA_1000FULL)
phydev->duplex = DUPLEX_FULL;
- } else if (lpa & (LPA_100FULL | LPA_100HALF)) {
+ } else if (lpa & adv & (LPA_100FULL | LPA_100HALF)) {
phydev->speed = SPEED_100;
- if (lpa & LPA_100FULL)
+ if (lpa & adv & LPA_100FULL)
phydev->duplex = DUPLEX_FULL;
} else
- if (lpa & LPA_10FULL)
+ if (lpa & adv & LPA_10FULL)
phydev->duplex = DUPLEX_FULL;
if (phydev->duplex == DUPLEX_FULL) {
--
1.7.11.7
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists