Skip to content

Commit 04fd3d3

Browse files
Ben Hutchingsdavem330
authored andcommitted
doc, net: Update documentation of synchronisation for TX multiqueue
Commits e308a5d ('netdev: Add netdev->addr_list_lock protection.') and e8a0464 ('netdev: Allocate multiple queues for TX.') introduced more fine-grained locks. Signed-off-by: Ben Hutchings <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 93b6a3a commit 04fd3d3

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Documentation/networking/netdevices.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ dev->get_stats:
6565
Context: nominally process, but don't sleep inside an rwlock
6666

6767
dev->hard_start_xmit:
68-
Synchronization: netif_tx_lock spinlock.
68+
Synchronization: __netif_tx_lock spinlock.
6969

7070
When the driver sets NETIF_F_LLTX in dev->features this will be
7171
called without holding netif_tx_lock. In this case the driver
@@ -87,12 +87,12 @@ dev->hard_start_xmit:
8787
Only valid when NETIF_F_LLTX is set.
8888

8989
dev->tx_timeout:
90-
Synchronization: netif_tx_lock spinlock.
90+
Synchronization: netif_tx_lock spinlock; all TX queues frozen.
9191
Context: BHs disabled
9292
Notes: netif_queue_stopped() is guaranteed true
9393

9494
dev->set_rx_mode:
95-
Synchronization: netif_tx_lock spinlock.
95+
Synchronization: netif_addr_lock spinlock.
9696
Context: BHs disabled
9797

9898
struct napi_struct synchronization rules

0 commit comments

Comments
 (0)