diff options
Diffstat (limited to 'net/ipv6')
-rw-r--r-- | net/ipv6/ip6_fib.c | 4 | ||||
-rw-r--r-- | net/ipv6/route.c | 10 |
2 files changed, 4 insertions, 10 deletions
diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c index fbca60950b14..8fcae7a6510b 100644 --- a/net/ipv6/ip6_fib.c +++ b/net/ipv6/ip6_fib.c | |||
@@ -1472,10 +1472,8 @@ void __init fib6_init(void) | |||
1472 | { | 1472 | { |
1473 | fib6_node_kmem = kmem_cache_create("fib6_nodes", | 1473 | fib6_node_kmem = kmem_cache_create("fib6_nodes", |
1474 | sizeof(struct fib6_node), | 1474 | sizeof(struct fib6_node), |
1475 | 0, SLAB_HWCACHE_ALIGN, | 1475 | 0, SLAB_HWCACHE_ALIGN|SLAB_PANIC, |
1476 | NULL, NULL); | 1476 | NULL, NULL); |
1477 | if (!fib6_node_kmem) | ||
1478 | panic("cannot create fib6_nodes cache"); | ||
1479 | 1477 | ||
1480 | fib6_tables_init(); | 1478 | fib6_tables_init(); |
1481 | } | 1479 | } |
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index d83844d9499b..ba1b3d11865e 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c | |||
@@ -2419,13 +2419,9 @@ void __init ip6_route_init(void) | |||
2419 | { | 2419 | { |
2420 | struct proc_dir_entry *p; | 2420 | struct proc_dir_entry *p; |
2421 | 2421 | ||
2422 | ip6_dst_ops.kmem_cachep = kmem_cache_create("ip6_dst_cache", | 2422 | ip6_dst_ops.kmem_cachep = |
2423 | sizeof(struct rt6_info), | 2423 | kmem_cache_create("ip6_dst_cache", sizeof(struct rt6_info), 0, |
2424 | 0, SLAB_HWCACHE_ALIGN, | 2424 | SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL, NULL); |
2425 | NULL, NULL); | ||
2426 | if (!ip6_dst_ops.kmem_cachep) | ||
2427 | panic("cannot create ip6_dst_cache"); | ||
2428 | |||
2429 | fib6_init(); | 2425 | fib6_init(); |
2430 | #ifdef CONFIG_PROC_FS | 2426 | #ifdef CONFIG_PROC_FS |
2431 | p = proc_net_create("ipv6_route", 0, rt6_proc_info); | 2427 | p = proc_net_create("ipv6_route", 0, rt6_proc_info); |