From 12f79b7dbaafc0c74813cc1419bbe3beccde514b Mon Sep 17 00:00:00 2001 From: Yuchung Cheng Date: Thu, 31 Jan 2013 11:16:46 -0800 Subject: [PATCH] --- yaml --- r: 349639 b: refs/heads/master c: 66555e92fb7a619188c02cceae4bbc414f15f96d h: refs/heads/master i: 349637: cacc549719f062ce958d6f44b605cee7a78e474b 349635: 797f5cd40f37aafa4c947628807061be0e85c9d3 349631: 1dc92fb4c189fb40e2196636be3d9b508dbd642e v: v3 --- [refs] | 2 +- trunk/net/ipv4/tcp_input.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index bbee1be80af5..f618fa4cf0fd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 700163db3de397a7557831e1eb9b8ce60e55590a +refs/heads/master: 66555e92fb7a619188c02cceae4bbc414f15f96d diff --git a/trunk/net/ipv4/tcp_input.c b/trunk/net/ipv4/tcp_input.c index 18f97ca76b00..8aca4ee95ff9 100644 --- a/trunk/net/ipv4/tcp_input.c +++ b/trunk/net/ipv4/tcp_input.c @@ -5649,8 +5649,7 @@ static bool tcp_rcv_fastopen_synack(struct sock *sk, struct sk_buff *synack, * the remote receives only the retransmitted (regular) SYNs: either * the original SYN-data or the corresponding SYN-ACK is lost. */ - syn_drop = (cookie->len <= 0 && data && - inet_csk(sk)->icsk_retransmits); + syn_drop = (cookie->len <= 0 && data && tp->total_retrans); tcp_fastopen_cache_set(sk, mss, cookie, syn_drop);