patch-2.3.99-pre7 linux/net/lapb/lapb_iface.c

• Lines: 15
• Date: Thu May 4 11:26:32 2000
• Orig file: v2.3.99-pre6/linux/net/lapb/lapb_iface.c
• Orig date: Tue Aug 31 17:29:15 1999

diff -u --recursive --new-file v2.3.99-pre6/linux/net/lapb/lapb_iface.c linux/net/lapb/lapb_iface.c
@@ -196,12 +196,12 @@
 	parms->window  = lapb->window;
 	parms->mode    = lapb->mode;
 
-	if (lapb->t1timer.prev == NULL && lapb->t1timer.next == NULL)
+	if (!timer_pending(&lapb->t1timer))
 		parms->t1timer = 0;
 	else
 		parms->t1timer = (lapb->t1timer.expires - jiffies) / HZ;
 
-	if (lapb->t2timer.prev == NULL && lapb->t2timer.next == NULL)
+	if (!timer_pending(&lapb->t2timer))
 		parms->t2timer = 0;
 	else
 		parms->t2timer = (lapb->t2timer.expires - jiffies) / HZ;