matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update headers from bridge tunnel metadata 

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
This commit is contained in:
Stephen Hemminger 2017-02-07 11:52:21 -08:00
parent b32c0b64fa
commit 985091aa8c
5 changed files with 32 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/linux/if_bridge.h
View File

@ -118,6 +118,7 @@ enum {
IFLA_BRIDGE_FLAGS, IFLA_BRIDGE_FLAGS,
IFLA_BRIDGE_MODE, IFLA_BRIDGE_MODE,
IFLA_BRIDGE_VLAN_INFO, IFLA_BRIDGE_VLAN_INFO,
IFLA_BRIDGE_VLAN_TUNNEL_INFO,
__IFLA_BRIDGE_MAX, __IFLA_BRIDGE_MAX,
}; };
#define IFLA_BRIDGE_MAX (__IFLA_BRIDGE_MAX - 1) #define IFLA_BRIDGE_MAX (__IFLA_BRIDGE_MAX - 1)
@ -134,6 +135,16 @@ struct bridge_vlan_info {
__u16 vid; __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 { struct bridge_vlan_xstats {
__u64 rx_bytes; __u64 rx_bytes;
__u64 rx_packets; __u64 rx_packets;

1
include/linux/if_link.h
View File

@ -320,6 +320,7 @@ enum {
IFLA_BRPORT_PAD, IFLA_BRPORT_PAD,
IFLA_BRPORT_MCAST_FLOOD, IFLA_BRPORT_MCAST_FLOOD,
IFLA_BRPORT_MCAST_TO_UCAST, IFLA_BRPORT_MCAST_TO_UCAST,
IFLA_BRPORT_VLAN_TUNNEL,
__IFLA_BRPORT_MAX __IFLA_BRPORT_MAX
}; };
#define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1) #define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1)

18
include/linux/ife.h Normal file
View File

@ -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

1
include/linux/neighbour.h
View File

@ -26,6 +26,7 @@ enum {
NDA_IFINDEX, NDA_IFINDEX,
NDA_MASTER, NDA_MASTER,
NDA_LINK_NETNSID, NDA_LINK_NETNSID,
NDA_SRC_VNI,
__NDA_MAX __NDA_MAX
}; };

10
include/linux/tc_act/tc_ife.h
View File

@ -3,6 +3,7 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/pkt_cls.h> #include <linux/pkt_cls.h>
#include <linux/ife.h>
#define TCA_ACT_IFE 25 #define TCA_ACT_IFE 25
/* Flag bits for now just encoding/decoding; mutually exclusive */ /* Flag bits for now just encoding/decoding; mutually exclusive */
@ -28,13 +29,4 @@ enum {
}; };
#define TCA_IFE_MAX (__TCA_IFE_MAX - 1) #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 #endif