diff options
| author | Andre Oppermann <andre@FreeBSD.org> | 2007-05-10 23:11:29 +0000 |
|---|---|---|
| committer | Andre Oppermann <andre@FreeBSD.org> | 2007-05-10 23:11:29 +0000 |
| commit | 4b8e42baabf638c7673f3b45489aa840690eacf9 (patch) | |
| tree | 49753fe4118c1bc67f7f93ec7af608942d84be40 /sys/netinet | |
| parent | 4d09ed1e67972cd3bad06985aaaecc9689a13012 (diff) | |
| download | src-4b8e42baabf638c7673f3b45489aa840690eacf9.tar.gz src-4b8e42baabf638c7673f3b45489aa840690eacf9.zip | |
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.
Notes
Notes:
svn path=/head/; revision=169457
Diffstat (limited to 'sys/netinet')
| -rw-r--r-- | sys/netinet/tcp_output.c | 2 |
1 files changed, 1 insertions, 1 deletions
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)) { |