mptcp: make mptcp_destroy_common() static

Such function is only used inside protocol.c, there is no need
to expose it to the whole stack.

Note that the function definition most be moved earlier to avoid
forward declaration.

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-9-1f34b6c1e0b1@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index 2ee76c8c5167e281bf3df4dd3cb40cb9c247b640..29e5bda0e913b9d332991ed44ea6884f51d249c6 100644 (file)
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -3222,6 +3222,27 @@ static void mptcp_copy_inaddrs(struct sock *msk, const struct sock *ssk)
        inet_sk(msk)->inet_rcv_saddr = inet_sk(ssk)->inet_rcv_saddr;
 }
 
+static void mptcp_destroy_common(struct mptcp_sock *msk)
+{
+       struct mptcp_subflow_context *subflow, *tmp;
+       struct sock *sk = (struct sock *)msk;
+
+       __mptcp_clear_xmit(sk);
+
+       /* join list will be eventually flushed (with rst) at sock lock release time */
+       mptcp_for_each_subflow_safe(msk, subflow, tmp)
+               __mptcp_close_ssk(sk, mptcp_subflow_tcp_sock(subflow), subflow, 0);
+
+       __skb_queue_purge(&sk->sk_receive_queue);
+       skb_rbtree_purge(&msk->out_of_order_queue);
+
+       /* move all the rx fwd alloc into the sk_mem_reclaim_final in
+        * inet_sock_destruct() will dispose it
+        */
+       mptcp_token_destroy(msk);
+       mptcp_pm_destroy(msk);
+}
+
 static int mptcp_disconnect(struct sock *sk, int flags)
 {
        struct mptcp_sock *msk = mptcp_sk(sk);
@@ -3427,27 +3448,6 @@ void mptcp_rcv_space_init(struct mptcp_sock *msk, const struct sock *ssk)
                msk->rcvq_space.space = TCP_INIT_CWND * TCP_MSS_DEFAULT;
 }
 
-void mptcp_destroy_common(struct mptcp_sock *msk)
-{
-       struct mptcp_subflow_context *subflow, *tmp;
-       struct sock *sk = (struct sock *)msk;
-
-       __mptcp_clear_xmit(sk);
-
-       /* join list will be eventually flushed (with rst) at sock lock release time */
-       mptcp_for_each_subflow_safe(msk, subflow, tmp)
-               __mptcp_close_ssk(sk, mptcp_subflow_tcp_sock(subflow), subflow, 0);
-
-       __skb_queue_purge(&sk->sk_receive_queue);
-       skb_rbtree_purge(&msk->out_of_order_queue);
-
-       /* move all the rx fwd alloc into the sk_mem_reclaim_final in
-        * inet_sock_destruct() will dispose it
-        */
-       mptcp_token_destroy(msk);
-       mptcp_pm_destroy(msk);
-}
-
 static void mptcp_destroy(struct sock *sk)
 {
        struct mptcp_sock *msk = mptcp_sk(sk);

diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
index 8c27f4b1789fe29aa6738958d0f895f0d944c1e9..3d2892cc0ef24b3c1e492fcaa7697a002b4a1db0 100644 (file)
--- a/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@ -980,8 +980,6 @@ static inline void mptcp_propagate_sndbuf(struct sock *sk, struct sock *ssk)
        local_bh_enable();
 }
 
-void mptcp_destroy_common(struct mptcp_sock *msk);
-
 #define MPTCP_TOKEN_MAX_RETRIES        4
 
 void __init mptcp_token_init(void);