diff options
author | Daniel Lezcano <dlezcano@fr.ibm.com> | 2007-12-11 13:24:29 +0300 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-29 01:57:11 +0300 |
commit | 853cbbaaa4ccdf221be5ab6afe967aa9998546b7 (patch) | |
tree | 6b6ff0b340fcff4054c919092fbbadce82dff36c /net/ipv6/af_inet6.c | |
parent | 248b238dc960a42aa235057ba0a51a98ae2b0f0d (diff) | |
download | linux-853cbbaaa4ccdf221be5ab6afe967aa9998546b7.tar.xz |
[IPV6]: make frag to return an error at initialization
This patch makes the frag_init to return an error code, so the af_inet6
module can handle the error.
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/af_inet6.c')
-rw-r--r-- | net/ipv6/af_inet6.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c index 442c298c1d7c..a75c4bc9281a 100644 --- a/net/ipv6/af_inet6.c +++ b/net/ipv6/af_inet6.c @@ -863,7 +863,9 @@ static int __init inet6_init(void) if (err) goto ipv6_exthdrs_fail; - ipv6_frag_init(); + err = ipv6_frag_init(); + if (err) + goto ipv6_frag_fail; /* Init v6 transport protocols. */ udpv6_init(); @@ -875,6 +877,8 @@ static int __init inet6_init(void) out: return err; +ipv6_frag_fail: + ipv6_exthdrs_exit(); ipv6_exthdrs_fail: addrconf_cleanup(); addrconf_fail: @@ -934,7 +938,7 @@ static void __exit inet6_exit(void) /* Cleanup code parts. */ ipv6_packet_cleanup(); - + ipv6_frag_exit(); ipv6_exthdrs_exit(); addrconf_cleanup(); ip6_flowlabel_cleanup(); |