diff options
| author | Ben Hutchings <bhutchings@solarflare.com> | 2009-11-29 16:08:41 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-30 02:23:53 +0100 |
| commit | e58f69f4082f60076885798fae8f3a17ea713bf6 (patch) | |
| tree | afd86e4023e266747c8f63d5369c268e1269ff22 /drivers/net/sfc/mdio_10g.c | |
| parent | sfc: Fold falcon_probe_nic_variant() into falcon_probe_nic() (diff) | |
| download | linux-e58f69f4082f60076885798fae8f3a17ea713bf6.tar.xz linux-e58f69f4082f60076885798fae8f3a17ea713bf6.zip | |
sfc: Extend loopback mode enumeration
New NICs and PHYs support a wider variety of loopback modes.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/sfc/mdio_10g.c')
| -rw-r--r-- | drivers/net/sfc/mdio_10g.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/sfc/mdio_10g.c b/drivers/net/sfc/mdio_10g.c index 1f62a5c002fd..e6ca988abbb5 100644 --- a/drivers/net/sfc/mdio_10g.c +++ b/drivers/net/sfc/mdio_10g.c @@ -173,7 +173,7 @@ bool efx_mdio_links_ok(struct efx_nic *efx, unsigned int mmd_mask) * of mmd's */ if (LOOPBACK_INTERNAL(efx)) return true; - else if (efx->loopback_mode == LOOPBACK_NETWORK) + else if (LOOPBACK_MASK(efx) & LOOPBACKS_WS) return false; else if (efx_phy_mode_disabled(efx->phy_mode)) return false; @@ -210,7 +210,7 @@ void efx_mdio_phy_reconfigure(struct efx_nic *efx) efx->loopback_mode == LOOPBACK_PCS); efx_mdio_set_flag(efx, MDIO_MMD_PHYXS, MDIO_CTRL1, MDIO_PHYXS_CTRL1_LOOPBACK, - efx->loopback_mode == LOOPBACK_NETWORK); + efx->loopback_mode == LOOPBACK_PHYXS_WS); } static void efx_mdio_set_mmd_lpower(struct efx_nic *efx, |