[IPV6]: Fix OOPS on NETDEV_CHANGENAME events.

db7eae6e · Hideaki Yoshifuji · 848fd5f3 · db7eae6e
Commit db7eae6e authored Nov 04, 2003 by Hideaki Yoshifuji
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

net/ipv6/addrconf.c net/ipv6/addrconf.c +6 -4

No files found.
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -1877,10 +1877,12 @@ int addrconf_notify(struct notifier_block *this, unsigned long event,
 		break;
 	case NETDEV_CHANGENAME:
 #ifdef CONFIG_SYSCTL
-		addrconf_sysctl_unregister(&idev->cnf);
+		if (idev) {
-		neigh_sysctl_unregister(idev->nd_parms);
+			addrconf_sysctl_unregister(&idev->cnf);
-		neigh_sysctl_register(dev, idev->nd_parms, NET_IPV6, NET_IPV6_NEIGH, "ipv6");
+			neigh_sysctl_unregister(idev->nd_parms);
-		addrconf_sysctl_register(idev, &idev->cnf);
+			neigh_sysctl_register(dev, idev->nd_parms, NET_IPV6, NET_IPV6_NEIGH, "ipv6");
+			addrconf_sysctl_register(idev, &idev->cnf);
+		}
 #endif
 		break;
 	};