diff options
| author | Stephen Hemminger <stephen@networkplumber.org> | 2017-10-31 18:01:51 +0100 |
|---|---|---|
| committer | Stephen Hemminger <stephen@networkplumber.org> | 2017-10-31 18:01:51 +0100 |
| commit | e3488892897dbd4c7b33f7899f768c75893aff6d (patch) | |
| tree | 0f79a82161f38c7cd26e191537299270c03fd410 | |
| parent | 25a24934ab77436fae1a0ba076aac16350191ead (diff) | |
| download | platform_external_iproute2-e3488892897dbd4c7b33f7899f768c75893aff6d.tar.gz platform_external_iproute2-e3488892897dbd4c7b33f7899f768c75893aff6d.tar.bz2 platform_external_iproute2-e3488892897dbd4c7b33f7899f768c75893aff6d.zip | |
Update kernel headers based on 4.14-rc7
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
| -rw-r--r-- | include/uapi/linux/bpf.h | 8 | ||||
| -rw-r--r-- | include/uapi/linux/sctp.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h index 0895a529..e6d520bd 100644 --- a/include/uapi/linux/bpf.h +++ b/include/uapi/linux/bpf.h @@ -312,7 +312,7 @@ union bpf_attr { * jump into another BPF program * @ctx: context pointer passed to next program * @prog_array_map: pointer to map which type is BPF_MAP_TYPE_PROG_ARRAY - * @index: index inside array that selects specific program to run + * @index: 32-bit index inside array that selects specific program to run * Return: 0 on success or negative error * * int bpf_clone_redirect(skb, ifindex, flags) @@ -575,7 +575,7 @@ union bpf_attr { * @map: pointer to sockmap * @key: key to lookup sock in map * @flags: reserved for future use - * Return: SK_REDIRECT + * Return: SK_PASS * * int bpf_sock_map_update(skops, map, key, flags) * @skops: pointer to bpf_sock_ops @@ -786,8 +786,8 @@ struct xdp_md { }; enum sk_action { - SK_ABORTED = 0, - SK_DROP, + SK_DROP = 0, + SK_PASS, SK_REDIRECT, }; diff --git a/include/uapi/linux/sctp.h b/include/uapi/linux/sctp.h index fec24c41..39922b7a 100644 --- a/include/uapi/linux/sctp.h +++ b/include/uapi/linux/sctp.h @@ -376,7 +376,7 @@ struct sctp_remote_error { __u16 sre_type; __u16 sre_flags; __u32 sre_length; - __u16 sre_error; + __be16 sre_error; sctp_assoc_t sre_assoc_id; __u8 sre_data[0]; }; |