aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/sfc/mdio_10g.c
diff options
context:
space:
mode:
authorBen Hutchings <bhutchings@solarflare.com>2009-11-29 10:08:41 -0500
committerDavid S. Miller <davem@davemloft.net>2009-11-29 20:23:53 -0500
commite58f69f4082f60076885798fae8f3a17ea713bf6 (patch)
treeafd86e4023e266747c8f63d5369c268e1269ff22 /drivers/net/sfc/mdio_10g.c
parent5784946068f81c5f1cce2906a7655652e34f44f3 (diff)
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.c4
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)
173 * of mmd's */ 173 * of mmd's */
174 if (LOOPBACK_INTERNAL(efx)) 174 if (LOOPBACK_INTERNAL(efx))
175 return true; 175 return true;
176 else if (efx->loopback_mode == LOOPBACK_NETWORK) 176 else if (LOOPBACK_MASK(efx) & LOOPBACKS_WS)
177 return false; 177 return false;
178 else if (efx_phy_mode_disabled(efx->phy_mode)) 178 else if (efx_phy_mode_disabled(efx->phy_mode))
179 return false; 179 return false;
@@ -210,7 +210,7 @@ void efx_mdio_phy_reconfigure(struct efx_nic *efx)
210 efx->loopback_mode == LOOPBACK_PCS); 210 efx->loopback_mode == LOOPBACK_PCS);
211 efx_mdio_set_flag(efx, MDIO_MMD_PHYXS, 211 efx_mdio_set_flag(efx, MDIO_MMD_PHYXS,
212 MDIO_CTRL1, MDIO_PHYXS_CTRL1_LOOPBACK, 212 MDIO_CTRL1, MDIO_PHYXS_CTRL1_LOOPBACK,
213 efx->loopback_mode == LOOPBACK_NETWORK); 213 efx->loopback_mode == LOOPBACK_PHYXS_WS);
214} 214}
215 215
216static void efx_mdio_set_mmd_lpower(struct efx_nic *efx, 216static void efx_mdio_set_mmd_lpower(struct efx_nic *efx,