summaryrefslogtreecommitdiffstats
path: root/Documentation/networking/netdevices.txt
diff options
context:
space:
mode:
authorBen Hutchings <bhutchings@solarflare.com>2012-04-05 14:39:30 +0000
committerDavid S. Miller <davem@davemloft.net>2012-04-06 02:43:12 -0400
commit04fd3d3515612b71f96b851db7888bfe58ef2142 (patch)
tree9ad160f25a0b293d5d4d561d02b75314fef88273 /Documentation/networking/netdevices.txt
parent93b6a3adbd159174772702744b142d60e3891dfa (diff)
downloadlinux-04fd3d3515612b71f96b851db7888bfe58ef2142.tar.bz2
doc, net: Update documentation of synchronisation for TX multiqueue
Commits e308a5d806c852f56590ffdd3834d0df0cbed8d7 ('netdev: Add netdev->addr_list_lock protection.') and e8a0464cc950972824e2e128028ae3db666ec1ed ('netdev: Allocate multiple queues for TX.') introduced more fine-grained locks. Signed-off-by: Ben Hutchings <bhutchings@solarflare.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'Documentation/networking/netdevices.txt')
-rw-r--r--Documentation/networking/netdevices.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/networking/netdevices.txt b/Documentation/networking/netdevices.txt
index 336fe8e85b20..b107733cfdcd 100644
--- a/Documentation/networking/netdevices.txt
+++ b/Documentation/networking/netdevices.txt
@@ -65,7 +65,7 @@ dev->get_stats:
Context: nominally process, but don't sleep inside an rwlock
dev->hard_start_xmit:
- Synchronization: netif_tx_lock spinlock.
+ Synchronization: __netif_tx_lock spinlock.
When the driver sets NETIF_F_LLTX in dev->features this will be
called without holding netif_tx_lock. In this case the driver
@@ -87,12 +87,12 @@ dev->hard_start_xmit:
Only valid when NETIF_F_LLTX is set.
dev->tx_timeout:
- Synchronization: netif_tx_lock spinlock.
+ Synchronization: netif_tx_lock spinlock; all TX queues frozen.
Context: BHs disabled
Notes: netif_queue_stopped() is guaranteed true
dev->set_rx_mode:
- Synchronization: netif_tx_lock spinlock.
+ Synchronization: netif_addr_lock spinlock.
Context: BHs disabled
struct napi_struct synchronization rules