diff options
| author | Stephen Hemminger <shemminger@linux-foundation.org> | 2007-05-23 00:39:52 +0200 |
|---|---|---|
| committer | Adrian Bunk <bunk@stusta.de> | 2007-05-23 00:39:52 +0200 |
| commit | 57b0c610b81c58e77299c7a0d96048a593183a98 (patch) | |
| tree | 1ff937facddb0124610bf17ad9e76e105ed01adc | |
| parent | dffa279e109e2462068b8a22f3783e3cbd930d81 (diff) | |
[IPV6]: Track device renames in snmp6.
When network device's are renamed, the IPV6 snmp6 code
gets confused. It doesn't track name changes so it will OOPS
when network device's are removed.
The fix is trivial, just unregister/re-register in notify handler.
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
| -rw-r--r-- | net/ipv6/addrconf.c | 6 | ||||
| -rw-r--r-- | net/ipv6/proc.c | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index eef33b83a406..7d0e86d53953 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -2262,8 +2262,9 @@ static int addrconf_notify(struct notifier_block *this, unsigned long event, break; case NETDEV_CHANGENAME: -#ifdef CONFIG_SYSCTL if (idev) { + snmp6_unregister_dev(idev); +#ifdef CONFIG_SYSCTL addrconf_sysctl_unregister(&idev->cnf); neigh_sysctl_unregister(idev->nd_parms); neigh_sysctl_register(dev, idev->nd_parms, @@ -2271,8 +2272,9 @@ static int addrconf_notify(struct notifier_block *this, unsigned long event, &ndisc_ifinfo_sysctl_change, NULL); addrconf_sysctl_register(idev, &idev->cnf); - } #endif + snmp6_register_dev(idev); + } break; }; diff --git a/net/ipv6/proc.c b/net/ipv6/proc.c index 4238b1ed8860..4111a211258b 100644 --- a/net/ipv6/proc.c +++ b/net/ipv6/proc.c @@ -226,6 +226,7 @@ int snmp6_unregister_dev(struct inet6_dev *idev) return -EINVAL; remove_proc_entry(idev->stats.proc_dir_entry->name, proc_net_devsnmp6); + idev->stats.proc_dir_entry = NULL; return 0; } |