From d686582d09f26cebba9c98a99d74fb7719cb8bdf Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Mon, 19 Oct 2009 19:12:36 -0700 Subject: [PATCH] --- yaml --- r: 167699 b: refs/heads/master c: a1a2ad9151c26d92e5c733a33d52108f5d3a5b57 h: refs/heads/master i: 167697: 1356fa2d89b76ca483f311c1b6c4b62c079054b9 167695: 586068635c09d7c6906f289496a90fc3ef8e2319 v: v3 --- [refs] | 2 +- trunk/net/ipv4/tcp_minisocks.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/[refs] b/[refs] index dc3a93bfcb3d..d5d6c5df1d06 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 77238f2b942b38ab4e7f3aced44084493e4a8675 +refs/heads/master: a1a2ad9151c26d92e5c733a33d52108f5d3a5b57 diff --git a/trunk/net/ipv4/tcp_minisocks.c b/trunk/net/ipv4/tcp_minisocks.c index e320afea07fc..624c3c9b3c2b 100644 --- a/trunk/net/ipv4/tcp_minisocks.c +++ b/trunk/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; }