summaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000/e1000.h
diff options
context:
space:
mode:
authorAlexander Duyck <alexander.h.duyck@intel.com>2009-01-21 14:42:47 -0800
committerDavid S. Miller <davem@davemloft.net>2009-01-21 14:42:47 -0800
commit8017943e6b177f117e4be71f09a38e2c9fd56193 (patch)
treec61a4441836fe59b087c81986fc551516722a013 /drivers/net/e1000/e1000.h
parent921aa7491201b238589ab9f94184b18a1ed00e12 (diff)
downloadblackbird-obmc-linux-8017943e6b177f117e4be71f09a38e2c9fd56193.tar.gz
blackbird-obmc-linux-8017943e6b177f117e4be71f09a38e2c9fd56193.zip
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.h2
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 {
/* array of buffer information structs */
struct e1000_buffer *buffer_info;
- spinlock_t tx_lock;
u16 tdh;
u16 tdt;
bool last_tx_tso;
@@ -238,7 +237,6 @@ struct e1000_adapter {
u16 link_speed;
u16 link_duplex;
spinlock_t stats_lock;
- spinlock_t tx_queue_lock;
unsigned int total_tx_bytes;
unsigned int total_tx_packets;
unsigned int total_rx_bytes;
OpenPOWER on IntegriCloud