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/decnet | |
| parent | b77bf69998121e689c5e86cc5630d39a0a9ee6ca (diff) | |
Merge with Linux 2.3.99-pre7 and various other bits.
Diffstat (limited to 'net/decnet')
| -rw-r--r-- | net/decnet/dn_route.c | 4 | ||||
| -rw-r--r-- | net/decnet/dn_timer.c | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/net/decnet/dn_route.c b/net/decnet/dn_route.c index 2ba5f2f6c..11c67f0c5 100644 --- a/net/decnet/dn_route.c +++ b/net/decnet/dn_route.c @@ -104,8 +104,8 @@ static void dn_run_flush(unsigned long dummy); static struct dn_rt_hash_bucket *dn_rt_hash_table; static unsigned dn_rt_hash_mask; -static struct timer_list dn_route_timer = { NULL, NULL, 0, 0L, NULL }; -static struct timer_list dn_rt_flush_timer = { NULL, NULL, 0, 0L, dn_run_flush }; +static struct timer_list dn_route_timer = { function: NULL }; +static struct timer_list dn_rt_flush_timer = { function: dn_run_flush }; int decnet_dst_gc_interval = 2; static struct dst_ops dn_dst_ops = { diff --git a/net/decnet/dn_timer.c b/net/decnet/dn_timer.c index 1e6bd8272..bbba58b02 100644 --- a/net/decnet/dn_timer.c +++ b/net/decnet/dn_timer.c @@ -135,8 +135,7 @@ void dn_start_fast_timer(struct sock *sk) if (!scp->delack_pending) { scp->delack_pending = 1; - scp->delack_timer.next = - scp->delack_timer.prev = NULL; + init_timer(&scp->delack_timer); scp->delack_timer.expires = jiffies + FAST_INTERVAL; scp->delack_timer.data = (unsigned long)sk; scp->delack_timer.function = dn_fast_timer; |