From: Craig Schlenter <craig@codefountain.com>
Date: Tue, 9 Jan 2007 08:11:15 +0000 (-0800)
Subject: [TCP]: Fix iov_len calculation in tcp_v4_send_ack().
X-Git-Tag: upstream/snapshot3+hdmi~36259^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cb48cfe8079ddda78425a16d6c1be57d822b365b;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

[TCP]: Fix iov_len calculation in tcp_v4_send_ack().

This fixes the ftp stalls present in the current kernels.

All credit goes to Komuro <komurojun-mbn@nifty.com> for tracking
this down. The patch is untested but it looks *cough* obviously
correct.

Signed-off-by: Craig Schlenter <craig@codefountain.com>
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index bf7a224..12de90a 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/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. */