summaryrefslogtreecommitdiff
path: root/drivers/net/sfc/falcon_xmac.c
diff options
context:
space:
mode:
authorBen Hutchings <bhutchings@solarflare.com>2009-11-29 18:08:41 +0300
committerDavid S. Miller <davem@davemloft.net>2009-11-30 04:23:53 +0300
commite58f69f4082f60076885798fae8f3a17ea713bf6 (patch)
treeafd86e4023e266747c8f63d5369c268e1269ff22 /drivers/net/sfc/falcon_xmac.c
parent5784946068f81c5f1cce2906a7655652e34f44f3 (diff)
downloadlinux-e58f69f4082f60076885798fae8f3a17ea713bf6.tar.xz
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/falcon_xmac.c')
-rw-r--r--drivers/net/sfc/falcon_xmac.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/sfc/falcon_xmac.c b/drivers/net/sfc/falcon_xmac.c
index 898afc1b5ef1..83da79279a95 100644
--- a/drivers/net/sfc/falcon_xmac.c
+++ b/drivers/net/sfc/falcon_xmac.c
@@ -249,7 +249,7 @@ static bool falcon_check_xaui_link_up(struct efx_nic *efx, int tries)
{
bool mac_up = falcon_xaui_link_ok(efx);
- if ((efx->loopback_mode == LOOPBACK_NETWORK) ||
+ if (LOOPBACK_MASK(efx) & LOOPBACKS_EXTERNAL(efx) & LOOPBACKS_WS ||
efx_phy_mode_disabled(efx->phy_mode))
/* XAUI link is expected to be down */
return mac_up;