patch-2.3.99-pre7 linux/net/ipv4/udp.c

• Lines: 18
• Date: Wed May 3 01:48:03 2000
• Orig file: v2.3.99-pre6/linux/net/ipv4/udp.c
• Orig date: Wed Apr 26 16:34:09 2000

diff -u --recursive --new-file v2.3.99-pre6/linux/net/ipv4/udp.c linux/net/ipv4/udp.c
@@ -5,7 +5,7 @@
  *
  *		The User Datagram Protocol (UDP).
  *
- * Version:	$Id: udp.c,v 1.81 2000/04/25 04:13:34 davem Exp $
+ * Version:	$Id: udp.c,v 1.82 2000/05/03 06:37:07 davem Exp $
  *
  * Authors:	Ross Biro, <bir7@leland.Stanford.Edu>
  *		Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
@@ -988,7 +988,7 @@
 	src   = sp->rcv_saddr;
 	destp = ntohs(sp->dport);
 	srcp  = ntohs(sp->sport);
-	timer_active = (sp->timer.prev != NULL) ? 2 : 0;
+	timer_active = timer_pending(&sp->timer) ? 2 : 0;
 	timer_expires = (timer_active == 2 ? sp->timer.expires : jiffies);
 	sprintf(tmpbuf, "%4d: %08X:%04X %08X:%04X"
 		" %02X %08X:%08X %02X:%08lX %08X %5d %8d %ld %d %p",