diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2017-10-30 10:30:09 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-10-30 10:30:09 +0100 |
| commit | e17bae3266cc3d828003bdf78b5aa019db3ffa95 (patch) | |
| tree | a73f200ba68bea7915b25e1a077c3f43c9183bdc /tools/include/uapi/linux | |
| parent | x86/xen: Drop 5-level paging support code from the XEN_PV code (diff) | |
| parent | Linux 4.14-rc7 (diff) | |
Merge tag 'v4.14-rc7' into x86/mm, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/include/uapi/linux')
| -rw-r--r-- | tools/include/uapi/linux/bpf.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h index f90860d1f897..c174971afbe6 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 @@ -786,8 +787,8 @@ struct xdp_md { }; enum sk_action { - SK_ABORTED = 0, - SK_DROP, + SK_DROP = 0, + SK_PASS, SK_REDIRECT, }; |