Drop CONFIG_MPTCP (Martin)
Use ASSERT_EQ (Andrii)
Signed-off-by: Geliang Tang <geliang.tang@suse.com>
---
tools/testing/selftests/bpf/prog_tests/mptcp.c | 12 ++----------
tools/testing/selftests/bpf/progs/mptcp_sock.c | 4 ----
2 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing/selftests/bpf/prog_tests/mptcp.c
index 6cfb29399989..6f333e3aba9c 100644
--- a/tools/testing/selftests/bpf/prog_tests/mptcp.c
+++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c
@@ -14,7 +14,6 @@ struct mptcp_storage {
static int verify_tsk(int map_fd, int client_fd)
{
- char *msg = "plain TCP socket";
int err, cfd = client_fd;
struct mptcp_storage val;
@@ -33,7 +32,6 @@ static int verify_tsk(int map_fd, int client_fd)
static int verify_msk(int map_fd, int client_fd)
{
- char *msg = "MPTCP subflow socket";
int err, cfd = client_fd;
struct mptcp_storage val;
@@ -41,17 +39,11 @@ static int verify_msk(int map_fd, int client_fd)
if (!ASSERT_OK(err, "bpf_map_lookup_elem"))
return err;
- if (val.invoked != 1) {
- log_err("%s: unexpected invoked count %d != 1",
- msg, val.invoked);
+ if (!ASSERT_EQ(val.invoked, 1, "unexpected invoked count"))
err++;
- }
- if (val.is_mptcp != 1) {
- log_err("%s: unexpected bpf_tcp_sock.is_mptcp %d != 1",
- msg, val.is_mptcp);
+ if (!ASSERT_EQ(val.is_mptcp, 1, "unexpected is_mptcp"))
err++;
- }
return err;
}
diff --git a/tools/testing/selftests/bpf/progs/mptcp_sock.c b/tools/testing/selftests/bpf/progs/mptcp_sock.c
index 3feb7ff578e2..dc73b3fbb50b 100644
--- a/tools/testing/selftests/bpf/progs/mptcp_sock.c
+++ b/tools/testing/selftests/bpf/progs/mptcp_sock.c
@@ -7,7 +7,6 @@
#include "bpf_tcp_helpers.h"
char _license[] SEC("license") = "GPL";
-extern bool CONFIG_MPTCP __kconfig;
struct mptcp_storage {
__u32 invoked;
@@ -49,9 +48,6 @@ int _sockops(struct bpf_sock_ops *ctx)
if (!storage)
return 1;
} else {
- if (!CONFIG_MPTCP)
- return 1;
-
msk = bpf_skc_to_mptcp_sock(sk);
if (!msk)
return 1;
--
2.34.1