From: Geliang Tang <tanggeliang@kylinos.cn>

Drop do_setsockopts_accept.

Depends on: selftests: consolidate TCP_INQ testing into sockopt, v2
Based-on: <cover.1754664106.git.tanggeliang@kylinos.cn>

Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
---
 tools/testing/selftests/net/mptcp/mptcp_sockopt.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c b/tools/testing/selftests/net/mptcp/mptcp_sockopt.c
index c12c5e0e6766..063ecdafb336 100644
--- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c
+++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.c
@@ -979,12 +979,6 @@ static void do_setsockopt_inq(int fd)
 		die_perror("setsockopt(TCP_INQ)");
 }
 
-static void do_setsockopts_accept(int fd)
-{
-	if (inq)
-		do_setsockopt_inq(fd);
-}
-
 static int xaccept(int s)
 {
 	int fd = accept(s, NULL, 0);
@@ -992,7 +986,8 @@ static int xaccept(int s)
 	if (fd < 0)
 		die_perror("accept");
 
-	do_setsockopts_accept(fd);
+	if (inq)
+		do_setsockopt_inq(fd);
 
 	return fd;
 }
-- 
2.48.1

Hi Geliang,

Thank you for your modifications, that's great!

Our CI did some validations and here is its report:

- KVM Validation: normal: Unstable: 1 failed test(s): selftest_mptcp_connect_checksum 🔴
- KVM Validation: debug: Success! ✅
- KVM Validation: btf-normal (only bpftest_all): Success! ✅
- KVM Validation: btf-debug (only bpftest_all): Success! ✅
- Task: https://github.com/multipath-tcp/mptcp_net-next/actions/runs/16863231062

Initiator: Patchew Applier
Commits: https://github.com/multipath-tcp/mptcp_net-next/commits/ee2d54a34de0
Patchwork: https://patchwork.kernel.org/project/mptcp/list/?series=989715


If there are some issues, you can reproduce them using the same environment as
the one used by the CI thanks to a docker image, e.g.:

    $ cd [kernel source code]
    $ docker run -v "${PWD}:${PWD}:rw" -w "${PWD}" --privileged --rm -it \
        --pull always mptcp/mptcp-upstream-virtme-docker:latest \
        auto-normal

For more details:

    https://github.com/multipath-tcp/mptcp-upstream-virtme-docker


Please note that despite all the efforts that have been already done to have a
stable tests suite when executed on a public CI like here, it is possible some
reported issues are not due to your modifications. Still, do not hesitate to
help us improve that ;-)

Cheers,
MPTCP GH Action bot
Bot operated by Matthieu Baerts (NGI0 Core)