Skip to content

Commit 59701b1

Browse files
Paolo Abenikuba-moo
authored andcommitted
mptcp: minor move_skbs_to_msk() cleanup
Such function is called only by __mptcp_data_ready(), which in turn is always invoked when msk is not owned by the user: we can drop the redundant, related check. Additionally mptcp needs to propagate the socket error only for current subflow. 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-7-5da266aa9c1a@kernel.org Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent 68c7af9 commit 59701b1

1 file changed

Lines changed: 2 additions & 6 deletions

File tree

net/mptcp/protocol.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -814,12 +814,8 @@ static bool move_skbs_to_msk(struct mptcp_sock *msk, struct sock *ssk)
814814

815815
moved = __mptcp_move_skbs_from_subflow(msk, ssk);
816816
__mptcp_ofo_queue(msk);
817-
if (unlikely(ssk->sk_err)) {
818-
if (!sock_owned_by_user(sk))
819-
__mptcp_error_report(sk);
820-
else
821-
__set_bit(MPTCP_ERROR_REPORT, &msk->cb_flags);
822-
}
817+
if (unlikely(ssk->sk_err))
818+
__mptcp_subflow_error_report(sk, ssk);
823819

824820
/* If the moves have caught up with the DATA_FIN sequence number
825821
* it's time to ack the DATA_FIN and change socket state, but

0 commit comments

Comments
 (0)