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/x25 | |
| parent | b77bf69998121e689c5e86cc5630d39a0a9ee6ca (diff) | |
Merge with Linux 2.3.99-pre7 and various other bits.
Diffstat (limited to 'net/x25')
| -rw-r--r-- | net/x25/x25_timer.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/x25/x25_timer.c b/net/x25/x25_timer.c index 90b6513c9..20672419e 100644 --- a/net/x25/x25_timer.c +++ b/net/x25/x25_timer.c @@ -111,8 +111,7 @@ void x25_stop_timer(struct sock *sk) unsigned long x25_display_timer(struct sock *sk) { - if (sk->protinfo.x25->timer.prev == NULL && - sk->protinfo.x25->timer.next == NULL) + if (!timer_pending(&sk->protinfo.x25->timer)) return 0; return sk->protinfo.x25->timer.expires - jiffies; |