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/netrom/nr_timer.c | |
parent | b77bf69998121e689c5e86cc5630d39a0a9ee6ca (diff) |
Merge with Linux 2.3.99-pre7 and various other bits.
Diffstat (limited to 'net/netrom/nr_timer.c')
-rw-r--r-- | net/netrom/nr_timer.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/netrom/nr_timer.c b/net/netrom/nr_timer.c index b3fbd012e..ac62ad54a 100644 --- a/net/netrom/nr_timer.c +++ b/net/netrom/nr_timer.c @@ -129,8 +129,7 @@ void nr_stop_heartbeat(struct sock *sk) int nr_t1timer_running(struct sock *sk) { - return (sk->protinfo.nr->t1timer.prev != NULL || - sk->protinfo.nr->t1timer.next != NULL); + return timer_pending(&sk->protinfo.nr->t1timer); } static void nr_heartbeat_expiry(unsigned long param) |