aboutsummaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorDaniel Xu <dxu@dxuuu.xyz>2022-09-20 08:15:24 -0600
committerMartin KaFai Lau <martin.lau@kernel.org>2022-09-20 14:41:35 -0700
commitfdf214978a71b2749d26f6da2b1d51d9ac23831d (patch)
tree748eab430d6935f0acb4ab2c9aad738d145b4d0d /include/net
parentbpf: Rename nfct_bsa to nfct_btf_struct_access (diff)
downloadlinux-dev-fdf214978a71b2749d26f6da2b1d51d9ac23831d.tar.xz
linux-dev-fdf214978a71b2749d26f6da2b1d51d9ac23831d.zip
bpf: Move nf_conn extern declarations to filter.h
We're seeing the following new warnings on netdev/build_32bit and netdev/build_allmodconfig_warn CI jobs: ../net/core/filter.c:8608:1: warning: symbol 'nf_conn_btf_access_lock' was not declared. Should it be static? ../net/core/filter.c:8611:5: warning: symbol 'nfct_bsa' was not declared. Should it be static? Fix by ensuring extern declaration is present while compiling filter.o. Fixes: 864b656f82cc ("bpf: Add support for writing to nf_conn:mark") Signed-off-by: Daniel Xu <dxu@dxuuu.xyz> Link: https://lore.kernel.org/r/2bd2e0283df36d8a4119605878edb1838d144174.1663683114.git.dxu@dxuuu.xyz Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>
Diffstat (limited to 'include/net')
-rw-r--r--include/net/netfilter/nf_conntrack_bpf.h7
1 files changed, 0 insertions, 7 deletions
diff --git a/include/net/netfilter/nf_conntrack_bpf.h b/include/net/netfilter/nf_conntrack_bpf.h
index 1199d4f8e019..c8b80add1142 100644
--- a/include/net/netfilter/nf_conntrack_bpf.h
+++ b/include/net/netfilter/nf_conntrack_bpf.h
@@ -4,7 +4,6 @@
#define _NF_CONNTRACK_BPF_H
#include <linux/kconfig.h>
-#include <linux/mutex.h>
#if (IS_BUILTIN(CONFIG_NF_CONNTRACK) && IS_ENABLED(CONFIG_DEBUG_INFO_BTF)) || \
(IS_MODULE(CONFIG_NF_CONNTRACK) && IS_ENABLED(CONFIG_DEBUG_INFO_BTF_MODULES))
@@ -12,12 +11,6 @@
extern int register_nf_conntrack_bpf(void);
extern void cleanup_nf_conntrack_bpf(void);
-extern struct mutex nf_conn_btf_access_lock;
-extern int (*nfct_btf_struct_access)(struct bpf_verifier_log *log, const struct btf *btf,
- const struct btf_type *t, int off, int size,
- enum bpf_access_type atype, u32 *next_btf_id,
- enum bpf_type_flag *flag);
-
#else
static inline int register_nf_conntrack_bpf(void)