Skip to contentSkip to conversation

phy layer: fix phy_mii_ioctl for autonegotiation

PATCH Applied Domen Puncer 2 participants 2 messages Aug 7, 2007

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 phy layer: fix phy_mii_ioctl for autonegotiation

Fix a thinko (?) in setting phydev->autoneg.

---
This fixes my "mii.h -> ethtool.h advertising #defines". I'm not sure why and how they're translated, but it does work now. Maybe they're just ignored, since mii-tool directly reads and writes MII registers.

 drivers/net/phy/phy.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/phy/phy.c +2 -2
Index: work-powerpc.git/drivers/net/phy/phy.c
===================================================================
@@ -261,7 +261,7 @@ void phy_sanitize_settings(struct phy_de
 
 	/* Sanitize settings based on PHY capabilities */
 	if ((features & SUPPORTED_Autoneg) == 0)
-		phydev->autoneg = 0;
+		phydev->autoneg = AUTONEG_DISABLE;
 
 	idx = phy_find_valid(phy_find_setting(phydev->speed, phydev->duplex),
 			features);
@@ -374,7 +374,7 @@ int phy_mii_ioctl(struct phy_device *phy
 		if (mii_data->phy_id == phydev->addr) {
 			switch(mii_data->reg_num) {
 			case MII_BMCR:
-				if (val & (BMCR_RESET|BMCR_ANENABLE))
+				if ((val & (BMCR_RESET|BMCR_ANENABLE)) == 0)
 					phydev->autoneg = AUTONEG_DISABLE;
 				else
 					phydev->autoneg = AUTONEG_ENABLE;
Applied
#1 lore raw
Quoted 12 lines · Domen Puncer

Fix a thinko (?) in setting phydev->autoneg.

---
This fixes my "mii.h -> ethtool.h advertising #defines". I'm not sure why and how they're translated, but it does work now. Maybe they're just ignored, since mii-tool directly reads and writes MII registers.

Quoted 2 lines
 drivers/net/phy/phy.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

applied