diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-09 14:46:52 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-09 14:46:52 -0800 |
| commit | 38e5781bbf8e82c1635ea845e0d07b2228a5ac7a (patch) | |
| tree | 69ced9c509c864a67122c5e1337f14cd1d9e988d /include/linux/netdevice.h | |
| parent | 979ecef5b89a8003902299566d9cdc08de34a3ee (diff) | |
| parent | a8c1f65c79cbbb2f7da782d4c9d15639a9b94b27 (diff) | |
| download | linux-stable-38e5781bbf8e82c1635ea845e0d07b2228a5ac7a.tar.gz linux-stable-38e5781bbf8e82c1635ea845e0d07b2228a5ac7a.tar.bz2 linux-stable-38e5781bbf8e82c1635ea845e0d07b2228a5ac7a.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
igmp: Avoid zero delay when receiving odd mixture of IGMP queries
netdev: make net_device_ops const
bcm63xx: make ethtool_ops const
usbnet: make ethtool_ops const
net: Fix build with INET disabled.
net: introduce netif_addr_lock_nested() and call if when appropriate
net: correct lock name in dev_[uc/mc]_sync documentations.
net: sk_update_clone is only used in net/core/sock.c
8139cp: fix missing napi_gro_flush.
pktgen: set correct max and min in pktgen_setup_inject()
smsc911x: Unconditionally include linux/smscphy.h in smsc911x.h
asix: fix infinite loop in rx_fixup()
net: Default UDP and UNIX diag to 'n'.
r6040: fix typo in use of MCR0 register bits
net: fix sock_clone reference mismatch with tcp memcontrol
Diffstat (limited to 'include/linux/netdevice.h')
| -rw-r--r-- | include/linux/netdevice.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 4c06cc0f194b..0eac07c95255 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -2450,6 +2450,11 @@ static inline void netif_addr_lock(struct net_device *dev) spin_lock(&dev->addr_list_lock); } +static inline void netif_addr_lock_nested(struct net_device *dev) +{ + spin_lock_nested(&dev->addr_list_lock, SINGLE_DEPTH_NESTING); +} + static inline void netif_addr_lock_bh(struct net_device *dev) { spin_lock_bh(&dev->addr_list_lock); |