From ba9bad4ebc0adc9b3ba0d3e302f817adb5b93fa3 Mon Sep 17 00:00:00 2001 From: Antonio Quartulli Date: Wed, 22 Aug 2012 00:42:40 +0200 Subject: [PATCH] --- yaml --- r: 327595 b: refs/heads/master c: c70437289c989d865633486fc24c61441ba32b9e h: refs/heads/master i: 327593: 433eb5eb16680bc69e7f95c96dbfd9fb4f1bce06 327591: 8e2f3549c32e94e00d9748f0de634f30abfb1fc8 v: v3 --- [refs] | 2 +- trunk/include/net/netns/packet.h | 2 +- trunk/net/batman-adv/bridge_loop_avoidance.h | 3 +-- trunk/net/core/dev.c | 9 ++------- trunk/net/core/fib_rules.c | 3 ++- trunk/net/ipv4/devinet.c | 6 +++++- trunk/net/ipv4/fib_frontend.c | 7 +++++-- trunk/net/ipv6/addrconf.c | 6 +++++- 8 files changed, 22 insertions(+), 16 deletions(-) diff --git a/[refs] b/[refs] index 3e0a7e2018ac..a9ebb9c5980f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f63c45e0e63fd1bccb6d021fe4de20f82114a024 +refs/heads/master: c70437289c989d865633486fc24c61441ba32b9e diff --git a/trunk/include/net/netns/packet.h b/trunk/include/net/netns/packet.h index 17ec2b95c062..4780b080a436 100644 --- a/trunk/include/net/netns/packet.h +++ b/trunk/include/net/netns/packet.h @@ -5,7 +5,7 @@ #define __NETNS_PACKET_H__ #include -#include +#include struct netns_packet { struct mutex sklist_lock; diff --git a/trunk/net/batman-adv/bridge_loop_avoidance.h b/trunk/net/batman-adv/bridge_loop_avoidance.h index 563cfbf94a7f..3f0dfa2f6d7c 100644 --- a/trunk/net/batman-adv/bridge_loop_avoidance.h +++ b/trunk/net/batman-adv/bridge_loop_avoidance.h @@ -41,8 +41,7 @@ void batadv_bla_free(struct batadv_priv *bat_priv); #else /* ifdef CONFIG_BATMAN_ADV_BLA */ static inline int batadv_bla_rx(struct batadv_priv *bat_priv, - struct sk_buff *skb, short vid, - bool is_bcast) + struct sk_buff *skb, short vid, bool is_bcast) { return 0; } diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c index bc857fead8c8..0640d2a859c6 100644 --- a/trunk/net/core/dev.c +++ b/trunk/net/core/dev.c @@ -1466,7 +1466,8 @@ EXPORT_SYMBOL(unregister_netdevice_notifier); int call_netdevice_notifiers(unsigned long val, struct net_device *dev) { - ASSERT_RTNL(); + if (val != NETDEV_UNREGISTER_FINAL) + ASSERT_RTNL(); return raw_notifier_call_chain(&netdev_chain, val, dev); } EXPORT_SYMBOL(call_netdevice_notifiers); @@ -5781,11 +5782,7 @@ static void netdev_wait_allrefs(struct net_device *dev) /* Rebroadcast unregister notification */ call_netdevice_notifiers(NETDEV_UNREGISTER, dev); - - __rtnl_unlock(); rcu_barrier(); - rtnl_lock(); - call_netdevice_notifiers(NETDEV_UNREGISTER_FINAL, dev); if (test_bit(__LINK_STATE_LINKWATCH_PENDING, &dev->state)) { @@ -5858,9 +5855,7 @@ void netdev_run_todo(void) = list_first_entry(&list, struct net_device, todo_list); list_del(&dev->todo_list); - rtnl_lock(); call_netdevice_notifiers(NETDEV_UNREGISTER_FINAL, dev); - __rtnl_unlock(); if (unlikely(dev->reg_state != NETREG_UNREGISTERING)) { pr_err("network todo '%s' but state %d\n", diff --git a/trunk/net/core/fib_rules.c b/trunk/net/core/fib_rules.c index ab7db83236c9..585093755c23 100644 --- a/trunk/net/core/fib_rules.c +++ b/trunk/net/core/fib_rules.c @@ -711,15 +711,16 @@ static int fib_rules_event(struct notifier_block *this, unsigned long event, struct net *net = dev_net(dev); struct fib_rules_ops *ops; - ASSERT_RTNL(); switch (event) { case NETDEV_REGISTER: + ASSERT_RTNL(); list_for_each_entry(ops, &net->rules_ops, list) attach_rules(&ops->rules_list, dev); break; case NETDEV_UNREGISTER: + ASSERT_RTNL(); list_for_each_entry(ops, &net->rules_ops, list) detach_rules(&ops->rules_list, dev); break; diff --git a/trunk/net/ipv4/devinet.c b/trunk/net/ipv4/devinet.c index adf273f8ad2e..6a5e6e4b142c 100644 --- a/trunk/net/ipv4/devinet.c +++ b/trunk/net/ipv4/devinet.c @@ -1147,8 +1147,12 @@ static int inetdev_event(struct notifier_block *this, unsigned long event, void *ptr) { struct net_device *dev = ptr; - struct in_device *in_dev = __in_dev_get_rtnl(dev); + struct in_device *in_dev; + if (event == NETDEV_UNREGISTER_FINAL) + goto out; + + in_dev = __in_dev_get_rtnl(dev); ASSERT_RTNL(); if (!in_dev) { diff --git a/trunk/net/ipv4/fib_frontend.c b/trunk/net/ipv4/fib_frontend.c index acdee325d972..fd7d9ae64f16 100644 --- a/trunk/net/ipv4/fib_frontend.c +++ b/trunk/net/ipv4/fib_frontend.c @@ -1050,6 +1050,9 @@ static int fib_netdev_event(struct notifier_block *this, unsigned long event, vo return NOTIFY_DONE; } + if (event == NETDEV_UNREGISTER_FINAL) + return NOTIFY_DONE; + in_dev = __in_dev_get_rtnl(dev); switch (event) { @@ -1061,14 +1064,14 @@ static int fib_netdev_event(struct notifier_block *this, unsigned long event, vo fib_sync_up(dev); #endif atomic_inc(&net->ipv4.dev_addr_genid); - rt_cache_flush(net, -1); + rt_cache_flush(dev_net(dev), -1); break; case NETDEV_DOWN: fib_disable_ip(dev, 0, 0); break; case NETDEV_CHANGEMTU: case NETDEV_CHANGE: - rt_cache_flush(net, 0); + rt_cache_flush(dev_net(dev), 0); break; } return NOTIFY_DONE; diff --git a/trunk/net/ipv6/addrconf.c b/trunk/net/ipv6/addrconf.c index 6bc85f7c31e3..e581009cb09e 100644 --- a/trunk/net/ipv6/addrconf.c +++ b/trunk/net/ipv6/addrconf.c @@ -2566,10 +2566,14 @@ static int addrconf_notify(struct notifier_block *this, unsigned long event, void *data) { struct net_device *dev = (struct net_device *) data; - struct inet6_dev *idev = __in6_dev_get(dev); + struct inet6_dev *idev; int run_pending = 0; int err; + if (event == NETDEV_UNREGISTER_FINAL) + return NOTIFY_DONE; + + idev = __in6_dev_get(dev); switch (event) { case NETDEV_REGISTER: if (!idev && dev->mtu >= IPV6_MIN_MTU) {