Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
vxlan-gbp: Add support for vxlan gbp
[vpp.git]
/
src
/
vnet
/
buffer.h
diff --git
a/src/vnet/buffer.h
b/src/vnet/buffer.h
index
2ddea86
..
7e4387b
100644
(file)
--- a/
src/vnet/buffer.h
+++ b/
src/vnet/buffer.h
@@
-51,7
+51,7
@@
_( 3, VLAN_2_DEEP, "vlan-2-deep") \
_( 4, VLAN_1_DEEP, "vlan-1-deep") \
_( 5, SPAN_CLONE, "span-clone") \
_( 3, VLAN_2_DEEP, "vlan-2-deep") \
_( 4, VLAN_1_DEEP, "vlan-1-deep") \
_( 5, SPAN_CLONE, "span-clone") \
- _( 6,
HANDOFF_NEXT_VALID, "handoff-next-valid")
\
+ _( 6,
LOOP_COUNTER_VALID, 0)
\
_( 7, LOCALLY_ORIGINATED, "local") \
_( 8, IS_IP4, "ip4") \
_( 9, IS_IP6, "ip6") \
_( 7, LOCALLY_ORIGINATED, "local") \
_( 8, IS_IP4, "ip4") \
_( 9, IS_IP6, "ip6") \
@@
-85,11
+85,9
@@
enum
#define foreach_buffer_opaque_union_subtype \
_(ip) \
#define foreach_buffer_opaque_union_subtype \
_(ip) \
-_(swt) \
_(l2) \
_(l2t) \
_(l2_classify) \
_(l2) \
_(l2t) \
_(l2_classify) \
-_(handoff) \
_(policer) \
_(ipsec) \
_(map) \
_(policer) \
_(ipsec) \
_(map) \
@@
-163,7
+161,6
@@
typedef struct
/* reassembly */
union
{
/* reassembly */
union
{
- u32 pad[2]; /* do not overlay w/ ip.adj_index[0,1] */
/* in/out variables */
struct
{
/* in/out variables */
struct
{
@@
-210,13
+207,6
@@
typedef struct
} bier;
} mpls;
} bier;
} mpls;
- /* ip4-in-ip6 softwire termination, only valid there */
- struct
- {
- u8 swt_disable;
- u32 mapping_index;
- } swt;
-
/* l2 bridging path, only valid there */
struct opaque_l2
{
/* l2 bridging path, only valid there */
struct opaque_l2
{
@@
-248,12
+238,6
@@
typedef struct
u64 hash;
} l2_classify;
u64 hash;
} l2_classify;
- /* IO - worker thread handoff */
- struct
- {
- u32 next_index;
- } handoff;
-
/* vnet policer */
struct
{
/* vnet policer */
struct
{
@@
-313,13
+297,6
@@
typedef struct
u16 overlay_afi;
} lisp;
u16 overlay_afi;
} lisp;
- /* Driver rx feature */
- struct
- {
- u32 saved_next_index; /**< saved by drivers for short-cut */
- u16 buffer_advance;
- } device_input_feat;
-
/* TCP */
struct
{
/* TCP */
struct
{
@@
-381,12
+358,15
@@
typedef struct
u8 source;
} qos;
u8 source;
} qos;
- u8 __unused[2];
+ u8 loop_counter;
+ u8 __unused[1];
/* Group Based Policy */
struct
{
/* Group Based Policy */
struct
{
- u32 src_epg;
+ u8 __unused;
+ u8 flags;
+ u16 src_epg;
} gbp;
union
} gbp;
union