diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-08-24 12:11:29 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-08-24 12:11:29 +0200 |
| commit | eb4e841099f813c2df5fbb00ae4a9d315cb7c9dc (patch) | |
| tree | 15c1f7e595cb3168035d111d628c919a61f3b14a /samples/bpf/bpf_helpers.h | |
| parent | 556b6723689694ac9134bcc36a07828168e057f4 (diff) | |
| parent | fa8410b355251fd30341662a40ac6b22d3e38468 (diff) | |
Merge tag 'v4.8-rc3' into x86/asm, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'samples/bpf/bpf_helpers.h')
| -rw-r--r-- | samples/bpf/bpf_helpers.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/samples/bpf/bpf_helpers.h b/samples/bpf/bpf_helpers.h index 217c8d507f2e..7927a090fa0d 100644 --- a/samples/bpf/bpf_helpers.h +++ b/samples/bpf/bpf_helpers.h @@ -72,8 +72,8 @@ static int (*bpf_l3_csum_replace)(void *ctx, int off, int from, int to, int flag (void *) BPF_FUNC_l3_csum_replace; static int (*bpf_l4_csum_replace)(void *ctx, int off, int from, int to, int flags) = (void *) BPF_FUNC_l4_csum_replace; -static int (*bpf_skb_in_cgroup)(void *ctx, void *map, int index) = - (void *) BPF_FUNC_skb_in_cgroup; +static int (*bpf_skb_under_cgroup)(void *ctx, void *map, int index) = + (void *) BPF_FUNC_skb_under_cgroup; #if defined(__x86_64__) |