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
dfb05ac
..
60efe6e
100644
(file)
--- a/
src/vnet/buffer.h
+++ b/
src/vnet/buffer.h
@@
-85,10
+85,8
@@
enum
#define foreach_buffer_opaque_union_subtype \
_(ip) \
#define foreach_buffer_opaque_union_subtype \
_(ip) \
-_(swt) \
_(l2) \
_(l2t) \
_(l2) \
_(l2t) \
-_(gre) \
_(l2_classify) \
_(handoff) \
_(policer) \
_(l2_classify) \
_(handoff) \
_(policer) \
@@
-164,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
{
@@
-210,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
{
@@
-236,11
+228,6
@@
typedef struct
u32 session_index;
} l2t;
u32 session_index;
} l2t;
- struct
- {
- u32 src, dst;
- } gre;
-
/* L2 classify */
struct
{
/* L2 classify */
struct
{
@@
-403,6
+390,11
@@
typedef struct
u16 *trajectory_trace;
#endif
};
u16 *trajectory_trace;
#endif
};
+ struct
+ {
+ u64 pad[1];
+ u64 pg_replay_timestamp;
+ };
u32 unused[10];
};
} vnet_buffer_opaque2_t;
u32 unused[10];
};
} vnet_buffer_opaque2_t;