diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-10-27 04:31:44 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-10-27 04:31:44 -0400 |
| commit | 6856b8e53609ee3eff7e3173e4e5d979f47d834d (patch) | |
| tree | c2f9e364889fa07e20081b198a085a4ed7b26bd3 /samples | |
| parent | 57646b6fda9b751e62929c73b1e6df06b108a3c9 (diff) | |
| parent | 2eece390bf68ec8f733d7e4a3ba8a5ea350082ae (diff) | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'samples')
| -rw-r--r-- | samples/sockmap/sockmap_kern.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/samples/sockmap/sockmap_kern.c b/samples/sockmap/sockmap_kern.c index f9b38ef82dc2..52b0053274f4 100644 --- a/samples/sockmap/sockmap_kern.c +++ b/samples/sockmap/sockmap_kern.c | |||
| @@ -62,7 +62,7 @@ int bpf_prog2(struct __sk_buff *skb) | |||
| 62 | ret = 1; | 62 | ret = 1; |
| 63 | 63 | ||
| 64 | bpf_printk("sockmap: %d -> %d @ %d\n", lport, bpf_ntohl(rport), ret); | 64 | bpf_printk("sockmap: %d -> %d @ %d\n", lport, bpf_ntohl(rport), ret); |
| 65 | return bpf_sk_redirect_map(&sock_map, ret, 0); | 65 | return bpf_sk_redirect_map(skb, &sock_map, ret, 0); |
| 66 | } | 66 | } |
| 67 | 67 | ||
| 68 | SEC("sockops") | 68 | SEC("sockops") |