aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorJohn Fastabend <john.fastabend@gmail.com>2017-10-31 22:17:31 -0400
committerDavid S. Miller <davem@davemloft.net>2017-10-31 22:43:50 -0400
commit04686ef299db5ff299bfc5a4504b189e46842078 (patch)
treea370942e93babe219c14f3022f8d78f69198c328 /tools
parent14fc0abafe159fbe8bbcfeca157ef3ba139fa75f (diff)
bpf: remove SK_REDIRECT from UAPI
Now that SK_REDIRECT is no longer a valid return code. Remove it from the UAPI completely. Then do a namespace remapping internal to sockmap so SK_REDIRECT is no longer externally visible. Patchs primary change is to do a namechange from SK_REDIRECT to __SK_REDIRECT Reported-by: Alexei Starovoitov <ast@kernel.org> Signed-off-by: John Fastabend <john.fastabend@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'tools')
-rw-r--r--tools/include/uapi/linux/bpf.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h
index c174971afbe6..01cc7ba39924 100644
--- a/tools/include/uapi/linux/bpf.h
+++ b/tools/include/uapi/linux/bpf.h
@@ -576,7 +576,7 @@ union bpf_attr {
576 * @map: pointer to sockmap 576 * @map: pointer to sockmap
577 * @key: key to lookup sock in map 577 * @key: key to lookup sock in map
578 * @flags: reserved for future use 578 * @flags: reserved for future use
579 * Return: SK_REDIRECT 579 * Return: SK_PASS
580 * 580 *
581 * int bpf_sock_map_update(skops, map, key, flags) 581 * int bpf_sock_map_update(skops, map, key, flags)
582 * @skops: pointer to bpf_sock_ops 582 * @skops: pointer to bpf_sock_ops
@@ -789,7 +789,6 @@ struct xdp_md {
789enum sk_action { 789enum sk_action {
790 SK_DROP = 0, 790 SK_DROP = 0,
791 SK_PASS, 791 SK_PASS,
792 SK_REDIRECT,
793}; 792};
794 793
795#define BPF_TAG_SIZE 8 794#define BPF_TAG_SIZE 8