diff options
| author |   Gatis Peisenieks <gatis@mikrotik.com> | 2021-05-27 17:44:22 +0300 |
|---|---|---|
| committer |   Jakub Kicinski <kuba@kernel.org> | 2021-05-27 16:06:46 -0700 |
| commit | 8042824a3c0bcf7fc96c62b932b44b0b54714642 (patch) | |
| tree | e65f284d7f81accf45dc2c44bbb95864ccaa356e /drivers/net/ethernet/atheros/atl1c/atl1c.h | |
| parent | atl1c: move tx napi into tpd_ring (diff) | |
| download | linux-dev-8042824a3c0bcf7fc96c62b932b44b0b54714642.tar.xz linux-dev-8042824a3c0bcf7fc96c62b932b44b0b54714642.zip | |
atl1c: prepare for multiple rx queues
Move napi and other per queue members into per rx queue struct.
Allocate max rx queues that any hw supported by the driver might have.
Patch that actually enables multiple rx queues will follow.
Signed-off-by: Gatis Peisenieks <gatis@mikrotik.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/atheros/atl1c/atl1c.h')
| -rw-r--r-- | drivers/net/ethernet/atheros/atl1c/atl1c.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c.h b/drivers/net/ethernet/atheros/atl1c/atl1c.h index 2c8b72a7db03..9edf90e1f028 100644 --- a/drivers/net/ethernet/atheros/atl1c/atl1c.h +++ b/drivers/net/ethernet/atheros/atl1c/atl1c.h @@ -500,21 +500,23 @@ struct atl1c_rfd_ring { /* receive return descriptor (rrd) ring */ struct atl1c_rrd_ring { + struct atl1c_adapter *adapter; void *desc; /* descriptor ring virtual address */ dma_addr_t dma; /* descriptor ring physical address */ + u16 num; u16 size; /* descriptor ring length in bytes */ u16 count; /* number of descriptors in the ring */ u16 next_to_use; u16 next_to_clean; + struct napi_struct napi; + struct page *rx_page; + unsigned int rx_page_offset; }; /* board specific private data structure */ struct atl1c_adapter { struct net_device *netdev; struct pci_dev *pdev; - struct napi_struct napi; - struct page *rx_page; - unsigned int rx_page_offset; unsigned int rx_frag_size; struct atl1c_hw hw; struct atl1c_hw_stats hw_stats; @@ -545,8 +547,8 @@ struct atl1c_adapter { /* All Descriptor memory */ struct atl1c_ring_header ring_header; struct atl1c_tpd_ring tpd_ring[AT_MAX_TRANSMIT_QUEUE]; - struct atl1c_rfd_ring rfd_ring; - struct atl1c_rrd_ring rrd_ring; + struct atl1c_rfd_ring rfd_ring[AT_MAX_RECEIVE_QUEUE]; + struct atl1c_rrd_ring rrd_ring[AT_MAX_RECEIVE_QUEUE]; u32 bd_number; /* board number;*/ }; |