diff options
| author | Ben Hutchings <bhutchings@solarflare.com> | 2009-10-23 08:32:04 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-10-24 04:27:14 -0700 |
| commit | 0484e0db7c4293d6202cff730ee359d8a7a6b085 (patch) | |
| tree | d9eb02ef14b821323dc2548e303a8360aaf7357d /drivers/net/sfc/net_driver.h | |
| parent | 59cf09cc2fdbb651193e95d7c3335e751b8f748d (diff) | |
| download | linux-0484e0db7c4293d6202cff730ee359d8a7a6b085.tar.gz linux-0484e0db7c4293d6202cff730ee359d8a7a6b085.tar.bz2 linux-0484e0db7c4293d6202cff730ee359d8a7a6b085.zip | |
sfc: Move shared members of struct falcon_nic_data into struct efx_nic
These will also be used with Siena NICs.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/sfc/net_driver.h')
| -rw-r--r-- | drivers/net/sfc/net_driver.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/sfc/net_driver.h b/drivers/net/sfc/net_driver.h index 8e7b854c11aa..25b793327c1b 100644 --- a/drivers/net/sfc/net_driver.h +++ b/drivers/net/sfc/net_driver.h @@ -688,10 +688,13 @@ union efx_multicast_hash { * @tx_queue: TX DMA queues * @rx_queue: RX DMA queues * @channel: Channels + * @next_buffer_table: First available buffer table id * @n_rx_queues: Number of RX queues * @n_channels: Number of channels in use * @rx_buffer_len: RX buffer length * @rx_buffer_order: Order (log2) of number of pages for each RX buffer + * @int_error_count: Number of internal errors seen recently + * @int_error_expire: Time at which error count will be expired * @irq_status: Interrupt status buffer * @last_irq_cpu: Last CPU to handle interrupt. * This register is written with the SMP processor ID whenever an @@ -775,11 +778,15 @@ struct efx_nic { struct efx_rx_queue rx_queue[EFX_MAX_RX_QUEUES]; struct efx_channel channel[EFX_MAX_CHANNELS]; + unsigned next_buffer_table; int n_rx_queues; int n_channels; unsigned int rx_buffer_len; unsigned int rx_buffer_order; + unsigned int_error_count; + unsigned long int_error_expire; + struct efx_buffer irq_status; volatile signed int last_irq_cpu; |