3 files changed, 6 insertions, 3 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;
         }
 
diff --git a/net/ipv6/proc.c b/net/ipv6/proc.c
index acb306a5dd56..920dc9cf6a84 100644
--- a/net/ipv6/proc.c
+++ b/net/ipv6/proc.c
@@ -223,6 +223,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;
 }
 
diff --git a/net/ipv6/xfrm6_tunnel.c b/net/ipv6/xfrm6_tunnel.c
index 538499a89975..5502cc948dfb 100644
--- a/net/ipv6/xfrm6_tunnel.c
+++ b/net/ipv6/xfrm6_tunnel.c
@@ -261,7 +261,7 @@ static int xfrm6_tunnel_rcv(struct sk_buff *skb)
         __be32 spi;
 
         spi = xfrm6_tunnel_spi_lookup((xfrm_address_t *)&iph->saddr);
-        return xfrm6_rcv_spi(skb, spi);
+        return xfrm6_rcv_spi(skb, spi) > 0 ? : 0;
 }
 
 static int xfrm6_tunnel_err(struct sk_buff *skb, struct inet6_skb_parm *opt,