update kernel headers to 4.2-net-next

diff --git a/include/linux/if_link.h b/include/linux/if_link.h
index 4f0a558e8fcf7165ae70fa9a3d91b9d749f29ec3..8f105cf20bb9e059c70f8b9c4fa0a43ca47c6940 100644 (file)
--- 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 d46ebef97a6af5b0ded70c6a47e96ed05de1a631..328c1b0f75c3807a76b3c8c120fa585453d27eae 100644 (file)
--- 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,