From fcb3d1e56c53e613e024c0f702a4f901cd1fc725 Mon Sep 17 00:00:00 2001
From: jlemon <jlemon@FreeBSD.org>
Date: Sat, 16 Sep 2000 00:53:53 +0000
Subject: It is possible for a TCP callout to be removed from the timing wheel,
 but have a network interrupt arrive and deactivate the timeout before the
 callout routine runs.  Check for this case in the callout routine; it should
 only run if the callout is active and not on the wheel.

---
 sys/netinet/tcp_timer.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'sys/netinet/tcp_timer.c')

diff --git a/sys/netinet/tcp_timer.c b/sys/netinet/tcp_timer.c
index 6429414..980037a 100644
--- a/sys/netinet/tcp_timer.c
+++ b/sys/netinet/tcp_timer.c
@@ -169,7 +169,7 @@ tcp_timer_delack(xtp)
 	int s;
 
 	s = splnet();
-	if (callout_pending(tp->tt_delack)) {
+	if (callout_pending(tp->tt_delack) || !callout_active(tp->tt_delack)) {
 		splx(s);
 		return;
 	}
@@ -193,7 +193,7 @@ tcp_timer_2msl(xtp)
 	ostate = tp->t_state;
 #endif
 	s = splnet();
-	if (callout_pending(tp->tt_2msl)) {
+	if (callout_pending(tp->tt_2msl) || !callout_active(tp->tt_2msl)) {
 		splx(s);
 		return;
 	}
@@ -231,7 +231,7 @@ tcp_timer_keep(xtp)
 	ostate = tp->t_state;
 #endif
 	s = splnet();
-	if (callout_pending(tp->tt_keep)) {
+	if (callout_pending(tp->tt_keep) || !callout_active(tp->tt_keep)) {
 		splx(s);
 		return;
 	}
@@ -310,7 +310,7 @@ tcp_timer_persist(xtp)
 	ostate = tp->t_state;
 #endif
 	s = splnet();
-	if (callout_pending(tp->tt_persist)) {
+	if (callout_pending(tp->tt_persist) || !callout_active(tp->tt_persist)){
 		splx(s);
 		return;
 	}
@@ -361,7 +361,7 @@ tcp_timer_rexmt(xtp)
 	ostate = tp->t_state;
 #endif
 	s = splnet();
-	if (callout_pending(tp->tt_rexmt)) {
+	if (callout_pending(tp->tt_rexmt) || !callout_active(tp->tt_rexmt)) {
 		splx(s);
 		return;
 	}
-- 
cgit v1.1