summaryrefslogtreecommitdiffstats
path: root/tools/include
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2017-10-27 10:31:44 +0200
committerIngo Molnar <mingo@kernel.org>2017-10-27 10:31:44 +0200
commit6856b8e53609ee3eff7e3173e4e5d979f47d834d (patch)
treec2f9e364889fa07e20081b198a085a4ed7b26bd3 /tools/include
parent57646b6fda9b751e62929c73b1e6df06b108a3c9 (diff)
parent2eece390bf68ec8f733d7e4a3ba8a5ea350082ae (diff)
downloadlinux-6856b8e53609ee3eff7e3173e4e5d979f47d834d.tar.bz2
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.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h
index f90860d1f897..24b35a1fd4d6 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