From 1b3843f7cd44254b418fc1d83b8d11d4a8eb59cd Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@sunset.davemloft.net>
Date: Mon, 31 Jul 2006 22:32:09 -0700
Subject: [PATCH] --- yaml --- r: 33088 b: refs/heads/master c:
 52499afe40387524e9f46ef9ce4695efccdd2ed9 h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/net/ipv4/tcp.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 45b6c9042cfc..4118897108cf 100644
--- 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
index f6a2d9223d07..7b621e44b124 100644
--- 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;