diff options
author | Domen Puncer <domen.puncer@telargo.com> | 2007-08-07 12:12:41 +0200 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-08-07 17:34:13 -0400 |
commit | 163642a24a44d7b1d1e1b3cb8da25a142a919e24 (patch) | |
tree | cb19da0a3161e82f70e127c66f04193790284308 /drivers | |
parent | 44a5b3d539893988dc6b63054c59d031df1fd7bc (diff) | |
download | blackbird-op-linux-163642a24a44d7b1d1e1b3cb8da25a142a919e24.tar.gz blackbird-op-linux-163642a24a44d7b1d1e1b3cb8da25a142a919e24.zip |
phy layer: fix phy_mii_ioctl for autonegotiation
Fix a thinko (?) in setting phydev->autoneg.
Signed-off-by: Domen Puncer <domen.puncer@telargo.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/phy/phy.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index f71dab347667..e323efd4ed18 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -261,7 +261,7 @@ void phy_sanitize_settings(struct phy_device *phydev) /* 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 *phydev, 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; |