patch-2.3.99-pre7 linux/net/ax25/ax25_timer.c

• Lines: 15
• Date: Thu May 4 11:25:34 2000
• Orig file: v2.3.99-pre6/linux/net/ax25/ax25_timer.c
• Orig date: Fri Jan 21 18:19:17 2000

diff -u --recursive --new-file v2.3.99-pre6/linux/net/ax25/ax25_timer.c linux/net/ax25/ax25_timer.c
@@ -140,12 +140,12 @@
 
 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;