From: Stephen Hemminger <shemming@brocade.com>
Date: Fri, 18 Dec 2015 01:21:53 +0000 (-0800)
Subject: include: update kernel headers
X-Git-Tag: v4.5.0~93^2~9^2~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=741c20b024f5f51bf194435fc4d79f34ae5c5481;p=thirdparty%2Fiproute2.git

include: update kernel headers

Current headers for net-next
---

diff --git a/include/linux/if_link.h b/include/linux/if_link.h
index 5d206c712..c9ad487d0 100644
--- 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 994f4c22d..aa5b66df6 100644
--- 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 18c543a59..6aaa2a3e3 100644
--- 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 024e1f4cd..dafcb891a 100644
--- 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;