patch-2.3.99-pre7 linux/include/net/tcp.h

• Lines: 26
• Date: Thu May 11 11:31:16 2000
• Orig file: v2.3.99-pre6/linux/include/net/tcp.h
• Orig date: Wed Apr 26 16:34:09 2000

diff -u --recursive --new-file v2.3.99-pre6/linux/include/net/tcp.h linux/include/net/tcp.h
@@ -1079,7 +1079,7 @@
 
 static __inline__ void tcp_check_probe_timer(struct sock *sk, struct tcp_opt *tp)
 {
-	if (!tp->packets_out && !tp->probe_timer.prev)
+	if (!tp->packets_out && !timer_pending(&tp->probe_timer))
 		tcp_reset_xmit_timer(sk, TCP_TIME_PROBE0, tp->rto);
 }
 
@@ -1505,13 +1505,13 @@
 
 	switch (what) {
 	case TCP_TIME_RETRANS:
-		ret = tp->retransmit_timer.prev != NULL;
+		ret = timer_pending(&tp->retransmit_timer);
 		break;
 	case TCP_TIME_DACK:
-		ret = tp->delack_timer.prev != NULL;
+		ret = timer_pending(&tp->delack_timer);
 		break;
 	case TCP_TIME_PROBE0:
-		ret = tp->probe_timer.prev != NULL;
+		ret = timer_pending(&tp->probe_timer);
 		break;	
 	default:
 		ret = 0;