From 0ac0017a1a37fea3b180a22a0ae5fbaf02db8d2a Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Tue, 31 Oct 2017 18:03:52 +0100 Subject: [PATCH] Update kernel headers from net-next (4.14-rc6) Signed-off-by: Stephen Hemminger --- include/uapi/linux/bpf.h | 6 +++--- include/uapi/linux/sctp.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h index c819b225..b5af49d3 100644 --- a/include/uapi/linux/bpf.h +++ b/include/uapi/linux/bpf.h @@ -645,7 +645,7 @@ union bpf_attr { * @map: pointer to sockmap * @key: key to lookup sock in map * @flags: reserved for future use - * Return: SK_PASS + * Return: SK_REDIRECT * * int bpf_sock_map_update(skops, map, key, flags) * @skops: pointer to bpf_sock_ops @@ -887,8 +887,8 @@ struct xdp_md { }; enum sk_action { - SK_DROP = 0, - SK_PASS, + SK_ABORTED = 0, + SK_DROP, SK_REDIRECT, }; diff --git a/include/uapi/linux/sctp.h b/include/uapi/linux/sctp.h index a3dc7e3d..22b1fed2 100644 --- a/include/uapi/linux/sctp.h +++ b/include/uapi/linux/sctp.h @@ -378,7 +378,7 @@ struct sctp_remote_error { __u16 sre_type; __u16 sre_flags; __u32 sre_length; - __be16 sre_error; + __u16 sre_error; sctp_assoc_t sre_assoc_id; __u8 sre_data[0]; };