diff options
author | David S. Miller <davem@davemloft.net> | 2012-04-13 11:30:55 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-04-13 11:36:48 -0400 |
commit | e65ac4d54546b7d7514a9e8be1484c758f2b7ba3 (patch) | |
tree | 7b4bffabbe75739310e200360789e25732540da0 /net/core | |
parent | 816a7854d56f19aeba3c83e1ed8c2c0ef275365a (diff) | |
parent | d62f8dbb5b7771910f7c4657345df8ac93acb832 (diff) | |
download | linux-3.10-e65ac4d54546b7d7514a9e8be1484c758f2b7ba3.tar.gz linux-3.10-e65ac4d54546b7d7514a9e8be1484c758f2b7ba3.tar.bz2 linux-3.10-e65ac4d54546b7d7514a9e8be1484c758f2b7ba3.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Pull in the 'net' tree to get CAIF bug fixes upon which
the following set of CAIF feature patches depend.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
-rw-r--r-- | net/core/dev.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index c25d453b280..9bb8f87c4cd 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -1409,14 +1409,34 @@ EXPORT_SYMBOL(register_netdevice_notifier); * register_netdevice_notifier(). The notifier is unlinked into the * kernel structures and may then be reused. A negative errno code * is returned on a failure. + * + * After unregistering unregister and down device events are synthesized + * for all devices on the device list to the removed notifier to remove + * the need for special case cleanup code. */ int unregister_netdevice_notifier(struct notifier_block *nb) { + struct net_device *dev; + struct net *net; int err; rtnl_lock(); err = raw_notifier_chain_unregister(&netdev_chain, nb); + if (err) + goto unlock; + + for_each_net(net) { + for_each_netdev(net, dev) { + if (dev->flags & IFF_UP) { + nb->notifier_call(nb, NETDEV_GOING_DOWN, dev); + nb->notifier_call(nb, NETDEV_DOWN, dev); + } + nb->notifier_call(nb, NETDEV_UNREGISTER, dev); + nb->notifier_call(nb, NETDEV_UNREGISTER_BATCH, dev); + } + } +unlock: rtnl_unlock(); return err; } |