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/ax25 | |
| parent | b77bf69998121e689c5e86cc5630d39a0a9ee6ca (diff) | |
Merge with Linux 2.3.99-pre7 and various other bits.
Diffstat (limited to 'net/ax25')
| -rw-r--r-- | net/ax25/ax25_timer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ax25/ax25_timer.c b/net/ax25/ax25_timer.c index 1aa76359b..08e190456 100644 --- a/net/ax25/ax25_timer.c +++ b/net/ax25/ax25_timer.c @@ -140,12 +140,12 @@ void ax25_stop_idletimer(ax25_cb *ax25) int ax25_t1timer_running(ax25_cb *ax25) { - return (ax25->t1timer.prev != NULL || ax25->t1timer.next != NULL); + return timer_pending(&ax25->t1timer); } unsigned long ax25_display_timer(struct timer_list *timer) { - if (timer->prev == NULL && timer->next == NULL) + if (!timer_pending(timer)) return 0; return timer->expires - jiffies; |