diff --git a/[refs] b/[refs] index 694d8081aeab..1f373e4b4d67 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 075de9395760d6d181078f863e676e81c06e1af2 +refs/heads/master: 300bf591deca8d108799e70e9300dc31765643e3 diff --git a/trunk/net/ipv6/proc.c b/trunk/net/ipv6/proc.c index 5ba7ae849d04..2453f2229ef7 100644 --- a/trunk/net/ipv6/proc.c +++ b/trunk/net/ipv6/proc.c @@ -220,6 +220,9 @@ int snmp6_register_dev(struct inet6_dev *idev) if (!idev || !idev->dev) return -EINVAL; + if (idev->dev->nd_net != &init_net) + return 0; + if (!proc_net_devsnmp6) return -ENOENT;