patch-2.3.99-pre7 linux/net/x25/x25_timer.c

• Lines: 11
• Date: Thu May 4 11:29:26 2000
• Orig file: v2.3.99-pre6/linux/net/x25/x25_timer.c
• Orig date: Mon Jul 7 08:20:00 1997

diff -u --recursive --new-file v2.3.99-pre6/linux/net/x25/x25_timer.c linux/net/x25/x25_timer.c
@@ -111,8 +111,7 @@
 
 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;