diff options
| author | Shan Lu <shanlu@cs.uiuc.edu> | 2007-03-06 11:42:03 +0100 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-04-28 17:00:57 +0200 |
| commit | 024a0a3cfb4c98cb3c6c81ec70672c6a925cf164 (patch) | |
| tree | 1ae2ab2e5f558bf3a8844a1b28d6ecbc3796b35e /drivers/net/phy | |
| parent | sk98lin: handle pci_enable_device() return value in skge_resume() (diff) | |
| download | linux-024a0a3cfb4c98cb3c6c81ec70672c6a925cf164.tar.xz linux-024a0a3cfb4c98cb3c6c81ec70672c6a925cf164.zip | |
network: add the missing phy_device speed information to phy_mii_ioctl
Function `phy_mii_ioctl' returns physical device's information based on
user requests. When requested to return the basic mode control register
information (BMCR), the original implementation only returns the physical
device's duplex information and forgets to return speed information, which
should not be because BMCR register is used to hold both duplex and speed
information.
The patch checks the BMCR value against speed-related flags and fills the
return structure's speed field accordingly.
Signed-off-by: Shan <shanlu@cs.uiuc.edu>
Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/phy')
| -rw-r--r-- | drivers/net/phy/phy.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index a602d06d85ab..eed433d6056a 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -382,6 +382,12 @@ int phy_mii_ioctl(struct phy_device *phydev, phydev->duplex = DUPLEX_FULL; else phydev->duplex = DUPLEX_HALF; + if ((!phydev->autoneg) && + (val & BMCR_SPEED1000)) + phydev->speed = SPEED_1000; + else if ((!phydev->autoneg) && + (val & BMCR_SPEED100)) + phydev->speed = SPEED_100; break; case MII_ADVERTISE: phydev->advertising = val; |