diff options
author | Jaroslav Kysela <perex@hera.kernel.org> | 2005-06-21 10:39:41 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@hera.kernel.org> | 2005-06-21 10:39:41 -0400 |
commit | fae6ec69c84d71b1d5bda9ede1a262c1681684aa (patch) | |
tree | eb4aff9a5c2b7d04ce09a3717bb1dd4a79fe7595 /net/decnet/dn_neigh.c | |
parent | bbc0274e9bb2e3f1d724d445a2bd32566b9b66f7 (diff) | |
parent | 1d345dac1f30af1cd9f3a1faa12f9f18f17f236e (diff) |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'net/decnet/dn_neigh.c')
-rw-r--r-- | net/decnet/dn_neigh.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/decnet/dn_neigh.c b/net/decnet/dn_neigh.c index f6dfe96f45b7..f32dba9e26fe 100644 --- a/net/decnet/dn_neigh.c +++ b/net/decnet/dn_neigh.c | |||
@@ -101,7 +101,6 @@ struct neigh_table dn_neigh_table = { | |||
101 | .id = "dn_neigh_cache", | 101 | .id = "dn_neigh_cache", |
102 | .parms ={ | 102 | .parms ={ |
103 | .tbl = &dn_neigh_table, | 103 | .tbl = &dn_neigh_table, |
104 | .entries = 0, | ||
105 | .base_reachable_time = 30 * HZ, | 104 | .base_reachable_time = 30 * HZ, |
106 | .retrans_time = 1 * HZ, | 105 | .retrans_time = 1 * HZ, |
107 | .gc_staletime = 60 * HZ, | 106 | .gc_staletime = 60 * HZ, |