diff options
author | Ben Hutchings <bhutchings@solarflare.com> | 2009-10-23 04:31:20 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-10-24 07:27:07 -0400 |
commit | 63f1988419ccaa544d1d31aadc1dd309f6471ffe (patch) | |
tree | d973e7c103b9453063d02c8895f629c4ca692a33 /drivers/net/sfc/net_driver.h | |
parent | 6d51d307509f98f070688b4bff1d0f7462c4d3ec (diff) |
sfc: Move all TX DMA length limiting into tx.c
Replace the duplicated logic in efx_enqueue_skb() and
efx_tx_queue_insert() with an inline function, efx_max_tx_len().
Remove the failed attempt at abstracting hardware-specifics and put
all the magic numbers in efx_max_tx_len().
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, 0 insertions, 4 deletions
diff --git a/drivers/net/sfc/net_driver.h b/drivers/net/sfc/net_driver.h index 3afadc621a81..91d8952e7884 100644 --- a/drivers/net/sfc/net_driver.h +++ b/drivers/net/sfc/net_driver.h | |||
@@ -870,8 +870,6 @@ static inline const char *efx_dev_name(struct efx_nic *efx) | |||
870 | * @evq_ptr_tbl_base: Event queue pointer table base address | 870 | * @evq_ptr_tbl_base: Event queue pointer table base address |
871 | * @evq_rptr_tbl_base: Event queue read-pointer table base address | 871 | * @evq_rptr_tbl_base: Event queue read-pointer table base address |
872 | * @max_dma_mask: Maximum possible DMA mask | 872 | * @max_dma_mask: Maximum possible DMA mask |
873 | * @tx_dma_mask: TX DMA mask | ||
874 | * @bug5391_mask: Address mask for bug 5391 workaround | ||
875 | * @rx_buffer_padding: Padding added to each RX buffer | 873 | * @rx_buffer_padding: Padding added to each RX buffer |
876 | * @max_interrupt_mode: Highest capability interrupt mode supported | 874 | * @max_interrupt_mode: Highest capability interrupt mode supported |
877 | * from &enum efx_init_mode. | 875 | * from &enum efx_init_mode. |
@@ -888,8 +886,6 @@ struct efx_nic_type { | |||
888 | unsigned int evq_rptr_tbl_base; | 886 | unsigned int evq_rptr_tbl_base; |
889 | 887 | ||
890 | u64 max_dma_mask; | 888 | u64 max_dma_mask; |
891 | unsigned int tx_dma_mask; | ||
892 | unsigned bug5391_mask; | ||
893 | 889 | ||
894 | unsigned int rx_buffer_padding; | 890 | unsigned int rx_buffer_padding; |
895 | unsigned int max_interrupt_mode; | 891 | unsigned int max_interrupt_mode; |