Commit:     cb48cfe8079ddda78425a16d6c1be57d822b365b
Parent:     88044c8c9635b2ec67a27c6f334965e5b97eb2c7
Author:     Craig Schlenter <[EMAIL PROTECTED]>
AuthorDate: Tue Jan 9 00:11:15 2007 -0800
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Tue Jan 9 00:30:08 2007 -0800

    [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 <[EMAIL PROTECTED]> for tracking
    this down. The patch is untested but it looks *cough* obviously
    Signed-off-by: Craig Schlenter <[EMAIL PROTECTED]>
    Signed-off-by: YOSHIFUJI Hideaki <[EMAIL PROTECTED]>
    Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
 net/ipv4/tcp_ipv4.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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,
                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. */
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to