diff options
| author | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2006-01-12 16:50:25 -0800 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-01-17 07:40:10 -0500 |
| commit | 545c67c0a3550545fe50d28c874b0664bc5dc882 (patch) | |
| tree | e0ffa97a1137bccbdd0574434bf481cb6e52a56d /drivers/net/e1000/e1000.h | |
| parent | 9a3056da0d7fde1e19e806824c41857b239954ed (diff) | |
| download | kernel_samsung_tuna-545c67c0a3550545fe50d28c874b0664bc5dc882.zip kernel_samsung_tuna-545c67c0a3550545fe50d28c874b0664bc5dc882.tar.gz kernel_samsung_tuna-545c67c0a3550545fe50d28c874b0664bc5dc882.tar.bz2 | |
[PATCH] e1000: General Fixes
These fixes update the TX and RX ring structures. Prepare driver for up-coming fixes.
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: John Ronciak <john.ronciak@intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'drivers/net/e1000/e1000.h')
| -rw-r--r-- | drivers/net/e1000/e1000.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/net/e1000/e1000.h b/drivers/net/e1000/e1000.h index e02e9ba..c87187d 100644 --- a/drivers/net/e1000/e1000.h +++ b/drivers/net/e1000/e1000.h @@ -191,7 +191,6 @@ struct e1000_tx_ring { spinlock_t tx_lock; uint16_t tdh; uint16_t tdt; - uint64_t pkt; boolean_t last_tx_tso; @@ -216,9 +215,14 @@ struct e1000_rx_ring { struct e1000_ps_page *ps_page; struct e1000_ps_page_dma *ps_page_dma; + struct sk_buff *rx_skb_top; + struct sk_buff *rx_skb_prev; + + /* cpu for rx queue */ + int cpu; + uint16_t rdh; uint16_t rdt; - uint64_t pkt; }; #define E1000_DESC_UNUSED(R) \ |