diff options
| author | Michael Chan <mchan@broadcom.com> | 2008-06-19 16:38:19 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-06-19 16:38:19 -0700 |
| commit | bb4f98abf590cf9899017f14f1a54984f02a0009 (patch) | |
| tree | 602da9b7cab22a16f2f1fd77f5db51a3de44b085 /drivers/net/bnx2.h | |
| parent | 35e9010b22503f42cbf88144ffe1feff90ea3835 (diff) | |
| download | lwn-bb4f98abf590cf9899017f14f1a54984f02a0009.tar.gz lwn-bb4f98abf590cf9899017f14f1a54984f02a0009.zip | |
bnx2: Put rx ring variables in a separate struct.
In preparation for multi-ring support, rx ring variables are now put
in a separate bnx2_rx_ring_info struct. With MSI-X, we can support
multiple rx rings.
The functions to allocate/free rx memory and to initialize rx rings
are now modified to handle multiple rings.
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: Benjamin Li <benli@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bnx2.h')
| -rw-r--r-- | drivers/net/bnx2.h | 38 |
1 files changed, 24 insertions, 14 deletions
diff --git a/drivers/net/bnx2.h b/drivers/net/bnx2.h index e4f0fb45bc6d..1c5ce80f6269 100644 --- a/drivers/net/bnx2.h +++ b/drivers/net/bnx2.h @@ -6479,6 +6479,7 @@ struct l2_fhdr { #define TX_CID 16 #define TX_TSS_CID 32 #define RX_CID 0 +#define RX_RSS_CID 4 #define MB_TX_CID_ADDR MB_GET_CID_ADDR(TX_CID) #define MB_RX_CID_ADDR MB_GET_CID_ADDR(RX_CID) @@ -6584,6 +6585,27 @@ struct bnx2_tx_ring_info { dma_addr_t tx_desc_mapping; }; +struct bnx2_rx_ring_info { + u32 rx_prod_bseq; + u16 rx_prod; + u16 rx_cons; + + u32 rx_bidx_addr; + u32 rx_bseq_addr; + u32 rx_pg_bidx_addr; + + u16 rx_pg_prod; + u16 rx_pg_cons; + + struct sw_bd *rx_buf_ring; + struct rx_bd *rx_desc_ring[MAX_RX_RINGS]; + struct sw_pg *rx_pg_ring; + struct rx_bd *rx_pg_desc_ring[MAX_RX_PG_RINGS]; + + dma_addr_t rx_desc_mapping[MAX_RX_RINGS]; + dma_addr_t rx_pg_desc_mapping[MAX_RX_PG_RINGS]; +}; + struct bnx2_napi { struct napi_struct napi ____cacheline_aligned; struct bnx2 *bp; @@ -6592,13 +6614,7 @@ struct bnx2_napi { u32 last_status_idx; u32 int_num; - u32 rx_prod_bseq; - u16 rx_prod; - u16 rx_cons; - - u16 rx_pg_prod; - u16 rx_pg_cons; - + struct bnx2_rx_ring_info rx_ring; struct bnx2_tx_ring_info tx_ring; }; @@ -6642,11 +6658,6 @@ struct bnx2 { u32 rx_csum; - struct sw_bd *rx_buf_ring; - struct rx_bd *rx_desc_ring[MAX_RX_RINGS]; - struct sw_pg *rx_pg_ring; - struct rx_bd *rx_pg_desc_ring[MAX_RX_PG_RINGS]; - /* TX constants */ int tx_ring_size; u32 tx_wake_thresh; @@ -6727,11 +6738,9 @@ struct bnx2 { int rx_max_ring; int rx_ring_size; - dma_addr_t rx_desc_mapping[MAX_RX_RINGS]; int rx_max_pg_ring; int rx_pg_ring_size; - dma_addr_t rx_pg_desc_mapping[MAX_RX_PG_RINGS]; u16 tx_quick_cons_trip; u16 tx_quick_cons_trip_int; @@ -6814,6 +6823,7 @@ struct bnx2 { int irq_nvecs; u8 num_tx_rings; + u8 num_rx_rings; }; #define REG_RD(bp, offset) \ |