From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751050AbXAIFVS (ORCPT ); Tue, 9 Jan 2007 00:21:18 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751052AbXAIFVS (ORCPT ); Tue, 9 Jan 2007 00:21:18 -0500 Received: from myw-stp-196-34-113-243.sentechsa.net ([196.34.113.243]:40005 "EHLO craigdell.detnet.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751046AbXAIFVR (ORCPT ); Tue, 9 Jan 2007 00:21:17 -0500 X-Greylist: delayed 311 seconds by postgrey-1.27 at vger.kernel.org; Tue, 09 Jan 2007 00:21:14 EST Date: Tue, 9 Jan 2007 07:11:39 +0200 From: Craig Schlenter To: YOSHIFUJI Hideaki / =?utf-8?B?5ZCJ6Jek6Iux5piO?= , davem@davemloft.net Cc: komurojun-mbn@nifty.com, bunk@stusta.de, jgarzik@pobox.com, viro@ftp.linux.org.uk, linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH] Re: [BUG KERNEL 2.6.20-rc1] ftp: get or put stops during file-transfer Message-ID: <20070109051139.GA2229@craigdell.detnet.com> References: <20061230.231952.16573563.yoshfuji@linux-ipv6.org> <20070105054546.953196e5.komurojun-mbn@nifty.com> <20070104122330.GA2233@craigdell.detnet.com> <20070109.102453.32711440.yoshfuji@linux-ipv6.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20070109.102453.32711440.yoshfuji@linux-ipv6.org> User-Agent: Mutt/1.4.2.2i Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Hi Dave YOSHIFUJI Hideaki / 吉藤英明 has suggested that I send the patch below to fix the ftp stalls present in the current kernels. All credit goes to Komuro for tracking this down. The patch is untested but it looks *cough* obviously correct. Signed-off-by: Craig Schlenter Thank you! --Craig 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. */