diff --git a/[refs] b/[refs]
index e1db265bd7ff..6771c6a7056f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 47e958eac280c263397582d5581e868c3227a1bd
+refs/heads/master: 16910b9829797cda4032fbc84e5292ac7b4474f7
diff --git a/trunk/net/ipv6/addrconf.c b/trunk/net/ipv6/addrconf.c
index 52d10d213217..edf06ca34749 100644
--- a/trunk/net/ipv6/addrconf.c
+++ b/trunk/net/ipv6/addrconf.c
@@ -283,12 +283,11 @@ static int snmp6_alloc_dev(struct inet6_dev *idev)
 	return err;
 }
 
-static int snmp6_free_dev(struct inet6_dev *idev)
+static void snmp6_free_dev(struct inet6_dev *idev)
 {
 	snmp_mib_free((void **)idev->stats.icmpv6msg);
 	snmp_mib_free((void **)idev->stats.icmpv6);
 	snmp_mib_free((void **)idev->stats.ipv6);
-	return 0;
 }
 
 /* Nobody refers to this device, we may destroy it. */