leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bpf: remove cg_skb_func_proto and use sk_filter_func_proto directly

Browse Source 
Since cg_skb_func_proto() doesn't do anything else than just calling
into sk_filter_func_proto(), remove it and set sk_filter_func_proto()
directly for .get_func_proto callback.

Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Daniel Borkmann 2017-06-11 00:50:46 +02:00 committed by David S. Miller
parent f735b64926
commit 966789fb86
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/core/filter.c
View File

@ -2774,12 +2774,6 @@ xdp_func_proto(enum bpf_func_id func_id)
} }
} }
static const struct bpf_func_proto *
cg_skb_func_proto(enum bpf_func_id func_id)
{
return sk_filter_func_proto(func_id);
}
static const struct bpf_func_proto * static const struct bpf_func_proto *
lwt_inout_func_proto(enum bpf_func_id func_id) lwt_inout_func_proto(enum bpf_func_id func_id)
{ {
@ -3344,7 +3338,7 @@ const struct bpf_verifier_ops xdp_prog_ops = {
}; };
const struct bpf_verifier_ops cg_skb_prog_ops = { const struct bpf_verifier_ops cg_skb_prog_ops = {
.get_func_proto = cg_skb_func_proto, .get_func_proto = sk_filter_func_proto,
.is_valid_access = sk_filter_is_valid_access, .is_valid_access = sk_filter_is_valid_access,
.convert_ctx_access = bpf_convert_ctx_access, .convert_ctx_access = bpf_convert_ctx_access,
.test_run = bpf_prog_test_run_skb, .test_run = bpf_prog_test_run_skb,