[v2] Squash to "selftests: bpf: add bpf_first scheduler v8"

[PATCH mptcp-next v2] Squash to "selftests: bpf: add bpf_first scheduler v8"

Geliang Tang posted 1 patch 2 years ago

Diff against v1
Download mbox

Failed in applying to current master (apply log)

tools/testing/selftests/bpf/bpf_mptcp_helpers.h     | 12 ++++++++++++
tools/testing/selftests/bpf/bpf_tcp_helpers.h       | 12 ------------
tools/testing/selftests/bpf/progs/mptcp_bpf_first.c |  2 +-
3 files changed, 13 insertions(+), 13 deletions(-)

Expand all Fold all

[PATCH mptcp-next v2] Squash to "selftests: bpf: add bpf_first scheduler v8"

Posted by Geliang Tang 2 years ago

- Move mptcp_sched_ops to bpf_mptcp_helpers.h.

v2:
 - no need to update MAINTAINERS now.

Signed-off-by: Geliang Tang <geliang.tang@suse.com>
---
 tools/testing/selftests/bpf/bpf_mptcp_helpers.h     | 12 ++++++++++++
 tools/testing/selftests/bpf/bpf_tcp_helpers.h       | 12 ------------
 tools/testing/selftests/bpf/progs/mptcp_bpf_first.c |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/tools/testing/selftests/bpf/bpf_mptcp_helpers.h b/tools/testing/selftests/bpf/bpf_mptcp_helpers.h
index b5a43b108982..5135eb6710e8 100644
--- a/tools/testing/selftests/bpf/bpf_mptcp_helpers.h
+++ b/tools/testing/selftests/bpf/bpf_mptcp_helpers.h
@@ -14,4 +14,16 @@ struct mptcp_sock {
 	char		ca_name[TCP_CA_NAME_MAX];
 } __attribute__((preserve_access_index));
 
+#define MPTCP_SCHED_NAME_MAX 16
+
+struct mptcp_sched_ops {
+	char name[MPTCP_SCHED_NAME_MAX];
+
+	void (*init)(struct mptcp_sock *msk);
+	void (*release)(struct mptcp_sock *msk);
+
+	struct sock *	(*get_subflow)(struct mptcp_sock *msk);
+	void *owner;
+};
+
 #endif
diff --git a/tools/testing/selftests/bpf/bpf_tcp_helpers.h b/tools/testing/selftests/bpf/bpf_tcp_helpers.h
index ee66a8bef85d..89750d732cfa 100644
--- a/tools/testing/selftests/bpf/bpf_tcp_helpers.h
+++ b/tools/testing/selftests/bpf/bpf_tcp_helpers.h
@@ -189,18 +189,6 @@ struct tcp_congestion_ops {
 	void *owner;
 };
 
-#define MPTCP_SCHED_NAME_MAX 16
-
-struct mptcp_sched_ops {
-	char name[MPTCP_SCHED_NAME_MAX];
-
-	void (*init)(struct mptcp_sock *msk);
-	void (*release)(struct mptcp_sock *msk);
-
-	struct sock *	(*get_subflow)(struct mptcp_sock *msk);
-	void *owner;
-};
-
 #define min(a, b) ((a) < (b) ? (a) : (b))
 #define max(a, b) ((a) > (b) ? (a) : (b))
 #define min_not_zero(x, y) ({			\
diff --git a/tools/testing/selftests/bpf/progs/mptcp_bpf_first.c b/tools/testing/selftests/bpf/progs/mptcp_bpf_first.c
index 3ae5c1eab5f5..21890a60f9c2 100644
--- a/tools/testing/selftests/bpf/progs/mptcp_bpf_first.c
+++ b/tools/testing/selftests/bpf/progs/mptcp_bpf_first.c
@@ -2,7 +2,7 @@
 /* Copyright (c) 2022, SUSE. */
 
 #include <linux/bpf.h>
-#include "bpf_tcp_helpers.h"
+#include "bpf_mptcp_helpers.h"
 
 char _license[] SEC("license") = "GPL";
 
-- 
2.34.1