]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
mptcp: remove unused returned value of check_data_fin
authorMatthieu Baerts (NGI0) <matttbe@kernel.org>
Fri, 19 Sep 2025 12:09:03 +0000 (14:09 +0200)
committerJakub Kicinski <kuba@kernel.org>
Mon, 22 Sep 2025 18:51:25 +0000 (11:51 -0700)
When working on a fix modifying mptcp_check_data_fin(), I noticed the
returned value was no longer used.

It looks like it was used for 3 days, between commit 7ed90803a213
("mptcp: send explicit ack on delayed ack_seq incr") and commit
ea4ca586b16f ("mptcp: refine MPTCP-level ack scheduling").

This returned value can be safely removed.

Reviewed-by: Geliang Tang <geliang@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/20250919-net-next-mptcp-server-side-flag-v1-6-a97a5d561a8b@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/mptcp/protocol.c

index d9fbddb99ad0fb53f160af7654433a12c609ee25..735a209d40725f077de1056de5e1c64ffec77f55 100644 (file)
@@ -545,11 +545,10 @@ static void mptcp_cleanup_rbuf(struct mptcp_sock *msk, int copied)
        }
 }
 
-static bool mptcp_check_data_fin(struct sock *sk)
+static void mptcp_check_data_fin(struct sock *sk)
 {
        struct mptcp_sock *msk = mptcp_sk(sk);
        u64 rcv_data_fin_seq;
-       bool ret = false;
 
        /* Need to ack a DATA_FIN received from a peer while this side
         * of the connection is in ESTABLISHED, FIN_WAIT1, or FIN_WAIT2.
@@ -588,12 +587,10 @@ static bool mptcp_check_data_fin(struct sock *sk)
                        break;
                }
 
-               ret = true;
                if (!__mptcp_check_fallback(msk))
                        mptcp_send_ack(msk);
                mptcp_close_wake_up(sk);
        }
-       return ret;
 }
 
 static void mptcp_dss_corruption(struct mptcp_sock *msk, struct sock *ssk)