diff options
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 { | |||
299 | * | 299 | * |
300 | * @efx: Associated Efx NIC | 300 | * @efx: Associated Efx NIC |
301 | * @channel: Channel instance number | 301 | * @channel: Channel instance number |
302 | * @name: Name for channel and IRQ | ||
303 | * @enabled: Channel enabled indicator | 302 | * @enabled: Channel enabled indicator |
304 | * @irq: IRQ number (MSI and MSI-X only) | 303 | * @irq: IRQ number (MSI and MSI-X only) |
305 | * @irq_moderation: IRQ moderation value (in hardware ticks) | 304 | * @irq_moderation: IRQ moderation value (in hardware ticks) |
@@ -333,7 +332,6 @@ enum efx_rx_alloc_method { | |||
333 | struct efx_channel { | 332 | struct efx_channel { |
334 | struct efx_nic *efx; | 333 | struct efx_nic *efx; |
335 | int channel; | 334 | int channel; |
336 | char name[IFNAMSIZ + 6]; | ||
337 | bool enabled; | 335 | bool enabled; |
338 | int irq; | 336 | int irq; |
339 | unsigned int irq_moderation; | 337 | unsigned int irq_moderation; |
@@ -644,6 +642,7 @@ union efx_multicast_hash { | |||
644 | * @tx_queue: TX DMA queues | 642 | * @tx_queue: TX DMA queues |
645 | * @rx_queue: RX DMA queues | 643 | * @rx_queue: RX DMA queues |
646 | * @channel: Channels | 644 | * @channel: Channels |
645 | * @channel_name: Names for channels and their IRQs | ||
647 | * @rxq_entries: Size of receive queues requested by user. | 646 | * @rxq_entries: Size of receive queues requested by user. |
648 | * @txq_entries: Size of transmit queues requested by user. | 647 | * @txq_entries: Size of transmit queues requested by user. |
649 | * @next_buffer_table: First available buffer table id | 648 | * @next_buffer_table: First available buffer table id |
@@ -730,6 +729,7 @@ struct efx_nic { | |||
730 | enum reset_type reset_pending; | 729 | enum reset_type reset_pending; |
731 | 730 | ||
732 | struct efx_channel *channel[EFX_MAX_CHANNELS]; | 731 | struct efx_channel *channel[EFX_MAX_CHANNELS]; |
732 | char channel_name[IFNAMSIZ + 6][EFX_MAX_CHANNELS]; | ||
733 | 733 | ||
734 | unsigned rxq_entries; | 734 | unsigned rxq_entries; |
735 | unsigned txq_entries; | 735 | unsigned txq_entries; |