Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Harmonize vec/pool_get_aligned object sizes and alignment requests
[vpp.git]
/
src
/
vnet
/
dpo
/
mpls_disposition.h
diff --git
a/src/vnet/dpo/mpls_disposition.h
b/src/vnet/dpo/mpls_disposition.h
index
9c01508
..
86dd60a
100644
(file)
--- a/
src/vnet/dpo/mpls_disposition.h
+++ b/
src/vnet/dpo/mpls_disposition.h
@@
-26,6
+26,12
@@
*/
typedef struct mpls_disp_dpo_t
{
*/
typedef struct mpls_disp_dpo_t
{
+ /**
+ * required for pool_get_aligned.
+ * memebers used in the switch path come first!
+ */
+ CLIB_CACHE_LINE_ALIGN_MARK(cacheline0);
+
/**
* Next DPO in the graph
*/
/**
* Next DPO in the graph
*/
@@
-45,6
+51,11
@@
typedef struct mpls_disp_dpo_t
* Number of locks/users of the label
*/
u16 mdd_locks;
* Number of locks/users of the label
*/
u16 mdd_locks;
+
+ /**
+ * LSP mode
+ */
+ fib_mpls_lsp_mode_t mdd_mode;
} mpls_disp_dpo_t;
/**
} mpls_disp_dpo_t;
/**
@@
-60,11
+71,15
@@
_Static_assert((sizeof(mpls_disp_dpo_t) <= CLIB_CACHE_LINE_BYTES),
*
* @param payload_proto The ptocool of the payload packets that will
* be imposed with this label header.
*
* @param payload_proto The ptocool of the payload packets that will
* be imposed with this label header.
+ * @param rpf_id The RPF ID the packet will aquire - only for mcast
+ * @param mode The LSP mode; pipe or uniform
* @param dpo The parent of the created MPLS label object
*/
* @param dpo The parent of the created MPLS label object
*/
-extern index_t mpls_disp_dpo_create(dpo_proto_t payload_proto,
- fib_rpf_id_t rpf_id,
- const dpo_id_t *dpo);
+extern void mpls_disp_dpo_create(dpo_proto_t payload_proto,
+ fib_rpf_id_t rpf_id,
+ fib_mpls_lsp_mode_t mode,
+ const dpo_id_t *parent,
+ dpo_id_t *dpo);
extern u8* format_mpls_disp_dpo(u8 *s, va_list *args);
extern u8* format_mpls_disp_dpo(u8 *s, va_list *args);