瀏覽代碼

[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>
Craig Schlenter 18 年之前
父節點
當前提交
cb48cfe807
共有 1 個文件被更改,包括 1 次插入1 次删除
  1. 1 1
      net/ipv4/tcp_ipv4.c

+ 1 - 1
net/ipv4/tcp_ipv4.c

@@ -648,7 +648,7 @@ static void tcp_v4_send_ack(struct tcp_timewait_sock *twsk,
 				   TCPOLEN_TIMESTAMP);
 				   TCPOLEN_TIMESTAMP);
 		rep.opt[1] = htonl(tcp_time_stamp);
 		rep.opt[1] = htonl(tcp_time_stamp);
 		rep.opt[2] = htonl(ts);
 		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. */
 	/* Swap the send and the receive. */