public inbox for netdev@vger.kernel.org
 help / color / mirror / Atom feed
From: Patrick McManus <mcmanus@ducksong.com>
To: "netdev@vger.kernel.org" <netdev@vger.kernel.org>
Subject: [PATCH 2/3] TCP_DEFER_ACCEPT updates - dont retxmt synack
Date: Sat, 01 Mar 2008 16:01:08 -0500	[thread overview]
Message-ID: <1204405268.5792.31.camel@tng> (raw)
In-Reply-To: <1204405149.5792.28.camel@tng>

    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 <mcmanus@ducksong.com>
Acked-by: Eric Dumazet <dada1@cosmosbay.com>

----

diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c
index 03cc323..7216f5e 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)



  reply	other threads:[~2008-03-01 21:01 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-03-01 20:59 [PATCH 1/3] TCP_DEFER_ACCEPT updates - defer timeout conflics with max_thresh Patrick McManus
2008-03-01 21:01 ` Patrick McManus [this message]
2008-03-01 21:05 ` [PATCH 3/3 (spin 2)] TCP_DEFER_ACCEPT updates - process as established Patrick McManus
2008-03-01 22:03   ` Ilpo Järvinen
2008-03-02 21:56     ` [PATCH 3/3 (spin 3)] " Patrick McManus

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1204405268.5792.31.camel@tng \
    --to=mcmanus@ducksong.com \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox