diff options
| author | Dave Airlie <airlied@starflyer.(none)> | 2005-07-07 20:08:27 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2005-07-07 20:08:27 +1000 |
| commit | 717cb906bd43a9ac00631d600adda5c6546843a6 (patch) | |
| tree | f41b250e9e0fa1e664f002fa9c4608d94527f2f2 /net/ipv6/af_inet6.c | |
| parent | 22f579c621e2f264e6d093b07d75f99bc97d5df2 (diff) | |
| parent | c101f3136cc98a003d0d16be6fab7d0d950581a6 (diff) | |
Merge ../linux-2.6/
Diffstat (limited to 'net/ipv6/af_inet6.c')
| -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 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: |