Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
MAP: Move MAP-E/T to a plugin.
[vpp.git]
/
src
/
vnet
/
buffer.h
diff --git
a/src/vnet/buffer.h
b/src/vnet/buffer.h
index
5392f53
..
60efe6e
100644
(file)
--- a/
src/vnet/buffer.h
+++ b/
src/vnet/buffer.h
@@
-85,7
+85,6
@@
enum
#define foreach_buffer_opaque_union_subtype \
_(ip) \
#define foreach_buffer_opaque_union_subtype \
_(ip) \
-_(swt) \
_(l2) \
_(l2t) \
_(l2_classify) \
_(l2) \
_(l2t) \
_(l2_classify) \
@@
-163,6
+162,7
@@
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
{
@@
-209,13
+209,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
{