From: Stephen Hemminger <shemming@brocade.com>
Date: Sun, 23 Aug 2015 17:10:44 +0000 (-0700)
Subject: update kernel headers to 4.2-net-next
X-Git-Tag: v4.3.0~68
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=75d67d356e12d32feb11d0350ec9e0724b438dbc;p=thirdparty%2Fiproute2.git

update kernel headers to 4.2-net-next
---

diff --git a/include/linux/if_link.h b/include/linux/if_link.h
index 4f0a558e8..8f105cf20 100644
--- a/include/linux/if_link.h
+++ b/include/linux/if_link.h
@@ -339,6 +339,15 @@ enum macvlan_macaddr_mode {
 
 #define MACVLAN_FLAG_NOPROMISC	1
 
+/* VRF section */
+enum {
+	IFLA_VRF_UNSPEC,
+	IFLA_VRF_TABLE,
+	__IFLA_VRF_MAX
+};
+
+#define IFLA_VRF_MAX (__IFLA_VRF_MAX - 1)
+
 /* IPVLAN section */
 enum {
 	IFLA_IPVLAN_UNSPEC,
diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h
index d46ebef97..328c1b0f7 100644
--- a/include/linux/rtnetlink.h
+++ b/include/linux/rtnetlink.h
@@ -286,21 +286,6 @@ enum rt_class_t {
 
 /* Routing message attributes */
 
-enum ip_tunnel_t {
-	IP_TUN_UNSPEC,
-	IP_TUN_ID,
-	IP_TUN_DST,
-	IP_TUN_SRC,
-	IP_TUN_TTL,
-	IP_TUN_TOS,
-	IP_TUN_SPORT,
-	IP_TUN_DPORT,
-	IP_TUN_FLAGS,
-	__IP_TUN_MAX,
-};
-
-#define IP_TUN_MAX (__IP_TUN_MAX - 1)
-
 enum rtattr_type_t {
 	RTA_UNSPEC,
 	RTA_DST,