Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb48cfe8 authored by Craig Schlenter's avatar Craig Schlenter Committed by David S. Miller
Browse files

[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: default avatarCraig Schlenter <craig@codefountain.com>
Signed-off-by: default avatarYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 88044c8c

net/ipv4/tcp_ipv4.c

+1 −1
Original line number Diff line number Diff line
@@ -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. */