Commit 8cfc47fc authored by Paolo Abeni's avatar Paolo Abeni Committed by David S. Miller
Browse files

mptcp: drop redundant test in move_skbs_to_msk() 



Currently we check the msk state to avoid enqueuing new
skbs at msk shutdown time.

Such test is racy - as we can't acquire the msk socket lock -
and useless, as the caller already checked the subflow
field 'disposable', covering the same scenario in a race
free manner - read and updated under the ssk socket lock.

Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarMat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3c90e377

net/mptcp/protocol.c

+0 −3
Original line number Diff line number Diff line
@@ -686,9 +686,6 @@ static bool move_skbs_to_msk(struct mptcp_sock *msk, struct sock *ssk) 
	struct sock *sk = (struct sock *)msk;

	unsigned int moved = 0;



	if (inet_sk_state_load(sk) == TCP_CLOSE)

		return false;



	__mptcp_move_skbs_from_subflow(msk, ssk, &moved);

	__mptcp_ofo_queue(msk);

	if (unlikely(ssk->sk_err)) {