From mboxrd@z Thu Jan 1 00:00:00 1970 From: Patrick McManus Subject: [PATCH 2/3 resend] TCP_DEFER_ACCEPT updates - dont retxmt synack Date: Thu, 20 Mar 2008 18:55:55 -0400 Message-ID: <1206053755.13044.22.camel@tng> References: <1206053493.13044.14.camel@tng> Mime-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: 7bit To: "netdev@vger.kernel.org" Return-path: Received: from linode.ducksong.com ([64.22.125.164]:59117 "EHLO linode.ducksong.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754176AbYCTWzs (ORCPT ); Thu, 20 Mar 2008 18:55:48 -0400 Received: from [192.168.16.214] (cpe-76-179-219-229.maine.res.rr.com [76.179.219.229]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by linode.ducksong.com (Postfix) with ESMTP id AFFC11009B for ; Thu, 20 Mar 2008 18:55:47 -0400 (EDT) In-Reply-To: <1206053493.13044.14.camel@tng> Sender: netdev-owner@vger.kernel.org List-ID: commit 95dea62ad7004a1de84e1f38c1b5243e1cb0d554 Author: Patrick McManus Date: Sat Feb 23 15:59:22 2008 -0500 a socket in LISTEN that had completed its 3 way handshake, but not notified userspace because of SO_DEFER_ACCEPT, would retransmit the already acked syn-ack during the time it was waiting for the first data byte from the peer. Signed-off-by: Patrick McManus Acked-by: Eric Dumazet diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c index 03cc323..3380d04 100644 --- a/net/ipv4/inet_connection_sock.c +++ b/net/ipv4/inet_connection_sock.c @@ -461,8 +461,9 @@ void inet_csk_reqsk_queue_prune(struct sock *parent, reqp=&lopt->syn_table[i]; while ((req = *reqp) != NULL) { if (time_after_eq(now, req->expires)) { - if ((req->retrans < (inet_rsk(req)->acked ? max_retries : thresh)) - && !req->rsk_ops->rtx_syn_ack(parent, req, NULL)) { + if ((req->retrans < (inet_rsk(req)->acked ? max_retries : thresh)) && + (inet_rsk(req)->acked || + !req->rsk_ops->rtx_syn_ack(parent, req, NULL))) { unsigned long timeo; if (req->retrans++ == 0)