Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22dd7495 authored by Jamal Hadi Salim's avatar Jamal Hadi Salim Committed by David S. Miller
Browse files

[NET]: migrate HARD_TX_LOCK to header file 



HARD_TX_LOCK micro is a nice aggregation that could be used
in other spots. move it to netdevice.h
Also makes sure the previously superflous cpu arguement is used.
Thanks to DaveM for the suggestions.

Signed-off-by: default avatarJamal Hadi Salim <hadi@cyberus.ca>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4885a504

include/linux/netdevice.h

+19 −2
Original line number Diff line number Diff line
@@ -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);

net/core/dev.c

+0 −12
Original line number Diff line number Diff line
@@ -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