diff options
author | Alexander Duyck <alexander.h.duyck@intel.com> | 2009-01-21 17:42:47 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-01-21 17:42:47 -0500 |
commit | 8017943e6b177f117e4be71f09a38e2c9fd56193 (patch) | |
tree | c61a4441836fe59b087c81986fc551516722a013 /drivers/net/e1000/e1000.h | |
parent | 921aa7491201b238589ab9f94184b18a1ed00e12 (diff) |
e1000: drop lltx, remove unnecessary lock
LLTX is deprecated, don't use it. This completes the removal of LLTX from
the Intel Network drivers.
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/e1000/e1000.h')
-rw-r--r-- | drivers/net/e1000/e1000.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/e1000/e1000.h b/drivers/net/e1000/e1000.h index f5581de04757..e9a416f40162 100644 --- a/drivers/net/e1000/e1000.h +++ b/drivers/net/e1000/e1000.h | |||
@@ -182,7 +182,6 @@ struct e1000_tx_ring { | |||
182 | /* array of buffer information structs */ | 182 | /* array of buffer information structs */ |
183 | struct e1000_buffer *buffer_info; | 183 | struct e1000_buffer *buffer_info; |
184 | 184 | ||
185 | spinlock_t tx_lock; | ||
186 | u16 tdh; | 185 | u16 tdh; |
187 | u16 tdt; | 186 | u16 tdt; |
188 | bool last_tx_tso; | 187 | bool last_tx_tso; |
@@ -238,7 +237,6 @@ struct e1000_adapter { | |||
238 | u16 link_speed; | 237 | u16 link_speed; |
239 | u16 link_duplex; | 238 | u16 link_duplex; |
240 | spinlock_t stats_lock; | 239 | spinlock_t stats_lock; |
241 | spinlock_t tx_queue_lock; | ||
242 | unsigned int total_tx_bytes; | 240 | unsigned int total_tx_bytes; |
243 | unsigned int total_tx_packets; | 241 | unsigned int total_tx_packets; |
244 | unsigned int total_rx_bytes; | 242 | unsigned int total_rx_bytes; |