Skip to content

Commit c4ebc4e

Browse files
Paolo Abenikuba-moo
authored andcommitted
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>
1 parent 9a0afe0 commit c4ebc4e

1 file changed

Lines changed: 1 addition & 7 deletions

File tree

net/mptcp/protocol.c

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

2210-
if (sk->sk_shutdown & RCV_SHUTDOWN) {
2211-
/* race breaker: the shutdown could be after the
2212-
* previous receive queue check
2213-
*/
2214-
if (__mptcp_move_skbs(sk))
2215-
continue;
2210+
if (sk->sk_shutdown & RCV_SHUTDOWN)
22162211
break;
2217-
}
22182212

22192213
if (sk->sk_state == TCP_CLOSE) {
22202214
copied = -ENOTCONN;

0 commit comments

Comments
 (0)