update headers from bridge tunnel metadata

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

diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h
index b7393dd2b5407879569031370e6f49d1a6c89ffa..156f4434ca3254acdbdbf7099bad954610de6d69 100644 (file)
--- a/include/linux/if_bridge.h
+++ b/include/linux/if_bridge.h
@@ -118,6 +118,7 @@ enum {
        IFLA_BRIDGE_FLAGS,
        IFLA_BRIDGE_MODE,
        IFLA_BRIDGE_VLAN_INFO,
+       IFLA_BRIDGE_VLAN_TUNNEL_INFO,
        __IFLA_BRIDGE_MAX,
 };
 #define IFLA_BRIDGE_MAX (__IFLA_BRIDGE_MAX - 1)
@@ -134,6 +135,16 @@ struct bridge_vlan_info {
        __u16 vid;
 };
 
+enum {
+       IFLA_BRIDGE_VLAN_TUNNEL_UNSPEC,
+       IFLA_BRIDGE_VLAN_TUNNEL_ID,
+       IFLA_BRIDGE_VLAN_TUNNEL_VID,
+       IFLA_BRIDGE_VLAN_TUNNEL_FLAGS,
+       __IFLA_BRIDGE_VLAN_TUNNEL_MAX,
+};
+
+#define IFLA_BRIDGE_VLAN_TUNNEL_MAX (__IFLA_BRIDGE_VLAN_TUNNEL_MAX - 1)
+
 struct bridge_vlan_xstats {
        __u64 rx_bytes;
        __u64 rx_packets;

diff --git a/include/linux/if_link.h b/include/linux/if_link.h
index 51185d36c312e4472e26090dc10595a6bee139f3..b0bdbd6e16c047f81a16bc69161d020721cf5b6d 100644 (file)
--- a/include/linux/if_link.h
+++ b/include/linux/if_link.h
@@ -320,6 +320,7 @@ enum {
        IFLA_BRPORT_PAD,
        IFLA_BRPORT_MCAST_FLOOD,
        IFLA_BRPORT_MCAST_TO_UCAST,
+       IFLA_BRPORT_VLAN_TUNNEL,
        __IFLA_BRPORT_MAX
 };
 #define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1)

diff --git a/include/linux/ife.h b/include/linux/ife.h
new file mode 100644 (file)
index 0000000..2954da3
--- /dev/null
+++ b/include/linux/ife.h
@@ -0,0 +1,18 @@
+#ifndef __UAPI_IFE_H
+#define __UAPI_IFE_H
+
+#define IFE_METAHDRLEN 2
+
+enum {
+       IFE_META_SKBMARK = 1,
+       IFE_META_HASHID,
+       IFE_META_PRIO,
+       IFE_META_QMAP,
+       IFE_META_TCINDEX,
+       __IFE_META_MAX
+};
+
+/*Can be overridden at runtime by module option*/
+#define IFE_META_MAX (__IFE_META_MAX - 1)
+
+#endif

diff --git a/include/linux/neighbour.h b/include/linux/neighbour.h
index bd99a8d80f36e527094f05ceabb55c21ea004ae7..f3d16dbe09d64424d2d92c581f30771f6add6e0b 100644 (file)
--- a/include/linux/neighbour.h
+++ b/include/linux/neighbour.h
@@ -26,6 +26,7 @@ enum {
        NDA_IFINDEX,
        NDA_MASTER,
        NDA_LINK_NETNSID,
+       NDA_SRC_VNI,
        __NDA_MAX
 };
 

diff --git a/include/linux/tc_act/tc_ife.h b/include/linux/tc_act/tc_ife.h
index cd18360eca249be09c6a649efcb53a147ed76fd2..7c2817866c97e2f72f3f72315e42a34443eff022 100644 (file)
--- a/include/linux/tc_act/tc_ife.h
+++ b/include/linux/tc_act/tc_ife.h
@@ -3,6 +3,7 @@
 
 #include <linux/types.h>
 #include <linux/pkt_cls.h>
+#include <linux/ife.h>
 
 #define TCA_ACT_IFE 25
 /* Flag bits for now just encoding/decoding; mutually exclusive */
@@ -28,13 +29,4 @@ enum {
 };
 #define TCA_IFE_MAX (__TCA_IFE_MAX - 1)
 
-#define IFE_META_SKBMARK 1
-#define IFE_META_HASHID 2
-#define        IFE_META_PRIO 3
-#define        IFE_META_QMAP 4
-#define        IFE_META_TCINDEX 5
-/*Can be overridden at runtime by module option*/
-#define        __IFE_META_MAX 6
-#define IFE_META_MAX (__IFE_META_MAX - 1)
-
 #endif