diff options
Diffstat (limited to 'drivers/net/sfc/nic.h')
-rw-r--r-- | drivers/net/sfc/nic.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/net/sfc/nic.h b/drivers/net/sfc/nic.h index eb0586925b51..d9de1b647d41 100644 --- a/drivers/net/sfc/nic.h +++ b/drivers/net/sfc/nic.h | |||
@@ -1,7 +1,7 @@ | |||
1 | /**************************************************************************** | 1 | /**************************************************************************** |
2 | * Driver for Solarflare Solarstorm network controllers and boards | 2 | * Driver for Solarflare Solarstorm network controllers and boards |
3 | * Copyright 2005-2006 Fen Systems Ltd. | 3 | * Copyright 2005-2006 Fen Systems Ltd. |
4 | * Copyright 2006-2009 Solarflare Communications Inc. | 4 | * Copyright 2006-2011 Solarflare Communications Inc. |
5 | * | 5 | * |
6 | * This program is free software; you can redistribute it and/or modify it | 6 | * This program is free software; you can redistribute it and/or modify it |
7 | * under the terms of the GNU General Public License version 2 as published | 7 | * under the terms of the GNU General Public License version 2 as published |
@@ -142,20 +142,14 @@ static inline struct falcon_board *falcon_board(struct efx_nic *efx) | |||
142 | 142 | ||
143 | /** | 143 | /** |
144 | * struct siena_nic_data - Siena NIC state | 144 | * struct siena_nic_data - Siena NIC state |
145 | * @fw_version: Management controller firmware version | ||
146 | * @fw_build: Firmware build number | ||
147 | * @mcdi: Management-Controller-to-Driver Interface | 145 | * @mcdi: Management-Controller-to-Driver Interface |
148 | * @wol_filter_id: Wake-on-LAN packet filter id | 146 | * @wol_filter_id: Wake-on-LAN packet filter id |
149 | */ | 147 | */ |
150 | struct siena_nic_data { | 148 | struct siena_nic_data { |
151 | u64 fw_version; | ||
152 | u32 fw_build; | ||
153 | struct efx_mcdi_iface mcdi; | 149 | struct efx_mcdi_iface mcdi; |
154 | int wol_filter_id; | 150 | int wol_filter_id; |
155 | }; | 151 | }; |
156 | 152 | ||
157 | extern void siena_print_fwver(struct efx_nic *efx, char *buf, size_t len); | ||
158 | |||
159 | extern struct efx_nic_type falcon_a1_nic_type; | 153 | extern struct efx_nic_type falcon_a1_nic_type; |
160 | extern struct efx_nic_type falcon_b0_nic_type; | 154 | extern struct efx_nic_type falcon_b0_nic_type; |
161 | extern struct efx_nic_type siena_a0_nic_type; | 155 | extern struct efx_nic_type siena_a0_nic_type; |
@@ -194,7 +188,6 @@ extern void efx_nic_eventq_read_ack(struct efx_channel *channel); | |||
194 | /* MAC/PHY */ | 188 | /* MAC/PHY */ |
195 | extern void falcon_drain_tx_fifo(struct efx_nic *efx); | 189 | extern void falcon_drain_tx_fifo(struct efx_nic *efx); |
196 | extern void falcon_reconfigure_mac_wrapper(struct efx_nic *efx); | 190 | extern void falcon_reconfigure_mac_wrapper(struct efx_nic *efx); |
197 | extern int efx_nic_rx_xoff_thresh, efx_nic_rx_xon_thresh; | ||
198 | 191 | ||
199 | /* Interrupts and test events */ | 192 | /* Interrupts and test events */ |
200 | extern int efx_nic_init_interrupt(struct efx_nic *efx); | 193 | extern int efx_nic_init_interrupt(struct efx_nic *efx); |