* [PATCH 1/3 resend] TCP_DEFER_ACCEPT updates - defer timeout conflicts with max_thresh
@ 2008-03-20 22:55 Patrick McManus
2008-03-20 23:17 ` David Miller
2008-03-21 23:28 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Patrick McManus @ 2008-03-20 22:55 UTC (permalink / raw)
To: netdev@vger.kernel.org
commit 077b5f8e36b93e5121f680c3bb327e7464020fd2
Author: Patrick McManus <mcmanus@ducksong.com>
Date: Sat Feb 23 12:23:47 2008 -0500
timeout associated with SO_DEFER_ACCEPT wasn't being honored if it was
less than the timeout allowed by the maximum syn-recv queue size
algorithm. Fix by using the SO_DEFER_ACCEPT value if the ack has
arrived.
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 b189278..03cc323 100644
--- a/net/ipv4/inet_connection_sock.c
+++ b/net/ipv4/inet_connection_sock.c
@@ -461,8 +461,7 @@ 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 < thresh ||
- (inet_rsk(req)->acked && req->retrans < max_retries))
+ if ((req->retrans < (inet_rsk(req)->acked ? max_retries : thresh))
&& !req->rsk_ops->rtx_syn_ack(parent, req, NULL)) {
unsigned long timeo;
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2008-03-21 23:28 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-03-20 22:55 [PATCH 1/3 resend] TCP_DEFER_ACCEPT updates - defer timeout conflicts with max_thresh Patrick McManus
2008-03-20 23:17 ` David Miller
2008-03-21 23:28 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).