From b5319db0f26ca9bbad5c0178a505fb2e46eb3812 Mon Sep 17 00:00:00 2001
From: Srinivas Aji <Aji_Srinivas@emc.com>
Date: Thu, 3 May 2007 17:32:28 -0700
Subject: [PATCH] --- yaml --- r: 53494 b: refs/heads/master c:
 b40b4f79ce789e9e28d382c85006f62be2725282 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index f282153e023a..a42f86e37003 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fde82055c1d0e64ff660d83c705db0e1abc9d12e
+refs/heads/master: b40b4f79ce789e9e28d382c85006f62be2725282
diff --git a/trunk/net/ipv4/tcp.c b/trunk/net/ipv4/tcp.c
index d6e488668171..8b124eafbb90 100644
--- a/trunk/net/ipv4/tcp.c
+++ b/trunk/net/ipv4/tcp.c
@@ -1760,8 +1760,7 @@ int tcp_disconnect(struct sock *sk, int flags)
 	tcp_clear_retrans(tp);
 	inet_csk_delack_init(sk);
 	tcp_init_send_head(sk);
-	tp->rx_opt.saw_tstamp = 0;
-	tcp_sack_reset(&tp->rx_opt);
+	memset(&tp->rx_opt, 0, sizeof(tp->rx_opt));
 	__sk_dst_reset(sk);
 
 	BUG_TRAP(!inet->num || icsk->icsk_bind_hash);