summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-10-19 19:12:36 -0700
committerDavid S. Miller <davem@davemloft.net>2009-10-19 19:12:36 -0700
commita1a2ad9151c26d92e5c733a33d52108f5d3a5b57 (patch)
treef794c456544391a6797ead469ce3beab5cee2912
parent77238f2b942b38ab4e7f3aced44084493e4a8675 (diff)
downloadop-kernel-dev-a1a2ad9151c26d92e5c733a33d52108f5d3a5b57.zip
op-kernel-dev-a1a2ad9151c26d92e5c733a33d52108f5d3a5b57.tar.gz
Revert "tcp: fix tcp_defer_accept to consider the timeout"
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>
-rw-r--r--net/ipv4/tcp_minisocks.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
index e320afe..624c3c9 100644
--- a/net/ipv4/tcp_minisocks.c
+++ b/net/ipv4/tcp_minisocks.c
@@ -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;
}
OpenPOWER on IntegriCloud