Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
flow-hash: Add symmetric flag for flow hashing
[vpp.git]
/
src
/
vnet
/
buffer.h
diff --git
a/src/vnet/buffer.h
b/src/vnet/buffer.h
index
dfb05ac
..
8071081
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,12
+85,9
@@
enum
#define foreach_buffer_opaque_union_subtype \
_(ip) \
#define foreach_buffer_opaque_union_subtype \
_(ip) \
-_(swt) \
_(l2) \
_(l2t) \
_(l2) \
_(l2t) \
-_(gre) \
_(l2_classify) \
_(l2_classify) \
-_(handoff) \
_(policer) \
_(ipsec) \
_(map) \
_(policer) \
_(ipsec) \
_(map) \
@@
-200,8
+197,8
@@
typedef struct
/* Rewrite length */
u32 save_rewrite_length;
/*
/* Rewrite length */
u32 save_rewrite_length;
/*
- * BIER - the nu
bm
er of bytes in the header.
- * the len field inthe header is not authoritative. It's the
+ * BIER - the nu
mb
er of bytes in the header.
+ * the len field in
the header is not authoritative. It's the
* value in the table that counts.
*/
struct
* value in the table that counts.
*/
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
{
@@
-236,11
+226,6
@@
typedef struct
u32 session_index;
} l2t;
u32 session_index;
} l2t;
- struct
- {
- u32 src, dst;
- } gre;
-
/* L2 classify */
struct
{
/* L2 classify */
struct
{
@@
-253,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
{
@@
-298,7
+277,6
@@
typedef struct
struct
{
u32 pad[2]; /* do not overlay w/ ip.adj_index[0,1] */
struct
{
u32 pad[2]; /* do not overlay w/ ip.adj_index[0,1] */
- u16 header_offset;
u16 mtu;
u8 next_index;
u8 flags; //See ip_frag.h
u16 mtu;
u8 next_index;
u8 flags; //See ip_frag.h
@@
-318,13
+296,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
{
@@
-363,7
+334,7
@@
typedef struct
} vnet_buffer_opaque_t;
/*
} vnet_buffer_opaque_t;
/*
- * The opaque field of the vlib_buffer_t is intepreted as a
+ * The opaque field of the vlib_buffer_t is inte
r
preted as a
* vnet_buffer_opaque_t. Hence it should be big enough to accommodate one.
*/
STATIC_ASSERT (sizeof (vnet_buffer_opaque_t) <=
* vnet_buffer_opaque_t. Hence it should be big enough to accommodate one.
*/
STATIC_ASSERT (sizeof (vnet_buffer_opaque_t) <=
@@
-386,12
+357,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
@@
-403,6
+377,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;
@@
-410,7
+389,7
@@
typedef struct
#define vnet_buffer2(b) ((vnet_buffer_opaque2_t *) (b)->opaque2)
/*
#define vnet_buffer2(b) ((vnet_buffer_opaque2_t *) (b)->opaque2)
/*
- * The opaque2 field of the vlib_buffer_t is intepreted as a
+ * The opaque2 field of the vlib_buffer_t is inte
r
preted as a
* vnet_buffer_opaque2_t. Hence it should be big enough to accommodate one.
*/
STATIC_ASSERT (sizeof (vnet_buffer_opaque2_t) <=
* vnet_buffer_opaque2_t. Hence it should be big enough to accommodate one.
*/
STATIC_ASSERT (sizeof (vnet_buffer_opaque2_t) <=