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

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

diff -u --recursive --new-file v2.3.99-pre6/linux/net/ipv4/tcp_ipv4.c linux/net/ipv4/tcp_ipv4.c
@@ -5,7 +5,7 @@
  *
  *		Implementation of the Transmission Control Protocol(TCP).
  *
- * Version:	$Id: tcp_ipv4.c,v 1.207 2000/04/25 04:13:34 davem Exp $
+ * Version:	$Id: tcp_ipv4.c,v 1.208 2000/05/03 06:37:06 davem Exp $
  *
  *		IPv4 specific functions
  *
@@ -2002,14 +2002,14 @@
 	srcp  = ntohs(sp->sport);
 	timer_active	= 0;
 	timer_expires	= (unsigned) -1;
-	if (tp->retransmit_timer.prev != NULL && tp->retransmit_timer.expires < timer_expires) {
+	if (timer_pending(&tp->retransmit_timer) && tp->retransmit_timer.expires < timer_expires) {
 		timer_active	= 1;
 		timer_expires	= tp->retransmit_timer.expires;
-	} else if (tp->probe_timer.prev != NULL && tp->probe_timer.expires < timer_expires) {
+	} else if (timer_pending(&tp->probe_timer) && tp->probe_timer.expires < timer_expires) {
 		timer_active	= 4;
 		timer_expires	= tp->probe_timer.expires;
 	}
-	if (sp->timer.prev != NULL && sp->timer.expires < timer_expires) {
+	if (timer_pending(&sp->timer) && sp->timer.expires < timer_expires) {
 		timer_active	= 2;
 		timer_expires	= sp->timer.expires;
 	}