From 4b8e42baabf638c7673f3b45489aa840690eacf9 Mon Sep 17 00:00:00 2001
From: Andre Oppermann <andre@FreeBSD.org>
Date: Thu, 10 May 2007 23:11:29 +0000
Subject: [PATCH] Fix an incorrect replace of a timer reference made during the
 TCP timer rewrite in rev. 1.132.  This unmasked yet another bug that causes
 certain connections to get indefinately stuck in LAST_ACK state.

---
 sys/netinet/tcp_output.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c
index 390009ddcead..ae59d556e3c3 100644
--- a/sys/netinet/tcp_output.c
+++ b/sys/netinet/tcp_output.c
@@ -1030,7 +1030,7 @@ send:
 		 * of retransmit time.
 		 */
 timer:
-		if (!tcp_timer_active(tp, TT_PERSIST) &&
+		if (!tcp_timer_active(tp, TT_REXMT) &&
 		    ((sack_rxmit && tp->snd_nxt != tp->snd_max) ||
 		     (tp->snd_nxt != tp->snd_una))) {
 			if (tcp_timer_active(tp, TT_PERSIST)) {