diff options
| author | Simon Horman <horms@verge.net.au> | 2008-10-06 23:40:11 +0200 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2008-10-06 23:40:11 +0200 |
| commit | a5e8546a8bff5d2047adc279df5753c44ba7b1a1 (patch) | |
| tree | d9ca91f74d8279adbb1d3e942cc7ab145780ee29 /net/ipv6/route.c | |
| parent | IPVS: Move IPVS to net/netfilter/ipvs (diff) | |
| parent | tcp: Respect SO_RCVLOWAT in tcp_poll(). (diff) | |
| download | linux-a5e8546a8bff5d2047adc279df5753c44ba7b1a1.tar.xz linux-a5e8546a8bff5d2047adc279df5753c44ba7b1a1.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 into lvs-next-2.6
Diffstat (limited to 'net/ipv6/route.c')
| -rw-r--r-- | net/ipv6/route.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 776871ee2288..f4385a6569c2 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -2708,6 +2708,8 @@ int __init ip6_route_init(void) if (ret) goto out_kmem_cache; + ip6_dst_blackhole_ops.kmem_cachep = ip6_dst_ops_template.kmem_cachep; + /* Registering of the loopback is done before this portion of code, * the loopback reference in rt6_info will not be taken, do it * manually for init_net */ |