update kernel headers from 4.14 net-next

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

diff --git a/include/uapi/linux/ila.h b/include/uapi/linux/ila.h
index 9407d0dc3ef63685c105a7d8d713319f0e3c356b..666292cfc6e54a6380cfbd8e57ac8d81bbbf99f4 100644 (file)
--- a/include/uapi/linux/ila.h
+++ b/include/uapi/linux/ila.h
@@ -17,6 +17,8 @@ enum {
        ILA_ATTR_DIR,                           /* u32 */
        ILA_ATTR_PAD,
        ILA_ATTR_CSUM_MODE,                     /* u8 */
+       ILA_ATTR_IDENT_TYPE,                    /* u8 */
+       ILA_ATTR_HOOK_TYPE,                     /* u8 */
 
        __ILA_ATTR_MAX,
 };
@@ -41,6 +43,25 @@ enum {
        ILA_CSUM_ADJUST_TRANSPORT,
        ILA_CSUM_NEUTRAL_MAP,
        ILA_CSUM_NO_ACTION,
+       ILA_CSUM_NEUTRAL_MAP_AUTO,
+};
+
+enum {
+       ILA_ATYPE_IID = 0,
+       ILA_ATYPE_LUID,
+       ILA_ATYPE_VIRT_V4,
+       ILA_ATYPE_VIRT_UNI_V6,
+       ILA_ATYPE_VIRT_MULTI_V6,
+       ILA_ATYPE_NONLOCAL_ADDR,
+       ILA_ATYPE_RSVD_1,
+       ILA_ATYPE_RSVD_2,
+
+       ILA_ATYPE_USE_FORMAT = 32, /* Get type from type field in identifier */
+};
+
+enum {
+       ILA_HOOK_ROUTE_OUTPUT,
+       ILA_HOOK_ROUTE_INPUT,
 };
 
 #endif /* _LINUX_ILA_H */

diff --git a/include/uapi/linux/pkt_sched.h b/include/uapi/linux/pkt_sched.h
index 5002562868ccf896be8702bec73ef3932c4222ee..6a2c5ea7e9c4e04264ddd80de963dc7ba1f8fede 100644 (file)
--- a/include/uapi/linux/pkt_sched.h
+++ b/include/uapi/linux/pkt_sched.h
@@ -256,6 +256,7 @@ struct tc_red_qopt {
 #define TC_RED_ECN             1
 #define TC_RED_HARDDROP                2
 #define TC_RED_ADAPTATIVE      4
+#define TC_RED_OFFLOADED       8
 };
 
 struct tc_red_xstats {