Revert "tcp: fix tcp_defer_accept to consider the timeout"



This reverts commit 6d01a026.

Julian Anastasov, Willy Tarreau and Eric Dumazet have come up
with a more correct way to deal with this.

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

parent 77238f2b

net/ipv4/tcp_minisocks.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -644,7 +644,6 @@ struct sock tcp_check_req(struct sock sk, struct sk_buff *skb,
		/* If TCP_DEFER_ACCEPT is set, drop bare ACK. */
		if (inet_csk(sk)->icsk_accept_queue.rskq_defer_accept &&
		TCP_SKB_CB(skb)->end_seq == tcp_rsk(req)->rcv_isn + 1) {
		inet_csk(sk)->icsk_accept_queue.rskq_defer_accept--;
		inet_rsk(req)->acked = 1;
		return NULL;
		}