diff options
author | Daniel Lezcano <dlezcano@fr.ibm.com> | 2007-12-11 05:24:29 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 17:57:11 -0500 |
commit | 853cbbaaa4ccdf221be5ab6afe967aa9998546b7 (patch) | |
tree | 6b6ff0b340fcff4054c919092fbbadce82dff36c /net/ipv6/af_inet6.c | |
parent | 248b238dc960a42aa235057ba0a51a98ae2b0f0d (diff) |
[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) | |||
863 | if (err) | 863 | if (err) |
864 | goto ipv6_exthdrs_fail; | 864 | goto ipv6_exthdrs_fail; |
865 | 865 | ||
866 | ipv6_frag_init(); | 866 | err = ipv6_frag_init(); |
867 | if (err) | ||
868 | goto ipv6_frag_fail; | ||
867 | 869 | ||
868 | /* Init v6 transport protocols. */ | 870 | /* Init v6 transport protocols. */ |
869 | udpv6_init(); | 871 | udpv6_init(); |
@@ -875,6 +877,8 @@ static int __init inet6_init(void) | |||
875 | out: | 877 | out: |
876 | return err; | 878 | return err; |
877 | 879 | ||
880 | ipv6_frag_fail: | ||
881 | ipv6_exthdrs_exit(); | ||
878 | ipv6_exthdrs_fail: | 882 | ipv6_exthdrs_fail: |
879 | addrconf_cleanup(); | 883 | addrconf_cleanup(); |
880 | addrconf_fail: | 884 | addrconf_fail: |
@@ -934,7 +938,7 @@ static void __exit inet6_exit(void) | |||
934 | 938 | ||
935 | /* Cleanup code parts. */ | 939 | /* Cleanup code parts. */ |
936 | ipv6_packet_cleanup(); | 940 | ipv6_packet_cleanup(); |
937 | 941 | ipv6_frag_exit(); | |
938 | ipv6_exthdrs_exit(); | 942 | ipv6_exthdrs_exit(); |
939 | addrconf_cleanup(); | 943 | addrconf_cleanup(); |
940 | ip6_flowlabel_cleanup(); | 944 | ip6_flowlabel_cleanup(); |