diff options
author | Ben Hutchings <bhutchings@solarflare.com> | 2013-01-29 18:33:14 -0500 |
---|---|---|
committer | Ben Hutchings <bhutchings@solarflare.com> | 2013-03-07 15:22:06 -0500 |
commit | 272baeeb6a98f5f746c2eeab4973c2df89e9d7ea (patch) | |
tree | c894c86c4331a376e728fdffb5cdbcd301158628 /drivers/net/ethernet/sfc/net_driver.h | |
parent | 80c2e716d555912168f93853f96a24d0de75897b (diff) |
sfc: Properly distinguish RX buffer and DMA lengths
Replace efx_nic::rx_buffer_len with efx_nic::rx_dma_len, the maximum
RX DMA length.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Diffstat (limited to 'drivers/net/ethernet/sfc/net_driver.h')
-rw-r--r-- | drivers/net/ethernet/sfc/net_driver.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/ethernet/sfc/net_driver.h b/drivers/net/ethernet/sfc/net_driver.h index f74411fc000c..fc6770e07d5a 100644 --- a/drivers/net/ethernet/sfc/net_driver.h +++ b/drivers/net/ethernet/sfc/net_driver.h | |||
@@ -669,8 +669,7 @@ struct vfdi_status; | |||
669 | * @n_channels: Number of channels in use | 669 | * @n_channels: Number of channels in use |
670 | * @n_rx_channels: Number of channels used for RX (= number of RX queues) | 670 | * @n_rx_channels: Number of channels used for RX (= number of RX queues) |
671 | * @n_tx_channels: Number of channels used for TX | 671 | * @n_tx_channels: Number of channels used for TX |
672 | * @rx_buffer_len: RX buffer length, including start alignment but excluding | 672 | * @rx_dma_len: Current maximum RX DMA length |
673 | * any metadata | ||
674 | * @rx_buffer_order: Order (log2) of number of pages for each RX buffer | 673 | * @rx_buffer_order: Order (log2) of number of pages for each RX buffer |
675 | * @rx_hash_key: Toeplitz hash key for RSS | 674 | * @rx_hash_key: Toeplitz hash key for RSS |
676 | * @rx_indir_table: Indirection table for RSS | 675 | * @rx_indir_table: Indirection table for RSS |
@@ -786,7 +785,7 @@ struct efx_nic { | |||
786 | unsigned rss_spread; | 785 | unsigned rss_spread; |
787 | unsigned tx_channel_offset; | 786 | unsigned tx_channel_offset; |
788 | unsigned n_tx_channels; | 787 | unsigned n_tx_channels; |
789 | unsigned int rx_buffer_len; | 788 | unsigned int rx_dma_len; |
790 | unsigned int rx_buffer_order; | 789 | unsigned int rx_buffer_order; |
791 | u8 rx_hash_key[40]; | 790 | u8 rx_hash_key[40]; |
792 | u32 rx_indir_table[128]; | 791 | u32 rx_indir_table[128]; |