diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-10-27 10:31:44 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-10-27 10:31:44 +0200 |
| commit | 6856b8e53609ee3eff7e3173e4e5d979f47d834d (patch) | |
| tree | c2f9e364889fa07e20081b198a085a4ed7b26bd3 /tools/include | |
| parent | 57646b6fda9b751e62929c73b1e6df06b108a3c9 (diff) | |
| parent | 2eece390bf68ec8f733d7e4a3ba8a5ea350082ae (diff) | |
| download | op-kernel-dev-6856b8e53609ee3eff7e3173e4e5d979f47d834d.zip op-kernel-dev-6856b8e53609ee3eff7e3173e4e5d979f47d834d.tar.gz | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/include')
| -rw-r--r-- | tools/include/uapi/linux/bpf.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h index f90860d..24b35a1 100644 --- a/tools/include/uapi/linux/bpf.h +++ b/tools/include/uapi/linux/bpf.h @@ -569,9 +569,10 @@ union bpf_attr { * @flags: reserved for future use * Return: 0 on success or negative error code * - * int bpf_sk_redirect_map(map, key, flags) + * int bpf_sk_redirect_map(skb, map, key, flags) * Redirect skb to a sock in map using key as a lookup key for the * sock in map. + * @skb: pointer to skb * @map: pointer to sockmap * @key: key to lookup sock in map * @flags: reserved for future use |
