diff options
| author | Ben Hutchings <bhutchings@solarflare.com> | 2012-04-05 10:39:47 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-06 02:43:12 -0400 |
| commit | b3cf65457fc0c8d183bdb9bc4358e5706aa63cc5 (patch) | |
| tree | ca499f8c186b35d7ae035810f4592e783c8ce0d0 /Documentation/networking/netdevices.txt | |
| parent | 04fd3d3515612b71f96b851db7888bfe58ef2142 (diff) | |
doc, net: Update netdev operation names
Commits d314774cf2cd5dfeb39a00d37deee65d4c627927 ('netdev: network
device operations infrastructure') and
008298231abbeb91bc7be9e8b078607b816d1a4a ('netdev: add more functions
to netdevice ops') moved and renamed net device operation pointers.
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.txt | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Documentation/networking/netdevices.txt b/Documentation/networking/netdevices.txt index b107733cfdcd..c7ecc7080494 100644 --- a/Documentation/networking/netdevices.txt +++ b/Documentation/networking/netdevices.txt | |||
| @@ -47,24 +47,24 @@ packets is preferred. | |||
| 47 | 47 | ||
| 48 | struct net_device synchronization rules | 48 | struct net_device synchronization rules |
| 49 | ======================================= | 49 | ======================================= |
| 50 | dev->open: | 50 | ndo_open: |
| 51 | Synchronization: rtnl_lock() semaphore. | 51 | Synchronization: rtnl_lock() semaphore. |
| 52 | Context: process | 52 | Context: process |
| 53 | 53 | ||
| 54 | dev->stop: | 54 | ndo_stop: |
| 55 | Synchronization: rtnl_lock() semaphore. | 55 | Synchronization: rtnl_lock() semaphore. |
| 56 | Context: process | 56 | Context: process |
| 57 | Note: netif_running() is guaranteed false | 57 | Note: netif_running() is guaranteed false |
| 58 | 58 | ||
| 59 | dev->do_ioctl: | 59 | ndo_do_ioctl: |
| 60 | Synchronization: rtnl_lock() semaphore. | 60 | Synchronization: rtnl_lock() semaphore. |
| 61 | Context: process | 61 | Context: process |
| 62 | 62 | ||
| 63 | dev->get_stats: | 63 | ndo_get_stats: |
| 64 | Synchronization: dev_base_lock rwlock. | 64 | Synchronization: dev_base_lock rwlock. |
| 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 | ndo_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 |
| @@ -86,12 +86,12 @@ dev->hard_start_xmit: | |||
| 86 | o NETDEV_TX_LOCKED Locking failed, please retry quickly. | 86 | o NETDEV_TX_LOCKED Locking failed, please retry quickly. |
| 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 | ndo_tx_timeout: |
| 90 | Synchronization: netif_tx_lock spinlock; all TX queues frozen. | 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 | ndo_set_rx_mode: |
| 95 | Synchronization: netif_addr_lock spinlock. | 95 | Synchronization: netif_addr_lock spinlock. |
| 96 | Context: BHs disabled | 96 | Context: BHs disabled |
| 97 | 97 | ||
| @@ -99,7 +99,7 @@ struct napi_struct synchronization rules | |||
| 99 | ======================================== | 99 | ======================================== |
| 100 | napi->poll: | 100 | napi->poll: |
| 101 | Synchronization: NAPI_STATE_SCHED bit in napi->state. Device | 101 | Synchronization: NAPI_STATE_SCHED bit in napi->state. Device |
| 102 | driver's dev->close method will invoke napi_disable() on | 102 | driver's ndo_stop method will invoke napi_disable() on |
| 103 | all NAPI instances which will do a sleeping poll on the | 103 | all NAPI instances which will do a sleeping poll on the |
| 104 | NAPI_STATE_SCHED napi->state bit, waiting for all pending | 104 | NAPI_STATE_SCHED napi->state bit, waiting for all pending |
| 105 | NAPI activity to cease. | 105 | NAPI activity to cease. |