diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 21:05:59 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 21:05:59 +0000 |
commit | ba2dacab305c598cd4c34a604f8e276bf5bab5ff (patch) | |
tree | 78670a0139bf4d5ace617b29b7eba82bbc74d602 /net/ipv6/ip6_fib.c | |
parent | b77bf69998121e689c5e86cc5630d39a0a9ee6ca (diff) |
Merge with Linux 2.3.99-pre7 and various other bits.
Diffstat (limited to 'net/ipv6/ip6_fib.c')
-rw-r--r-- | net/ipv6/ip6_fib.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c index d458adc93..3edc09a64 100644 --- a/net/ipv6/ip6_fib.c +++ b/net/ipv6/ip6_fib.c @@ -5,7 +5,7 @@ * Authors: * Pedro Roque <roque@di.fc.ul.pt> * - * $Id: ip6_fib.c,v 1.20 2000/01/16 05:11:37 davem Exp $ + * $Id: ip6_fib.c,v 1.21 2000/05/03 06:37:07 davem Exp $ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -87,12 +87,7 @@ static void fib6_repair_tree(struct fib6_node *fn); static __u32 rt_sernum = 0; -static struct timer_list ip6_fib_timer = { - NULL, NULL, - 0, - ~0UL, - fib6_run_gc -}; +static struct timer_list ip6_fib_timer = { function: fib6_run_gc }; static struct fib6_walker_t fib6_walker_list = { &fib6_walker_list, &fib6_walker_list, |