From d98337cf9734ea97a5446ee37161f16cc95806b1 Mon Sep 17 00:00:00 2001
From: Jamal Hadi Salim <hadi@cyberus.ca>
Date: Sun, 16 Sep 2007 14:40:49 -0700
Subject: [PATCH] --- yaml --- r: 66601 b: refs/heads/master c:
 22dd74950172dc8979576e2bef3b439f20ef0b05 h: refs/heads/master i:   66599:
 e64c3eddabdf68138a7e96c7fecc79982edabcee v: v3

---
 [refs]                          |  2 +-
 trunk/include/linux/netdevice.h | 21 +++++++++++++++++++--
 trunk/net/core/dev.c            | 12 ------------
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index eba29783cd30..9456baff0383 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4885a50476b95fa0f4caad179a80783508c2fe86
+refs/heads/master: 22dd74950172dc8979576e2bef3b439f20ef0b05
diff --git a/trunk/include/linux/netdevice.h b/trunk/include/linux/netdevice.h
index de387c5400b3..96964fb7478b 100644
--- a/trunk/include/linux/netdevice.h
+++ b/trunk/include/linux/netdevice.h
@@ -1265,10 +1265,15 @@ static inline void netif_rx_complete(struct net_device *dev,
  *
  * Get network device transmit lock
  */
-static inline void netif_tx_lock(struct net_device *dev)
+static inline void __netif_tx_lock(struct net_device *dev, int cpu)
 {
 	spin_lock(&dev->_xmit_lock);
-	dev->xmit_lock_owner = smp_processor_id();
+	dev->xmit_lock_owner = cpu;
+}
+
+static inline void netif_tx_lock(struct net_device *dev)
+{
+	__netif_tx_lock(dev, smp_processor_id());
 }
 
 static inline void netif_tx_lock_bh(struct net_device *dev)
@@ -1297,6 +1302,18 @@ static inline void netif_tx_unlock_bh(struct net_device *dev)
 	spin_unlock_bh(&dev->_xmit_lock);
 }
 
+#define HARD_TX_LOCK(dev, cpu) {			\
+	if ((dev->features & NETIF_F_LLTX) == 0) {	\
+		__netif_tx_lock(dev, cpu);			\
+	}						\
+}
+
+#define HARD_TX_UNLOCK(dev) {				\
+	if ((dev->features & NETIF_F_LLTX) == 0) {	\
+		netif_tx_unlock(dev);			\
+	}						\
+}
+
 static inline void netif_tx_disable(struct net_device *dev)
 {
 	netif_tx_lock_bh(dev);
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
index 666c112efb55..e9a6d93a194f 100644
--- a/trunk/net/core/dev.c
+++ b/trunk/net/core/dev.c
@@ -1574,18 +1574,6 @@ int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
 	return 0;
 }
 
-#define HARD_TX_LOCK(dev, cpu) {			\
-	if ((dev->features & NETIF_F_LLTX) == 0) {	\
-		netif_tx_lock(dev);			\
-	}						\
-}
-
-#define HARD_TX_UNLOCK(dev) {				\
-	if ((dev->features & NETIF_F_LLTX) == 0) {	\
-		netif_tx_unlock(dev);			\
-	}						\
-}
-
 /**
  *	dev_queue_xmit - transmit a buffer
  *	@skb: buffer to transmit