diff options
Diffstat (limited to 'net/ipv6/xfrm6_policy.c')
-rw-r--r-- | net/ipv6/xfrm6_policy.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c index f3ed8ca59b94..c9844135c9ca 100644 --- a/net/ipv6/xfrm6_policy.c +++ b/net/ipv6/xfrm6_policy.c | |||
@@ -327,21 +327,7 @@ static struct ctl_table_header *sysctl_hdr; | |||
327 | int __init xfrm6_init(void) | 327 | int __init xfrm6_init(void) |
328 | { | 328 | { |
329 | int ret; | 329 | int ret; |
330 | unsigned int gc_thresh; | 330 | |
331 | |||
332 | /* | ||
333 | * We need a good default value for the xfrm6 gc threshold. | ||
334 | * In ipv4 we set it to the route hash table size * 8, which | ||
335 | * is half the size of the maximaum route cache for ipv4. It | ||
336 | * would be good to do the same thing for v6, except the table is | ||
337 | * constructed differently here. Here each table for a net namespace | ||
338 | * can have FIB_TABLE_HASHSZ entries, so lets go with the same | ||
339 | * computation that we used for ipv4 here. Also, lets keep the initial | ||
340 | * gc_thresh to a minimum of 1024, since, the ipv6 route cache defaults | ||
341 | * to that as a minimum as well | ||
342 | */ | ||
343 | gc_thresh = FIB6_TABLE_HASHSZ * 8; | ||
344 | xfrm6_dst_ops.gc_thresh = (gc_thresh < 1024) ? 1024 : gc_thresh; | ||
345 | dst_entries_init(&xfrm6_dst_ops); | 331 | dst_entries_init(&xfrm6_dst_ops); |
346 | 332 | ||
347 | ret = xfrm6_policy_init(); | 333 | ret = xfrm6_policy_init(); |
@@ -370,7 +356,6 @@ void xfrm6_fini(void) | |||
370 | if (sysctl_hdr) | 356 | if (sysctl_hdr) |
371 | unregister_net_sysctl_table(sysctl_hdr); | 357 | unregister_net_sysctl_table(sysctl_hdr); |
372 | #endif | 358 | #endif |
373 | //xfrm6_input_fini(); | ||
374 | xfrm6_policy_fini(); | 359 | xfrm6_policy_fini(); |
375 | xfrm6_state_fini(); | 360 | xfrm6_state_fini(); |
376 | dst_entries_destroy(&xfrm6_dst_ops); | 361 | dst_entries_destroy(&xfrm6_dst_ops); |