Commit d06c3583 authored Aug 02, 2017 by Neal Cardwell Committed by David S. Miller Aug 03, 2017

tcp: remove extra POLL_OUT added for finished active connect()



Commit 45f119bf ("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: 45f119bf ("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>

parent 3a8f6f87

net/ipv4/tcp_input.c

+0 −5

Original line number	Original line	Diff line number	Diff line
	@@ -5342,11 +5342,6 @@ void tcp_finish_connect(struct sock sk, struct sk_buff skb)

	if (sock_flag(sk, SOCK_KEEPOPEN))		if (sock_flag(sk, SOCK_KEEPOPEN))
	inet_csk_reset_keepalive_timer(sk, keepalive_time_when(tp));		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,		static bool tcp_rcv_fastopen_synack(struct sock sk, struct sk_buff synack,