update kernel headers from 4.14-rc7 net-next

diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index b5af49d342c0ce08669e74012f56ff9ccf6b1526..c819b2254724bc8a83ab787b8e254787cbe7efe5 100644 (file)
--- 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_REDIRECT
+ *     Return: SK_PASS
  *
  * 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_ABORTED = 0,
-       SK_DROP,
+       SK_DROP = 0,
+       SK_PASS,
        SK_REDIRECT,
 };
 

diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h
index dafe0a6e0421bfa905a2dc9c3dc0f45f81ba9387..35bc598566e00383bcc930ac202cd1ed42d3f636 100644 (file)
--- a/include/uapi/linux/if_link.h
+++ b/include/uapi/linux/if_link.h
@@ -463,6 +463,7 @@ enum macsec_validation_type {
 enum {
        IFLA_IPVLAN_UNSPEC,
        IFLA_IPVLAN_MODE,
+       IFLA_IPVLAN_FLAGS,
        __IFLA_IPVLAN_MAX
 };
 
@@ -475,6 +476,9 @@ enum ipvlan_mode {
        IPVLAN_MODE_MAX
 };
 
+#define IPVLAN_F_PRIVATE       0x01
+#define IPVLAN_F_VEPA          0x02
+
 /* VXLAN section */
 enum {
        IFLA_VXLAN_UNSPEC,

diff --git a/include/uapi/linux/pkt_sched.h b/include/uapi/linux/pkt_sched.h
index e7cc3d3c74210d6e7123c1149155604f41eb9aea..0e88cc262ca0082d2d0727ca9eadd7e441bd0450 100644 (file)
--- a/include/uapi/linux/pkt_sched.h
+++ b/include/uapi/linux/pkt_sched.h
@@ -904,4 +904,23 @@ struct tc_pie_xstats {
        __u32 maxq;             /* maximum queue size */
        __u32 ecn_mark;         /* packets marked with ecn*/
 };
+
+/* CBS */
+struct tc_cbs_qopt {
+       __u8 offload;
+       __u8 _pad[3];
+       __s32 hicredit;
+       __s32 locredit;
+       __s32 idleslope;
+       __s32 sendslope;
+};
+
+enum {
+       TCA_CBS_UNSPEC,
+       TCA_CBS_PARMS,
+       __TCA_CBS_MAX,
+};
+
+#define TCA_CBS_MAX (__TCA_CBS_MAX - 1)
+
 #endif

diff --git a/include/uapi/linux/sctp.h b/include/uapi/linux/sctp.h
index 22b1fed2b7ffad39486b35034d587751ae97993d..a3dc7e3d12c7095dc1357bd9096ce75412b01dec 100644 (file)
--- 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;
-       __u16 sre_error;
+       __be16 sre_error;
        sctp_assoc_t sre_assoc_id;
        __u8 sre_data[0];
 };