diff options
| author | Neal Cardwell <ncardwell@google.com> | 2017-08-02 21:59:58 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-08-03 18:30:47 +0200 |
| commit | d06c3583c2cf6c27a56ee05aa128a950e31b224a (patch) | |
| tree | b34ac233cd954b2723d84c5d3658f22e3cd04151 | |
| parent | net: dsa: bcm_sf2: dst in not an array (diff) | |
| download | linux-d06c3583c2cf6c27a56ee05aa128a950e31b224a.tar.xz linux-d06c3583c2cf6c27a56ee05aa128a950e31b224a.zip | |
tcp: remove extra POLL_OUT added for finished active connect()
Commit 45f119bf936b ("tcp: remove header prediction") introduced a
minor bug: the sk_state_change() and sk_wake_async() notifications for
a completed active connection happen twice: once in this new spot
inside tcp_finish_connect() and once in the existing code in
tcp_rcv_synsent_state_process() immediately after it calls
tcp_finish_connect(). This commit remoes the duplicate POLL_OUT
notifications.
Fixes: 45f119bf936b ("tcp: remove header prediction")
Signed-off-by: Neal Cardwell <ncardwell@google.com>
Cc: Florian Westphal <fw@strlen.de>
Cc: Eric Dumazet <edumazet@google.com>
Cc: Yuchung Cheng <ycheng@google.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/ipv4/tcp_input.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index df670d7ed98d..99cdf4ccabb8 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -5342,11 +5342,6 @@ void tcp_finish_connect(struct sock *sk, struct sk_buff *skb) if (sock_flag(sk, SOCK_KEEPOPEN)) inet_csk_reset_keepalive_timer(sk, keepalive_time_when(tp)); - - if (!sock_flag(sk, SOCK_DEAD)) { - sk->sk_state_change(sk); - sk_wake_async(sk, SOCK_WAKE_IO, POLL_OUT); - } } static bool tcp_rcv_fastopen_synack(struct sock *sk, struct sk_buff *synack, |