aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/tg3.h
diff options
context:
space:
mode:
authorMatt Carlson <mcarlson@broadcom.com>2011-07-27 10:20:46 -0400
committerDavid S. Miller <davem@davemloft.net>2011-07-28 01:39:31 -0400
commitdf8944cf5cd3794c46e95e0404038376ee7f8dda (patch)
tree874ad0e2e40510bcc619af76a3faf55c9e587a55 /drivers/net/tg3.h
parentbca0beb9363f8487ac902931a50eb00180a2d14a (diff)
tg3: Reintroduce tg3_tx_ring_info
The following patches will require the use of an additional flag in the ring_info structure. The use of this flag is tx path specific, so this patch defines a specialized ring_info structure. Signed-off-by: Matt Carlson <mcarlson@broadcom.com> Reviewed-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/tg3.h')
-rw-r--r--drivers/net/tg3.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h
index 691539ba17b..f6986ca50d8 100644
--- a/drivers/net/tg3.h
+++ b/drivers/net/tg3.h
@@ -2652,6 +2652,11 @@ struct ring_info {
2652 DEFINE_DMA_UNMAP_ADDR(mapping); 2652 DEFINE_DMA_UNMAP_ADDR(mapping);
2653}; 2653};
2654 2654
2655struct tg3_tx_ring_info {
2656 struct sk_buff *skb;
2657 DEFINE_DMA_UNMAP_ADDR(mapping);
2658};
2659
2655struct tg3_link_config { 2660struct tg3_link_config {
2656 /* Describes what we're trying to get. */ 2661 /* Describes what we're trying to get. */
2657 u32 advertising; 2662 u32 advertising;
@@ -2816,7 +2821,7 @@ struct tg3_napi {
2816 u32 last_tx_cons; 2821 u32 last_tx_cons;
2817 u32 prodmbox; 2822 u32 prodmbox;
2818 struct tg3_tx_buffer_desc *tx_ring; 2823 struct tg3_tx_buffer_desc *tx_ring;
2819 struct ring_info *tx_buffers; 2824 struct tg3_tx_ring_info *tx_buffers;
2820 2825
2821 dma_addr_t status_mapping; 2826 dma_addr_t status_mapping;
2822 dma_addr_t rx_rcb_mapping; 2827 dma_addr_t rx_rcb_mapping;