From: Patrick McManus <mcmanus@ducksong.com>
Date: Fri, 21 Mar 2008 23:27:38 +0000 (-0700)
Subject: [TCP]: TCP_DEFER_ACCEPT updates - defer timeout conflicts with max_thresh
X-Git-Tag: v2.6.26-rc1~1138^2~402
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=539fae89bebd16ebeafd57a87169bc56eb530d76;p=linux-2.6-omap-h63xx.git

[TCP]: TCP_DEFER_ACCEPT updates - defer timeout conflicts with max_thresh

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>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c
index c0e0fa03fce..f24c7d53408 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)) {
 					unsigned long timeo;