net: call call_netdevice_unregister_net_notifiers from unregister (48b3a137) · Commits · 戴 / test

The function does the same thing as the existing code, so rather call call_netdevice_unregister_net_notifiers() instead of code duplication. Signed-off-by:

Jiri Pirko <jiri@mellanox.com> Reviewed-by:

David Ahern <dsahern@gmail.com> Signed-off-by:

David S. Miller <davem@davemloft.net>

net/core/dev.c

+3 −11

Original line number	Diff line number	Diff line
		@@ -1764,7 +1764,6 @@ EXPORT_SYMBOL(register_netdevice_notifier);

		int unregister_netdevice_notifier(struct notifier_block *nb)
		{
		struct net_device *dev;
		struct net *net;
		int err;

		@@ -1775,16 +1774,9 @@ int unregister_netdevice_notifier(struct notifier_block *nb)
		if (err)
		goto unlock;

		for_each_net(net) {
		for_each_netdev(net, dev) {
		if (dev->flags & IFF_UP) {
		call_netdevice_notifier(nb, NETDEV_GOING_DOWN,
		dev);
		call_netdevice_notifier(nb, NETDEV_DOWN, dev);
		}
		call_netdevice_notifier(nb, NETDEV_UNREGISTER, dev);
		}
		}
		for_each_net(net)
		call_netdevice_unregister_net_notifiers(nb, net);

		unlock:
		rtnl_unlock();
		up_write(&pernet_ops_rwsem);

Admin message