diff options
| author | David S. Miller <davem@davemloft.net> | 2021-02-11 00:30:12 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-02-11 00:30:12 +0300 |
| commit | dc9d87581d464e7b7d38853d6904b70b6c920d99 (patch) | |
| tree | 15aa27fefb867814899c0a0c194adf327675ba10 /include/linux/netdevice.h | |
| parent | de1db4a6ed6241e34cab0e5059d4b56f6bae39b9 (diff) | |
| parent | 291009f656e8eaebbdfd3a8d99f6b190a9ce9deb (diff) | |
| download | linux-dc9d87581d464e7b7d38853d6904b70b6c920d99.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Diffstat (limited to 'include/linux/netdevice.h')
| -rw-r--r-- | include/linux/netdevice.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 1340327f7abf..a20310ff5083 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -4336,6 +4336,7 @@ static inline void netif_tx_disable(struct net_device *dev) local_bh_disable(); cpu = smp_processor_id(); + spin_lock(&dev->tx_global_lock); for (i = 0; i < dev->num_tx_queues; i++) { struct netdev_queue *txq = netdev_get_tx_queue(dev, i); @@ -4343,6 +4344,7 @@ static inline void netif_tx_disable(struct net_device *dev) netif_tx_stop_queue(txq); __netif_tx_unlock(txq); } + spin_unlock(&dev->tx_global_lock); local_bh_enable(); } |