diff options
| author | Ben Hutchings <bhutchings@solarflare.com> | 2008-12-26 22:49:25 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-12-26 22:49:25 +0100 |
| commit | 843813453f52e3378fc988c8364063fd4cb9d0e3 (patch) | |
| tree | d17c5d80afd77f58e95dccaff53d6e4c671b3fa6 /drivers | |
| parent | sfc: When disabling the NIC, close the device rather than unregistering it (diff) | |
| download | linux-843813453f52e3378fc988c8364063fd4cb9d0e3.tar.xz linux-843813453f52e3378fc988c8364063fd4cb9d0e3.zip | |
sfc: If AN is enabled, always read speed/duplex from the AN advertising bits
When AN is enabled and the link is down the speed/duplex control bits
will not be meaningful. Use the advertising bits instead, and mask
them with the LPA bits if and only if AN is complete (as before).
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/sfc/mdio_10g.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/drivers/net/sfc/mdio_10g.c b/drivers/net/sfc/mdio_10g.c index f131ad2b6832..f6a16428113d 100644 --- a/drivers/net/sfc/mdio_10g.c +++ b/drivers/net/sfc/mdio_10g.c @@ -368,13 +368,16 @@ void mdio_clause45_get_settings_ext(struct efx_nic *efx, } else ecmd->autoneg = AUTONEG_DISABLE; - /* If AN is enabled and complete, report best common mode */ - if (ecmd->autoneg && - (mdio_clause45_read(efx, phy_id, MDIO_MMD_AN, MDIO_MMDREG_STAT1) & - (1 << MDIO_AN_STATUS_AN_DONE_LBN))) { - u32 common, lpa; - lpa = mdio_clause45_get_an(efx, MDIO_AN_LPA, xnp_lpa); - common = ecmd->advertising & lpa; + if (ecmd->autoneg) { + /* If AN is complete, report best common mode, + * otherwise report best advertised mode. */ + u32 common = ecmd->advertising; + if (mdio_clause45_read(efx, phy_id, MDIO_MMD_AN, + MDIO_MMDREG_STAT1) & + (1 << MDIO_AN_STATUS_AN_DONE_LBN)) { + common &= mdio_clause45_get_an(efx, MDIO_AN_LPA, + xnp_lpa); + } if (common & ADVERTISED_10000baseT_Full) { ecmd->speed = SPEED_10000; ecmd->duplex = DUPLEX_FULL; |