mptcp: drop the __mptcp_data_ready() helper

It adds little clarity and there is a single user of such helper,
just inline it in the caller.

Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Reviewed-by: Geliang Tang <geliang@kernel.org>
Tested-by: Geliang Tang <geliang@kernel.org>
Reviewed-by: Mat Martineau <martineau@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/20251121-net-next-mptcp-memcg-backlog-imp-v1-10-1f34b6c1e0b1@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index 29e5bda0e913b9d332991ed44ea6884f51d249c6..ba1237853ebfbeaee1048751010782ba52ad65a6 100644 (file)
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -845,18 +845,10 @@ static bool move_skbs_to_msk(struct mptcp_sock *msk, struct sock *ssk)
        return moved;
 }
 
-static void __mptcp_data_ready(struct sock *sk, struct sock *ssk)
-{
-       struct mptcp_sock *msk = mptcp_sk(sk);
-
-       /* Wake-up the reader only for in-sequence data */
-       if (move_skbs_to_msk(msk, ssk) && mptcp_epollin_ready(sk))
-               sk->sk_data_ready(sk);
-}
-
 void mptcp_data_ready(struct sock *sk, struct sock *ssk)
 {
        struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(ssk);
+       struct mptcp_sock *msk = mptcp_sk(sk);
 
        /* The peer can send data while we are shutting down this
         * subflow at msk destruction time, but we must avoid enqueuing
@@ -866,10 +858,13 @@ void mptcp_data_ready(struct sock *sk, struct sock *ssk)
                return;
 
        mptcp_data_lock(sk);
-       if (!sock_owned_by_user(sk))
-               __mptcp_data_ready(sk, ssk);
-       else
+       if (!sock_owned_by_user(sk)) {
+               /* Wake-up the reader only for in-sequence data */
+               if (move_skbs_to_msk(msk, ssk) && mptcp_epollin_ready(sk))
+                       sk->sk_data_ready(sk);
+       } else {
                __set_bit(MPTCP_DEQUEUE, &mptcp_sk(sk)->cb_flags);
+       }
        mptcp_data_unlock(sk);
 }