Revert "tcp: fix tcp_defer_accept to consider the timeout"
authorDavid S. Miller <davem@davemloft.net>
Tue, 20 Oct 2009 02:12:36 +0000 (19:12 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 20 Oct 2009 02:12:36 +0000 (19:12 -0700)
This reverts commit 6d01a026b7d3009a418326bdcf313503a314f1ea.

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>
net/ipv4/tcp_minisocks.c

index e320afea07fc3f18cb5076432397490659438531..624c3c9b3c2bbe33a37f53b105d041b08ce490ef 100644 (file)
@@ -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;
        }