Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[aarch64] Fixes CLI crashes on dpaa2 platform.
[vpp.git]
/
src
/
vnet
/
fib
/
fib_types.h
diff --git
a/src/vnet/fib/fib_types.h
b/src/vnet/fib/fib_types.h
index
60873c4
..
b5d4ec9
100644
(file)
--- a/
src/vnet/fib/fib_types.h
+++ b/
src/vnet/fib/fib_types.h
@@
-32,9
+32,9
@@
typedef u32 fib_node_index_t;
* Protocol Type. packed so it consumes a u8 only
*/
typedef enum fib_protocol_t_ {
* Protocol Type. packed so it consumes a u8 only
*/
typedef enum fib_protocol_t_ {
- FIB_PROTOCOL_IP4 =
0
,
- FIB_PROTOCOL_IP6,
- FIB_PROTOCOL_MPLS,
+ FIB_PROTOCOL_IP4 =
DPO_PROTO_IP4
,
+ FIB_PROTOCOL_IP6
= DPO_PROTO_IP6
,
+ FIB_PROTOCOL_MPLS
= DPO_PROTO_MPLS
,
} __attribute__ ((packed)) fib_protocol_t;
#define FIB_PROTOCOLS { \
} __attribute__ ((packed)) fib_protocol_t;
#define FIB_PROTOCOLS { \
@@
-261,8
+261,8
@@
typedef enum fib_special_type_t_ {
for (_item = FIB_TYPE_SPEICAL_FIRST; \
_item <= FIB_SPEICAL_TYPE_LAST; _item++)
for (_item = FIB_TYPE_SPEICAL_FIRST; \
_item <= FIB_SPEICAL_TYPE_LAST; _item++)
-extern u8 * format_fib_protocol(u8 * s, va_list ap);
-extern u8 * format_vnet_link(u8 *s, va_list ap);
+extern u8 * format_fib_protocol(u8 * s, va_list
*
ap);
+extern u8 * format_vnet_link(u8 *s, va_list
*
ap);
/**
* Path flags from the control plane
/**
* Path flags from the control plane
@@
-338,7
+338,7
@@
typedef struct fib_route_path_t_ {
* The protocol of the address below. We need this since the all
* zeros address is ambiguous.
*/
* The protocol of the address below. We need this since the all
* zeros address is ambiguous.
*/
-
fib_protocol
_t frp_proto;
+
dpo_proto
_t frp_proto;
union {
/**
union {
/**
@@
-380,7
+380,13
@@
typedef struct fib_route_path_t_ {
/**
* [un]equal cost path weight
*/
/**
* [un]equal cost path weight
*/
- u32 frp_weight;
+ u8 frp_weight;
+ /**
+ * A path preference. 0 is the best.
+ * Only paths of the best preference, that are 'up', are considered
+ * for forwarding.
+ */
+ u8 frp_preference;
/**
* flags on the path
*/
/**
* flags on the path
*/