summaryrefslogtreecommitdiff
path: root/samples
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2017-10-27 11:31:44 +0300
committerIngo Molnar <mingo@kernel.org>2017-10-27 11:31:44 +0300
commit6856b8e53609ee3eff7e3173e4e5d979f47d834d (patch)
treec2f9e364889fa07e20081b198a085a4ed7b26bd3 /samples
parent57646b6fda9b751e62929c73b1e6df06b108a3c9 (diff)
parent2eece390bf68ec8f733d7e4a3ba8a5ea350082ae (diff)
downloadlinux-6856b8e53609ee3eff7e3173e4e5d979f47d834d.tar.xz
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.c2
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)
ret = 1;
bpf_printk("sockmap: %d -> %d @ %d\n", lport, bpf_ntohl(rport), ret);
- return bpf_sk_redirect_map(&sock_map, ret, 0);
+ return bpf_sk_redirect_map(skb, &sock_map, ret, 0);
}
SEC("sockops")