diff options
author | Ben Hutchings <bhutchings@solarflare.com> | 2012-04-05 10:39:30 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-04-06 02:43:12 -0400 |
commit | 04fd3d3515612b71f96b851db7888bfe58ef2142 (patch) | |
tree | 9ad160f25a0b293d5d4d561d02b75314fef88273 | |
parent | 93b6a3adbd159174772702744b142d60e3891dfa (diff) |
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>
-rw-r--r-- | Documentation/networking/netdevices.txt | 6 |
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: | |||
65 | Context: nominally process, but don't sleep inside an rwlock | 65 | Context: nominally process, but don't sleep inside an rwlock |
66 | 66 | ||
67 | dev->hard_start_xmit: | 67 | dev->hard_start_xmit: |
68 | Synchronization: netif_tx_lock spinlock. | 68 | Synchronization: __netif_tx_lock spinlock. |
69 | 69 | ||
70 | When the driver sets NETIF_F_LLTX in dev->features this will be | 70 | When the driver sets NETIF_F_LLTX in dev->features this will be |
71 | called without holding netif_tx_lock. In this case the driver | 71 | called without holding netif_tx_lock. In this case the driver |
@@ -87,12 +87,12 @@ dev->hard_start_xmit: | |||
87 | Only valid when NETIF_F_LLTX is set. | 87 | Only valid when NETIF_F_LLTX is set. |
88 | 88 | ||
89 | dev->tx_timeout: | 89 | dev->tx_timeout: |
90 | Synchronization: netif_tx_lock spinlock. | 90 | Synchronization: netif_tx_lock spinlock; all TX queues frozen. |
91 | Context: BHs disabled | 91 | Context: BHs disabled |
92 | Notes: netif_queue_stopped() is guaranteed true | 92 | Notes: netif_queue_stopped() is guaranteed true |
93 | 93 | ||
94 | dev->set_rx_mode: | 94 | dev->set_rx_mode: |
95 | Synchronization: netif_tx_lock spinlock. | 95 | Synchronization: netif_addr_lock spinlock. |
96 | Context: BHs disabled | 96 | Context: BHs disabled |
97 | 97 | ||
98 | struct napi_struct synchronization rules | 98 | struct napi_struct synchronization rules |