diff options
author | Ben Hutchings <bhutchings@solarflare.com> | 2008-12-13 00:50:08 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-12-13 00:58:17 -0500 |
commit | 177dfcd80f28f8fbc3e22c2d8b24d21cb86f1d97 (patch) | |
tree | a6e5e9949f388d48ac20c4efbb2811762ac5f9d4 /drivers/net/sfc/sfe4001.c | |
parent | 356eebb2b3af24cc701823f1e025f04eef333239 (diff) |
sfc: Add support for sub-10G speeds
The SFC4000 has a separate MAC for use at sub-10G speeds. Introduce
an efx_mac_operations structure with implementations for the two MACs.
Switch between the MACs as necessary.
PHY settings are independent of the MAC, so add get_settings() and
set_settings() to efx_phy_operations. Also add macs field to indicate
which MACs the PHY is connected to.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/sfc/sfe4001.c')
-rw-r--r-- | drivers/net/sfc/sfe4001.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/sfc/sfe4001.c b/drivers/net/sfc/sfe4001.c index aa576c559ec8..af652844baee 100644 --- a/drivers/net/sfc/sfe4001.c +++ b/drivers/net/sfc/sfe4001.c | |||
@@ -176,7 +176,7 @@ static int sfe4001_check_hw(struct efx_nic *efx) | |||
176 | s32 status; | 176 | s32 status; |
177 | 177 | ||
178 | /* If XAUI link is up then do not monitor */ | 178 | /* If XAUI link is up then do not monitor */ |
179 | if (EFX_WORKAROUND_7884(efx) && falcon_xaui_link_ok(efx)) | 179 | if (EFX_WORKAROUND_7884(efx) && efx->mac_up) |
180 | return 0; | 180 | return 0; |
181 | 181 | ||
182 | /* Check the powered status of the PHY. Lack of power implies that | 182 | /* Check the powered status of the PHY. Lack of power implies that |