1 files changed, 4 insertions, 2 deletions

diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index e04e49373505..3452433cbc96 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -2359,8 +2359,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,
@@ -2368,8 +2369,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;
         }