summaryrefslogtreecommitdiff
path: root/net/ipv6/af_inet6.c
diff options
context:
space:
mode:
authorDaniel Lezcano <dlezcano@fr.ibm.com>2007-12-11 02:23:54 -0800
committerDavid S. Miller <davem@davemloft.net>2008-01-28 14:57:10 -0800
commit248b238dc960a42aa235057ba0a51a98ae2b0f0d (patch)
tree0c655bde3e6a9ad24491fe3ec4edaba1bf9053f2 /net/ipv6/af_inet6.c
parent0a3e78ac2c555441f5bc00588070058533bc8d6b (diff)
[IPV6]: make extended headers to return an error at initialization
This patch factorize the code for the differents init functions for rthdr, nodata, destopt in a single function exthdrs_init. This function returns an error so the af_inet6 module can check correctly the initialization. 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.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
index 614f3d905dd1..442c298c1d7c 100644
--- a/net/ipv6/af_inet6.c
+++ b/net/ipv6/af_inet6.c
@@ -859,10 +859,11 @@ static int __init inet6_init(void)
goto addrconf_fail;
/* Init v6 extension headers. */
- ipv6_rthdr_init();
+ err = ipv6_exthdrs_init();
+ if (err)
+ goto ipv6_exthdrs_fail;
+
ipv6_frag_init();
- ipv6_nodata_init();
- ipv6_destopt_init();
/* Init v6 transport protocols. */
udpv6_init();
@@ -874,6 +875,8 @@ static int __init inet6_init(void)
out:
return err;
+ipv6_exthdrs_fail:
+ addrconf_cleanup();
addrconf_fail:
ip6_flowlabel_cleanup();
ip6_flowlabel_fail:
@@ -932,6 +935,7 @@ static void __exit inet6_exit(void)
/* Cleanup code parts. */
ipv6_packet_cleanup();
+ ipv6_exthdrs_exit();
addrconf_cleanup();
ip6_flowlabel_cleanup();
ip6_route_cleanup();