---

yaml --- r: 298782 b: refs/heads/master c: 04fd3d3 h: refs/heads/master v: v3
git-mirror · Apr 6, 2012 · a21cebd · a21cebd
1 parent bc83abc
commit a21cebd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 93b6a3adbd159174772702744b142d60e3891dfa
+refs/heads/master: 04fd3d3515612b71f96b851db7888bfe58ef2142
diff --git a/trunk/Documentation/networking/netdevices.txt b/trunk/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