From fdc13d0737459625d4883f6880fc95485dea20bf Mon Sep 17 00:00:00 2001 From: Pavel Emelyanov Date: Mon, 19 May 2008 13:52:28 -0700 Subject: [PATCH] --- yaml --- r: 102597 b: refs/heads/master c: 0002c630c4ee7a3c6b1d87e34bfd6ce9694b49be h: refs/heads/master i: 102595: a548a00a666f42a8b9965a9ef768691a7fa2b4d5 v: v3 --- [refs] | 2 +- trunk/net/ipv6/reassembly.c | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 51a06ca5b469..e16d0d00ba1d 100644 --- 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 index 7e008de87117..130d6f6b6a6e 100644 --- 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)