aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/sfc/efx.c
diff options
context:
space:
mode:
authorBen Hutchings <bhutchings@solarflare.com>2009-11-23 11:05:45 -0500
committerDavid S. Miller <davem@davemloft.net>2009-11-24 13:58:48 -0500
commit3759433db2f7340ddec3abd55ebb1178600d014e (patch)
tree7681280a1dbac4a4898b1f615c0185b751eb853e /drivers/net/sfc/efx.c
parent5c16a96c4f31a0be287c5db3f36d1099dea9b2bd (diff)
sfc: Move struct falcon_board into struct falcon_nic_data
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.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/net/sfc/efx.c b/drivers/net/sfc/efx.c
index c9f80042669f..b91321126fe1 100644
--- a/drivers/net/sfc/efx.c
+++ b/drivers/net/sfc/efx.c
@@ -1878,7 +1878,7 @@ static struct pci_device_id efx_pci_table[] __devinitdata = {
1878 1878
1879/************************************************************************** 1879/**************************************************************************
1880 * 1880 *
1881 * Dummy PHY/MAC/Board operations 1881 * Dummy PHY/MAC operations
1882 * 1882 *
1883 * Can be used for some unimplemented operations 1883 * Can be used for some unimplemented operations
1884 * Needed so all function pointers are valid and do not have to be tested 1884 * Needed so all function pointers are valid and do not have to be tested
@@ -1908,14 +1908,6 @@ static struct efx_phy_operations efx_dummy_phy_operations = {
1908 .clear_interrupt = efx_port_dummy_op_void, 1908 .clear_interrupt = efx_port_dummy_op_void,
1909}; 1909};
1910 1910
1911static struct falcon_board efx_dummy_board_info = {
1912 .init = efx_port_dummy_op_int,
1913 .init_phy = efx_port_dummy_op_void,
1914 .set_id_led = efx_port_dummy_op_set_id_led,
1915 .monitor = efx_port_dummy_op_int,
1916 .fini = efx_port_dummy_op_void,
1917};
1918
1919/************************************************************************** 1911/**************************************************************************
1920 * 1912 *
1921 * Data housekeeping 1913 * Data housekeeping
@@ -1944,7 +1936,6 @@ static int efx_init_struct(struct efx_nic *efx, struct efx_nic_type *type,
1944 efx->state = STATE_INIT; 1936 efx->state = STATE_INIT;
1945 efx->reset_pending = RESET_TYPE_NONE; 1937 efx->reset_pending = RESET_TYPE_NONE;
1946 strlcpy(efx->name, pci_name(pci_dev), sizeof(efx->name)); 1938 strlcpy(efx->name, pci_name(pci_dev), sizeof(efx->name));
1947 efx->board_info = efx_dummy_board_info;
1948 1939
1949 efx->net_dev = net_dev; 1940 efx->net_dev = net_dev;
1950 efx->rx_checksum_enabled = true; 1941 efx->rx_checksum_enabled = true;