diff options
| author | Ben Hutchings <bhutchings@solarflare.com> | 2010-09-10 08:42:33 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-09-10 21:27:34 +0200 |
| commit | 4642610c77b345130d6b5a08c75d23ad98601fd5 (patch) | |
| tree | bf6345d84e6dbd3a3d44ff4e050dc862f01a01fc /drivers/net/sfc/net_driver.h | |
| parent | sfc: Make the dmaq size a run-time setting (rather than compile-time) (diff) | |
| download | linux-4642610c77b345130d6b5a08c75d23ad98601fd5.tar.xz linux-4642610c77b345130d6b5a08c75d23ad98601fd5.zip | |
sfc: Allow changing the DMA ring sizes dynamically via ethtool
This requires some reorganisation of channel setup and teardown to
ensure that we can always roll-back a failed change.
Based on work by Steve Hodgson <shodgson@solarflare.com>
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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/sfc/net_driver.h b/drivers/net/sfc/net_driver.h index ac622ab72e11..4b3f680ba69e 100644 --- a/drivers/net/sfc/net_driver.h +++ b/drivers/net/sfc/net_driver.h @@ -299,7 +299,6 @@ enum efx_rx_alloc_method { * * @efx: Associated Efx NIC * @channel: Channel instance number - * @name: Name for channel and IRQ * @enabled: Channel enabled indicator * @irq: IRQ number (MSI and MSI-X only) * @irq_moderation: IRQ moderation value (in hardware ticks) @@ -333,7 +332,6 @@ enum efx_rx_alloc_method { struct efx_channel { struct efx_nic *efx; int channel; - char name[IFNAMSIZ + 6]; bool enabled; int irq; unsigned int irq_moderation; @@ -644,6 +642,7 @@ union efx_multicast_hash { * @tx_queue: TX DMA queues * @rx_queue: RX DMA queues * @channel: Channels + * @channel_name: Names for channels and their IRQs * @rxq_entries: Size of receive queues requested by user. * @txq_entries: Size of transmit queues requested by user. * @next_buffer_table: First available buffer table id @@ -730,6 +729,7 @@ struct efx_nic { enum reset_type reset_pending; struct efx_channel *channel[EFX_MAX_CHANNELS]; + char channel_name[IFNAMSIZ + 6][EFX_MAX_CHANNELS]; unsigned rxq_entries; unsigned txq_entries; |