diff options
| author | Stephen Hemminger <shemminger@linux-foundation.org> | 2007-04-26 16:42:47 -0700 |
|---|---|---|
| committer | Chris Wright <chrisw@sous-sol.org> | 2007-05-23 14:32:40 -0700 |
| commit | 55c2dacf601472524839376e2864c61fd8b9e0bd (patch) | |
| tree | ddbb24915fb32c7de9edba501de090a499c8f2bb /net | |
| parent | 8d8b10482fffcb72b15515231bb942e2ad6395c9 (diff) | |
| download | linux-55c2dacf601472524839376e2864c61fd8b9e0bd.tar.gz linux-55c2dacf601472524839376e2864c61fd8b9e0bd.tar.bz2 linux-55c2dacf601472524839376e2864c61fd8b9e0bd.zip | |
[PATCH] 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: Chris Wright <chrisw@sous-sol.org>
Diffstat (limited to 'net')
| -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 452a82ce4796..9b1ec9714ad6 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -2281,8 +2281,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, @@ -2290,8 +2291,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 fa3fb509f187..d57853daf874 100644 --- a/net/ipv6/proc.c +++ b/net/ipv6/proc.c @@ -236,6 +236,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; } |