include: update kernel headers

Current headers for net-next

diff --git a/include/linux/if_link.h b/include/linux/if_link.h
index 5d206c712b7647d0db19e57b88ca146582d4cfcd..c9ad487d04f0eb295a164cd0ce65c6011165df34 100644 (file)
--- a/include/linux/if_link.h
+++ b/include/linux/if_link.h
@@ -460,6 +460,9 @@ enum {
        IFLA_GENEVE_PORT,       /* destination port */
        IFLA_GENEVE_COLLECT_METADATA,
        IFLA_GENEVE_REMOTE6,
+       IFLA_GENEVE_UDP_CSUM,
+       IFLA_GENEVE_UDP_ZERO_CSUM6_TX,
+       IFLA_GENEVE_UDP_ZERO_CSUM6_RX,
        __IFLA_GENEVE_MAX
 };
 #define IFLA_GENEVE_MAX        (__IFLA_GENEVE_MAX - 1)

diff --git a/include/linux/in6.h b/include/linux/in6.h
index 994f4c22d741d922d3f38d420cbb49e1e7dc4816..aa5b66df68c58b183c36657d0cd8ef1249e4b45a 100644 (file)
--- a/include/linux/in6.h
+++ b/include/linux/in6.h
@@ -196,6 +196,7 @@ struct in6_flowlabel_req {
 
 #define IPV6_IPSEC_POLICY      34
 #define IPV6_XFRM_POLICY       35
+#define IPV6_HDRINCL           36
 #endif
 
 /*

diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h
index 18c543a591a94ed69e9409256301dad2f117969c..6aaa2a3e3c0a35d59b33fd8aec0de23809070494 100644 (file)
--- a/include/linux/rtnetlink.h
+++ b/include/linux/rtnetlink.h
@@ -311,6 +311,7 @@ enum rtattr_type_t {
        RTA_PREF,
        RTA_ENCAP_TYPE,
        RTA_ENCAP,
+       RTA_EXPIRES,
        __RTA_MAX
 };
 

diff --git a/include/linux/sock_diag.h b/include/linux/sock_diag.h
index 024e1f4cdbd09e6fd505ab9189e61198160ef259..dafcb891a5ea0fd9a2cd6f18262bbbdc325d6837 100644 (file)
--- a/include/linux/sock_diag.h
+++ b/include/linux/sock_diag.h
@@ -4,6 +4,7 @@
 #include <linux/types.h>
 
 #define SOCK_DIAG_BY_FAMILY 20
+#define SOCK_DESTROY 21
 
 struct sock_diag_req {
        __u8    sdiag_family;