| Message ID | 20170802195958.21383-1-ncardwell@google.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Wed, 2017-08-02 at 15:59 -0400, Neal Cardwell wrote: > 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> > --- > net/ipv4/tcp_input.c | 5 ----- > 1 file changed, 5 deletions(-) Acked-by: Eric Dumazet <edumazet@google.com>
From: Neal Cardwell <ncardwell@google.com> Date: Wed, 2 Aug 2017 15:59:58 -0400 > 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> Applied, thanks.
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,
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> --- net/ipv4/tcp_input.c | 5 ----- 1 file changed, 5 deletions(-)