[PATCH mptcp-next v2] Squash to "bpf: add bpf_skc_to_mptcp_sock_proto v13"

Geliang Tang posted 1 patch 2 years ago
Failed in applying to current master (apply log)
net/mptcp/Makefile | 2 ++
scripts/bpf_doc.py | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
[PATCH mptcp-next v2] Squash to "bpf: add bpf_skc_to_mptcp_sock_proto v13"
Posted by Geliang Tang 2 years ago
Put 'struct mptcp_sock' at the end of the array in scripts/bpf_doc.py.
And check CONFIG_BPF_JIT in Makefile.

Signed-off-by: Geliang Tang <geliang.tang@suse.com>
---
v2:
 - check CONFIG_BPF_JIT.
---
 net/mptcp/Makefile | 2 ++
 scripts/bpf_doc.py | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/net/mptcp/Makefile b/net/mptcp/Makefile
index 99dddf08ca73..168c55d1c917 100644
--- a/net/mptcp/Makefile
+++ b/net/mptcp/Makefile
@@ -11,4 +11,6 @@ mptcp_crypto_test-objs := crypto_test.o
 mptcp_token_test-objs := token_test.o
 obj-$(CONFIG_MPTCP_KUNIT_TEST) += mptcp_crypto_test.o mptcp_token_test.o
 
+ifeq ($(CONFIG_BPF_JIT),y)
 obj-$(CONFIG_BPF_SYSCALL) += bpf.o
+endif
diff --git a/scripts/bpf_doc.py b/scripts/bpf_doc.py
index 0e5a9e69ae59..d5452f7eb996 100755
--- a/scripts/bpf_doc.py
+++ b/scripts/bpf_doc.py
@@ -623,7 +623,6 @@ class PrinterHelpers(Printer):
             'struct udp6_sock',
             'struct unix_sock',
             'struct task_struct',
-            'struct mptcp_sock',
 
             'struct __sk_buff',
             'struct sk_msg_md',
@@ -634,6 +633,7 @@ class PrinterHelpers(Printer):
             'struct socket',
             'struct file',
             'struct bpf_timer',
+            'struct mptcp_sock',
     ]
     known_types = {
             '...',
-- 
2.34.1