Commit 93653e04 authored Jun 16, 2008 by David S. Miller

tcp: Revert reset of deferred accept changes in 2.6.26



Ingo's system is still seeing strange behavior, and he
reports that is goes away if the rest of the deferred
accept changes are reverted too.

Therefore this reverts e4c78840
("[TCP]: TCP_DEFER_ACCEPT updates - dont retxmt synack") and
539fae89 ("[TCP]: TCP_DEFER_ACCEPT
updates - defer timeout conflicts with max_thresh").

Just like the other revert, these ideas can be revisited for
2.6.27

Signed-off-by: David S. Miller <davem@davemloft.net>

parent 2b4743bd

net/ipv4/inet_connection_sock.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -466,9 +466,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)) &&
		(inet_rsk(req)->acked \|\|
		!req->rsk_ops->rtx_syn_ack(parent, req))) {
		if ((req->retrans < thresh \|\|
		(inet_rsk(req)->acked && req->retrans < max_retries))
		&& !req->rsk_ops->rtx_syn_ack(parent, req)) {
		unsigned long timeo;

		if (req->retrans++ == 0)