diff options
| author | Stephen Hemminger <shemminger@osdl.org> | 2005-12-09 11:35:01 -0800 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-12 15:27:20 -0500 |
| commit | 6cdbbdf3055f4657c9d6ccc79257bbcac1a9a1fc (patch) | |
| tree | c3910bd44972cb55e29a112fa932a35b17910373 /drivers/net/sky2.h | |
| parent | 734d18684695dd1c6a9527b50e01bba4acab4738 (diff) | |
| download | linux-6cdbbdf3055f4657c9d6ccc79257bbcac1a9a1fc.tar.gz linux-6cdbbdf3055f4657c9d6ccc79257bbcac1a9a1fc.tar.bz2 linux-6cdbbdf3055f4657c9d6ccc79257bbcac1a9a1fc.zip | |
[PATCH] sky2: tx/rx ring data structure split
Split Tx and Rx ring into two different data structures.
Tx needs the next value (to handle partial status), and
Rx always needs the mapaddr (to handle resubmitting same buffer).
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'drivers/net/sky2.h')
| -rw-r--r-- | drivers/net/sky2.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/net/sky2.h b/drivers/net/sky2.h index 1a91c2d4561c..95518921001c 100644 --- a/drivers/net/sky2.h +++ b/drivers/net/sky2.h @@ -1777,10 +1777,15 @@ struct sky2_status_le { u8 opcode; } __attribute((packed)); +struct tx_ring_info { + struct sk_buff *skb; + DECLARE_PCI_UNMAP_ADDR(mapaddr); + u16 idx; +}; + struct ring_info { struct sk_buff *skb; dma_addr_t mapaddr; - u16 idx; }; struct sky2_port { @@ -1790,7 +1795,7 @@ struct sky2_port { u32 msg_enable; spinlock_t tx_lock ____cacheline_aligned_in_smp; - struct ring_info *tx_ring; + struct tx_ring_info *tx_ring; struct sky2_tx_le *tx_le; u16 tx_cons; /* next le to check */ u16 tx_prod; /* next le to use */ |