Commit 539fae89 authored Mar 21, 2008 by Patrick McManus Committed by David S. Miller Mar 21, 2008

[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>

parent 4cd9029d

net/ipv4/inet_connection_sock.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -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;