summary refs log tree commit diff
path: root/drivers/net/sky2.h
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@osdl.org>2006-09-26 11:57:42 -0700
committerJeff Garzik <jeff@garzik.org>2006-09-27 17:56:31 -0400
commit2bb8c26242c2393b097a993ffe9b003ec9b85395 (patch)
tree3d800c046bbf663a31038605eb9d849b85b2eb66 /drivers/net/sky2.h
parent291ea6142b94cc3e3ae2216d3937a78697447471 (diff)
downloadlinux-2bb8c26242c2393b097a993ffe9b003ec9b85395.tar.gz
[PATCH] sky2: use netif_tx_lock instead of LLTX
Use the netdevice transmit lock via netif_tx_lock rather than putting
lock in device specific code and using lockless transmit.  The code is
cleaner using netif_tx_lock, and the performance is same.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/sky2.h')
-rw-r--r--drivers/net/sky2.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/sky2.h b/drivers/net/sky2.h
index c1e45123d44f..403486a3831d 100644
--- a/drivers/net/sky2.h
+++ b/drivers/net/sky2.h
@@ -1789,7 +1789,6 @@ struct sky2_port {
 	u32		     msg_enable;
 	spinlock_t	     phy_lock;
 
-	spinlock_t	     tx_lock  ____cacheline_aligned_in_smp;
 	struct tx_ring_info  *tx_ring;
 	struct sky2_tx_le    *tx_le;
 	u16		     tx_cons;		/* next le to check */