From: Stephen Hemminger <stephen@networkplumber.org>
Date: Tue, 31 Oct 2017 17:03:52 +0000 (+0100)
Subject: Update kernel headers from net-next (4.14-rc6)
X-Git-Tag: v4.16.0~158
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ac0017a1a37fea3b180a22a0ae5fbaf02db8d2a;p=thirdparty%2Fiproute2.git

Update kernel headers from net-next (4.14-rc6)

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---

diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index c819b2254..b5af49d34 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 a3dc7e3d1..22b1fed2b 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];
 };