---

yaml --- r: 102597 b: refs/heads/master c: 0002c63 h: refs/heads/master i: 102595: a548a00 v: v3
git-mirror · May 19, 2008 · fdc13d0 · fdc13d0
1 parent 6a11109
commit fdc13d0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0a64b4b811025ce0386ad84d81504e4ff7985856
+refs/heads/master: 0002c630c4ee7a3c6b1d87e34bfd6ce9694b49be
diff --git a/trunk/net/ipv6/reassembly.c b/trunk/net/ipv6/reassembly.c
@@ -750,7 +750,9 @@ int __init ipv6_frag_init(void)
 	if (ret)
 		goto out;
 
-	register_pernet_subsys(&ip6_frags_ops);
+	ret = register_pernet_subsys(&ip6_frags_ops);
+	if (ret)
+		goto err_pernet;
 
 	ip6_frags.hashfn = ip6_hashfn;
 	ip6_frags.constructor = ip6_frag_init;
@@ -763,6 +765,10 @@ int __init ipv6_frag_init(void)
 	inet_frags_init(&ip6_frags);
 out:
 	return ret;
+
+err_pernet:
+	inet6_del_protocol(&frag_protocol, IPPROTO_FRAGMENT);
+	goto out;
 }
 
 void ipv6_frag_exit(void)