mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-07-07 15:01:44 +00:00
[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: Jamal Hadi Salim <hadi@cyberus.ca> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
4885a50476
commit
22dd749501
2 changed files with 19 additions and 14 deletions
|
@ -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);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue