Skip to content

Commit eca6017

Browse files
committed
mptcp: remove unneeded mptcp_move_skb()
JIRA: https://issues.redhat.com/browse/RHEL-115576 Upstream Status: net-next.git commit c4ebc4e commit c4ebc4e Author: Paolo Abeni <pabeni@redhat.com> Date: Sat Sep 27 11:40:41 2025 +0200 mptcp: remove unneeded mptcp_move_skb() Since commit b7535cf ("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: Geliang Tang <geliang@kernel.org> Tested-by: Geliang Tang <geliang@kernel.org> Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org> Signed-off-by: Paolo Abeni <pabeni@redhat.com> Signed-off-by: Matthieu 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: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Davide Caratti <dcaratti@redhat.com>
1 parent af8361b commit eca6017

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

net/mptcp/protocol.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2167,14 +2167,8 @@ static int mptcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,
21672167
break;
21682168
}
21692169

2170-
if (sk->sk_shutdown & RCV_SHUTDOWN) {
2171-
/* race breaker: the shutdown could be after the
2172-
* previous receive queue check
2173-
*/
2174-
if (__mptcp_move_skbs(sk))
2175-
continue;
2170+
if (sk->sk_shutdown & RCV_SHUTDOWN)
21762171
break;
2177-
}
21782172

21792173
if (sk->sk_state == TCP_CLOSE) {
21802174
copied = -ENOTCONN;

0 commit comments

Comments
 (0)