---

yaml --- r: 33088 b: refs/heads/master c: 52499af h: refs/heads/master v: v3
git-mirror · Aug 2, 2006 · 1b3843f · 1b3843f
1 parent ba5d56b
commit 1b3843f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a280b89982f48e9a32c6410a37419b12ca88af6b
+refs/heads/master: 52499afe40387524e9f46ef9ce4695efccdd2ed9
diff --git a/trunk/net/ipv4/tcp.c b/trunk/net/ipv4/tcp.c
@@ -1659,7 +1659,8 @@ void tcp_close(struct sock *sk, long timeout)
 			const int tmo = tcp_fin_time(sk);
 
 			if (tmo > TCP_TIMEWAIT_LEN) {
-				inet_csk_reset_keepalive_timer(sk, tcp_fin_time(sk));
+				inet_csk_reset_keepalive_timer(sk,
+						tmo - TCP_TIMEWAIT_LEN);
 			} else {
 				tcp_time_wait(sk, TCP_FIN_WAIT2, tmo);
 				goto out;