diff --git a/[refs] b/[refs] index 3c080e941800..66f45aeab539 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ee63d22b8953fd0dde22f52c0bc17a304ae50403 +refs/heads/master: 7d460db953d6d205e4c8ecc2017aea1ec22b6c9a diff --git a/trunk/net/ipv6/reassembly.c b/trunk/net/ipv6/reassembly.c index 5cd0bc693a5f..4dfcddc871ce 100644 --- a/trunk/net/ipv6/reassembly.c +++ b/trunk/net/ipv6/reassembly.c @@ -627,6 +627,9 @@ static struct inet6_protocol frag_protocol = void ipv6_frag_sysctl_init(struct net *net) { + if (net != &init_net) + return; + ip6_frags.ctl = &net->ipv6.sysctl.frags; }