Commit c4ebc4ee authored by Paolo Abeni's avatar Paolo Abeni Committed by Jakub Kicinski
Browse files

mptcp: remove unneeded mptcp_move_skb() 



Since commit b7535cfe ("mptcp: drop legacy code around RX EOF"),
sk_shutdown can't change during the main recvmsg loop, we can drop
the related race breaker.

Reviewed-by: default avatarGeliang Tang <geliang@kernel.org>
Tested-by: default avatarGeliang Tang <geliang@kernel.org>
Reviewed-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/20250927-net-next-mptcp-rcv-path-imp-v1-5-5da266aa9c1a@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 9a0afe0d

net/mptcp/protocol.c

+1 −7
Original line number Diff line number Diff line
@@ -2207,14 +2207,8 @@ static int mptcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, 
				break;

			}



			if (sk->sk_shutdown & RCV_SHUTDOWN) {

				/* race breaker: the shutdown could be after the

				 * previous receive queue check

				 */

				if (__mptcp_move_skbs(sk))

					continue;

			if (sk->sk_shutdown & RCV_SHUTDOWN)

				break;

			}



			if (sk->sk_state == TCP_CLOSE) {

				copied = -ENOTCONN;