Squash to "selftests/bpf: verify first of struct mptcp_sock"

[PATCH mptcp-next] Squash to "selftests/bpf: verify first of struct mptcp_sock"

Geliang Tang posted 1 patch 3 years, 4 months ago

Download mbox

Failed in applying to current master (apply log)

tools/testing/selftests/bpf/prog_tests/mptcp.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)

Expand all Fold all

[PATCH mptcp-next] Squash to "selftests/bpf: verify first of struct mptcp_sock"

Posted by Geliang Tang 3 years, 4 months ago

Use ASSERT_EQ.

Signed-off-by: Geliang Tang <geliang.tang@suse.com>
---
 tools/testing/selftests/bpf/prog_tests/mptcp.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing/selftests/bpf/prog_tests/mptcp.c
index 913ece278ffa..4106e0b8e407 100644
--- a/tools/testing/selftests/bpf/prog_tests/mptcp.c
+++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c
@@ -120,11 +120,8 @@ static int verify_msk(int map_fd, int client_fd)
 	if (!ASSERT_EQ(val.token, token, "unexpected token"))
 		err++;
 
-	if (val.first != val.sk) {
-		log_err("Unexpected mptcp_sock.first %p != %p",
-			val.first, val.sk);
+	if (!ASSERT_EQ(val.first, val.sk, "unexpected first"))
 		err++;
-	}
 
 	if (!ASSERT_STRNEQ(val.ca_name, ca_name, TCP_CA_NAME_MAX, "unexpected ca_name"))
 		err++;
-- 
2.34.1