diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2005-07-05 17:41:20 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2005-07-05 17:41:20 -0400 |
commit | e2ed4052aa662e7cfb22a1793b9d8158603be6d7 (patch) | |
tree | 2b5e6f38447ae666d61af5d15f24a1298226c7ae /net/ipv6 | |
parent | 30e224d76f34e041c30df66a4dcbeeb53556ea3f (diff) |
[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/ipv6')
-rw-r--r-- | net/ipv6/af_inet6.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c index 2b193e3df49a..28d9bcab0970 100644 --- a/net/ipv6/af_inet6.c +++ b/net/ipv6/af_inet6.c | |||
@@ -774,7 +774,6 @@ static int __init inet6_init(void) | |||
774 | if (if6_proc_init()) | 774 | if (if6_proc_init()) |
775 | goto proc_if6_fail; | 775 | goto proc_if6_fail; |
776 | #endif | 776 | #endif |
777 | ipv6_packet_init(); | ||
778 | ip6_route_init(); | 777 | ip6_route_init(); |
779 | ip6_flowlabel_init(); | 778 | ip6_flowlabel_init(); |
780 | err = addrconf_init(); | 779 | err = addrconf_init(); |
@@ -791,6 +790,8 @@ static int __init inet6_init(void) | |||
791 | /* Init v6 transport protocols. */ | 790 | /* Init v6 transport protocols. */ |
792 | udpv6_init(); | 791 | udpv6_init(); |
793 | tcpv6_init(); | 792 | tcpv6_init(); |
793 | |||
794 | ipv6_packet_init(); | ||
794 | err = 0; | 795 | err = 0; |
795 | out: | 796 | out: |
796 | return err; | 797 | return err; |
@@ -798,7 +799,6 @@ out: | |||
798 | addrconf_fail: | 799 | addrconf_fail: |
799 | ip6_flowlabel_cleanup(); | 800 | ip6_flowlabel_cleanup(); |
800 | ip6_route_cleanup(); | 801 | ip6_route_cleanup(); |
801 | ipv6_packet_cleanup(); | ||
802 | #ifdef CONFIG_PROC_FS | 802 | #ifdef CONFIG_PROC_FS |
803 | if6_proc_exit(); | 803 | if6_proc_exit(); |
804 | proc_if6_fail: | 804 | proc_if6_fail: |