1 files changed, 14 insertions, 13 deletions

diff --git a/Documentation/networking/netdevices.txt b/Documentation/networking/netdevices.txt
index c7ecc708049..87b3d15f523 100644
--- a/Documentation/networking/netdevices.txt
+++ b/Documentation/networking/netdevices.txt
@@ -47,32 +47,33 @@ packets is preferred.
 
 struct net_device synchronization rules
 =======================================
-ndo_open:
+dev->open:
         Synchronization: rtnl_lock() semaphore.
         Context: process
 
-ndo_stop:
+dev->stop:
         Synchronization: rtnl_lock() semaphore.
         Context: process
-        Note: netif_running() is guaranteed false
+        Note1: netif_running() is guaranteed false
+        Note2: dev->poll() is guaranteed to be stopped
 
-ndo_do_ioctl:
+dev->do_ioctl:
         Synchronization: rtnl_lock() semaphore.
         Context: process
 
-ndo_get_stats:
+dev->get_stats:
         Synchronization: dev_base_lock rwlock.
         Context: nominally process, but don't sleep inside an rwlock
 
-ndo_start_xmit:
-        Synchronization: __netif_tx_lock spinlock.
+dev->hard_start_xmit:
+        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
         has to lock by itself when needed. It is recommended to use a try lock
         for this and return NETDEV_TX_LOCKED when the spin lock fails.
         The locking there should also properly protect against 
-        set_rx_mode. Note that the use of NETIF_F_LLTX is deprecated.
+        set_multicast_list. Note that the use of NETIF_F_LLTX is deprecated.
         Don't use it for new drivers.
 
         Context: Process with BHs disabled or BH (timer),
@@ -86,20 +87,20 @@ ndo_start_xmit:
         o NETDEV_TX_LOCKED Locking failed, please retry quickly.
           Only valid when NETIF_F_LLTX is set.
 
-ndo_tx_timeout:
-        Synchronization: netif_tx_lock spinlock; all TX queues frozen.
+dev->tx_timeout:
+        Synchronization: netif_tx_lock spinlock.
         Context: BHs disabled
         Notes: netif_queue_stopped() is guaranteed true
 
-ndo_set_rx_mode:
-        Synchronization: netif_addr_lock spinlock.
+dev->set_multicast_list:
+        Synchronization: netif_tx_lock spinlock.
         Context: BHs disabled
 
 struct napi_struct synchronization rules
 ========================================
 napi->poll:
         Synchronization: NAPI_STATE_SCHED bit in napi->state.  Device
-                driver's ndo_stop method will invoke napi_disable() on
+                driver's dev->close method will invoke napi_disable() on
                 all NAPI instances which will do a sleeping poll on the
                 NAPI_STATE_SCHED napi->state bit, waiting for all pending
                 NAPI activity to cease.