diff options
| author |   YueHaibing <yuehaibing@huawei.com> | 2019-10-18 17:03:44 +0800 |
|---|---|---|
| committer |   Daniel Borkmann <daniel@iogearbox.net> | 2019-10-18 20:57:07 +0200 |
| commit | 1f5343c0ae9673543055e9794362766e1f0ed163 (patch) | |
| tree | 9876da34a90984c6976b49c9cdff572d51e4ec75 /kernel | |
| parent | bpf: Fix bpf_attr.attach_btf_id check (diff) | |
| download | linux-dev-1f5343c0ae9673543055e9794362766e1f0ed163.tar.xz linux-dev-1f5343c0ae9673543055e9794362766e1f0ed163.zip | |
bpf: Fix build error without CONFIG_NET
If CONFIG_NET is n, building fails:
kernel/trace/bpf_trace.o: In function `raw_tp_prog_func_proto':
bpf_trace.c:(.text+0x1a34): undefined reference to `bpf_skb_output_proto'
Wrap it into a #ifdef to fix this.
Fixes: a7658e1a4164 ("bpf: Check types of arguments passed into helpers")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Yonghong Song <yhs@fb.com>
Link: https://lore.kernel.org/bpf/20191018090344.26936-1-yuehaibing@huawei.com
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/trace/bpf_trace.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c index 52f7e9d8c29b..c3240898cc44 100644 --- a/kernel/trace/bpf_trace.c +++ b/kernel/trace/bpf_trace.c @@ -1055,8 +1055,10 @@ raw_tp_prog_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog) switch (func_id) { case BPF_FUNC_perf_event_output: return &bpf_perf_event_output_proto_raw_tp; +#ifdef CONFIG_NET case BPF_FUNC_skb_output: return &bpf_skb_output_proto; +#endif case BPF_FUNC_get_stackid: return &bpf_get_stackid_proto_raw_tp; case BPF_FUNC_get_stack: |