summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2005-07-05 14:41:20 -0700
committerDavid S. Miller <davem@davemloft.net>2005-07-05 14:41:20 -0700
commite2ed4052aa662e7cfb22a1793b9d8158603be6d7 (patch)
tree2b5e6f38447ae666d61af5d15f24a1298226c7ae /net
parent30e224d76f34e041c30df66a4dcbeeb53556ea3f (diff)
downloadlinux-3.10-e2ed4052aa662e7cfb22a1793b9d8158603be6d7.tar.gz
linux-3.10-e2ed4052aa662e7cfb22a1793b9d8158603be6d7.tar.bz2
linux-3.10-e2ed4052aa662e7cfb22a1793b9d8158603be6d7.zip
[IPV6]: Makes IPv6 rcv registration happen last during initialisation.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/ipv6/af_inet6.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
index 2b193e3df49..28d9bcab097 100644
--- a/net/ipv6/af_inet6.c
+++ b/net/ipv6/af_inet6.c
@@ -774,7 +774,6 @@ static int __init inet6_init(void)
if (if6_proc_init())
goto proc_if6_fail;
#endif
- ipv6_packet_init();
ip6_route_init();
ip6_flowlabel_init();
err = addrconf_init();
@@ -791,6 +790,8 @@ static int __init inet6_init(void)
/* Init v6 transport protocols. */
udpv6_init();
tcpv6_init();
+
+ ipv6_packet_init();
err = 0;
out:
return err;
@@ -798,7 +799,6 @@ out:
addrconf_fail:
ip6_flowlabel_cleanup();
ip6_route_cleanup();
- ipv6_packet_cleanup();
#ifdef CONFIG_PROC_FS
if6_proc_exit();
proc_if6_fail: