Re: [PATCH net-next] tcp: remove extra POLL_OUT added for finished active connect()
From: Neal CardwellDate: 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 Applied, thanks.
Re: [PATCH net-next] tcp: remove extra POLL_OUT added for finished active connect()
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> Cc: Florian Westphal > Cc: Eric Dumazet > Cc: Yuchung Cheng > --- > net/ipv4/tcp_input.c | 5 - > 1 file changed, 5 deletions(-) Acked-by: Eric Dumazet
[PATCH net-next] 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 CardwellCc: Florian Westphal Cc: Eric Dumazet Cc: Yuchung Cheng --- net/ipv4/tcp_input.c | 5 - 1 file changed, 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, -- 2.14.0.rc1.383.gd1ce394fe2-goog