From dc2963c8a274d97d4f5067b7d0a27af237af820c Mon Sep 17 00:00:00 2001
From: Craig Schlenter <craig@codefountain.com>
Date: Tue, 9 Jan 2007 00:11:15 -0800
Subject: [PATCH] --- yaml --- r: 45413 b: refs/heads/master c:
 cb48cfe8079ddda78425a16d6c1be57d822b365b h: refs/heads/master i:   45411:
 32bded6a9ed2bd51fd760c7da2f9810e4f6d0705 v: v3

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

diff --git a/[refs] b/[refs]
index 4e96431c26e0..776b3e832a49 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 88044c8c9635b2ec67a27c6f334965e5b97eb2c7
+refs/heads/master: cb48cfe8079ddda78425a16d6c1be57d822b365b
diff --git a/trunk/net/ipv4/tcp_ipv4.c b/trunk/net/ipv4/tcp_ipv4.c
index bf7a22412bcb..12de90a5047c 100644
--- a/trunk/net/ipv4/tcp_ipv4.c
+++ b/trunk/net/ipv4/tcp_ipv4.c
@@ -648,7 +648,7 @@ static void tcp_v4_send_ack(struct tcp_timewait_sock *twsk,
 				   TCPOLEN_TIMESTAMP);
 		rep.opt[1] = htonl(tcp_time_stamp);
 		rep.opt[2] = htonl(ts);
-		arg.iov[0].iov_len = TCPOLEN_TSTAMP_ALIGNED;
+		arg.iov[0].iov_len += TCPOLEN_TSTAMP_ALIGNED;
 	}
 
 	/* Swap the send and the receive. */