2 files changed, 19 insertions, 14 deletions

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index de387c5400b3..96964fb7478b 100644
--- a/include/linux/netdevice.h
+++ b/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/net/core/dev.c b/net/core/dev.c
index 666c112efb55..e9a6d93a194f 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1574,18 +1574,6 @@ out_kfree_skb:
         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