Commit 3ba14528 authored by Matthieu Baerts's avatar Matthieu Baerts Committed by Jakub Kicinski
Browse files

mptcp: avoid setting TCP_CLOSE state twice 

tcp_set_state() is called from tcp_done() already.

There is then no need to first set the state to TCP_CLOSE, then call
tcp_done().

Fixes: d5824847 ("mptcp: fix fallback for MP_JOIN subflows")
Cc: stable@vger.kernel.org
Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/362


Acked-by: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarMatthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 822467a4

net/mptcp/subflow.c

+0 −1
Original line number Diff line number Diff line
@@ -406,7 +406,6 @@ void mptcp_subflow_reset(struct sock *ssk) 
	/* must hold: tcp_done() could drop last reference on parent */

	sock_hold(sk);



	tcp_set_state(ssk, TCP_CLOSE);

	tcp_send_active_reset(ssk, GFP_ATOMIC);

	tcp_done(ssk);

	if (!test_and_set_bit(MPTCP_WORK_CLOSE_SUBFLOW, &mptcp_sk(sk)->flags) &&