aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/sfc/efx.c
diff options
context:
space:
mode:
authorSteve Hodgson <shodgson@solarflare.com>2009-11-28 00:35:00 -0500
committerDavid S. Miller <davem@davemloft.net>2009-11-29 02:58:51 -0500
commitb895d73e9836fccc402e48a8f63e6805d2edc87b (patch)
treebe2adb58b8756e6f27666cf7bc4f24dbb0b23d23 /drivers/net/sfc/efx.c
parentab86746175a5e1379abb9c7c38522af4d3176f57 (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.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/net/sfc/efx.c b/drivers/net/sfc/efx.c
index 6338ad8dbfbb..bed45a599874 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)
1891 return false; 1891 return false;
1892} 1892}
1893 1893
1894static struct efx_mac_operations efx_dummy_mac_operations = {
1895 .reconfigure = efx_port_dummy_op_void,
1896};
1897
1898static struct efx_phy_operations efx_dummy_phy_operations = { 1894static struct efx_phy_operations efx_dummy_phy_operations = {
1899 .init = efx_port_dummy_op_int, 1895 .init = efx_port_dummy_op_int,
1900 .reconfigure = efx_port_dummy_op_void, 1896 .reconfigure = efx_port_dummy_op_void,
@@ -1936,7 +1932,7 @@ static int efx_init_struct(struct efx_nic *efx, struct efx_nic_type *type,
1936 spin_lock_init(&efx->netif_stop_lock); 1932 spin_lock_init(&efx->netif_stop_lock);
1937 spin_lock_init(&efx->stats_lock); 1933 spin_lock_init(&efx->stats_lock);
1938 mutex_init(&efx->mac_lock); 1934 mutex_init(&efx->mac_lock);
1939 efx->mac_op = &efx_dummy_mac_operations; 1935 efx->mac_op = type->default_mac_ops;
1940 efx->phy_op = &efx_dummy_phy_operations; 1936 efx->phy_op = &efx_dummy_phy_operations;
1941 efx->mdio.dev = net_dev; 1937 efx->mdio.dev = net_dev;
1942 INIT_WORK(&efx->mac_work, efx_mac_work); 1938 INIT_WORK(&efx->mac_work, efx_mac_work);