diff options
| author | Steve Hodgson <shodgson@solarflare.com> | 2009-11-28 05:35:00 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-28 23:58:51 -0800 |
| commit | b895d73e9836fccc402e48a8f63e6805d2edc87b (patch) | |
| tree | be2adb58b8756e6f27666cf7bc4f24dbb0b23d23 /drivers/net/sfc/efx.c | |
| parent | ab86746175a5e1379abb9c7c38522af4d3176f57 (diff) | |
sfc: Always start Falcon using the XMAC
The strap bits are only important on Falcon A and all production
boards using it have fixed-speed 10G PHYs.
Replace dummy MAC operations with default MAC operations.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/sfc/efx.c')
| -rw-r--r-- | drivers/net/sfc/efx.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/net/sfc/efx.c b/drivers/net/sfc/efx.c index 6338ad8dbfb..bed45a59987 100644 --- a/drivers/net/sfc/efx.c +++ b/drivers/net/sfc/efx.c @@ -1891,10 +1891,6 @@ bool efx_port_dummy_op_poll(struct efx_nic *efx) return false; } -static struct efx_mac_operations efx_dummy_mac_operations = { - .reconfigure = efx_port_dummy_op_void, -}; - static struct efx_phy_operations efx_dummy_phy_operations = { .init = efx_port_dummy_op_int, .reconfigure = efx_port_dummy_op_void, @@ -1936,7 +1932,7 @@ static int efx_init_struct(struct efx_nic *efx, struct efx_nic_type *type, spin_lock_init(&efx->netif_stop_lock); spin_lock_init(&efx->stats_lock); mutex_init(&efx->mac_lock); - efx->mac_op = &efx_dummy_mac_operations; + efx->mac_op = type->default_mac_ops; efx->phy_op = &efx_dummy_phy_operations; efx->mdio.dev = net_dev; INIT_WORK(&efx->mac_work, efx_mac_work); |