diff options
author | Jody McIntyre <scjody@modernduck.com> | 2006-01-05 14:03:40 +0100 |
---|---|---|
committer | Jody McIntyre <scjody@modernduck.com> | 2006-01-05 14:03:40 +0100 |
commit | 0a75c23a009ff65f651532cecc16675d05f4de37 (patch) | |
tree | bdcd6158758fe1810f0ddddb80d2816779518688 /drivers/net/e1000/e1000.h | |
parent | Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git (diff) | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6 (diff) | |
download | linux-0a75c23a009ff65f651532cecc16675d05f4de37.tar.xz linux-0a75c23a009ff65f651532cecc16675d05f4de37.zip |
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/net/e1000/e1000.h')
-rw-r--r-- | drivers/net/e1000/e1000.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/e1000/e1000.h b/drivers/net/e1000/e1000.h index 3f653a93e1bc..e02e9ba2e18b 100644 --- a/drivers/net/e1000/e1000.h +++ b/drivers/net/e1000/e1000.h @@ -188,11 +188,13 @@ struct e1000_tx_ring { /* array of buffer information structs */ struct e1000_buffer *buffer_info; - struct e1000_buffer previous_buffer_info; spinlock_t tx_lock; uint16_t tdh; uint16_t tdt; uint64_t pkt; + + boolean_t last_tx_tso; + }; struct e1000_rx_ring { |