From eb791ff74678fa1777e7f944e0584ea13d1c0ea2 Mon Sep 17 00:00:00 2001 From: Shan Wei Date: Wed, 1 Dec 2010 18:05:12 +0000 Subject: [PATCH] --- yaml --- r: 224747 b: refs/heads/master c: b672083ed36a49c323737b7c7e1d5264a7c193af h: refs/heads/master i: 224745: 2645078948cb99f969e52ede76df9e14bf3a95f6 224743: 19cf1333aaacebcf1dbc9b794597d37953f0ae5d v: v3 --- [refs] | 2 +- trunk/net/ipv6/ndisc.c | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index f74aadf5dc6e..1d65bd492415 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 97b1ce25e8fc27f74703537ec09d4996c7a6e38a +refs/heads/master: b672083ed36a49c323737b7c7e1d5264a7c193af diff --git a/trunk/net/ipv6/ndisc.c b/trunk/net/ipv6/ndisc.c index 998d6d27e7cf..e18f84130203 100644 --- a/trunk/net/ipv6/ndisc.c +++ b/trunk/net/ipv6/ndisc.c @@ -141,18 +141,18 @@ struct neigh_table nd_tbl = { .proxy_redo = pndisc_redo, .id = "ndisc_cache", .parms = { - .tbl = &nd_tbl, - .base_reachable_time = 30 * HZ, - .retrans_time = 1 * HZ, - .gc_staletime = 60 * HZ, - .reachable_time = 30 * HZ, - .delay_probe_time = 5 * HZ, - .queue_len = 3, - .ucast_probes = 3, - .mcast_probes = 3, - .anycast_delay = 1 * HZ, - .proxy_delay = (8 * HZ) / 10, - .proxy_qlen = 64, + .tbl = &nd_tbl, + .base_reachable_time = ND_REACHABLE_TIME, + .retrans_time = ND_RETRANS_TIMER, + .gc_staletime = 60 * HZ, + .reachable_time = ND_REACHABLE_TIME, + .delay_probe_time = 5 * HZ, + .queue_len = 3, + .ucast_probes = 3, + .mcast_probes = 3, + .anycast_delay = 1 * HZ, + .proxy_delay = (8 * HZ) / 10, + .proxy_qlen = 64, }, .gc_interval = 30 * HZ, .gc_thresh1 = 128,