summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/plugins/unittest/bier_test.c3
-rw-r--r--src/vnet/fib/fib_path.c16
-rw-r--r--src/vnet/fib/fib_types.h16
3 files changed, 10 insertions, 25 deletions
diff --git a/src/plugins/unittest/bier_test.c b/src/plugins/unittest/bier_test.c
index d77e3125372..9b4ba67e7cd 100644
--- a/src/plugins/unittest/bier_test.c
+++ b/src/plugins/unittest/bier_test.c
@@ -322,7 +322,6 @@ bier_test_mpls_spf (void)
fib_route_path_t *paths_1_1_1_1 = NULL, *input_paths_1_1_1_1;
fib_route_path_t path_1_1_1_1 = {
.frp_addr = nh_1_1_1_1,
- .frp_bier_fib_index = bti,
.frp_sw_if_index = ~0,
};
fib_mpls_label_t fml_500 = {
@@ -518,7 +517,6 @@ bier_test_mpls_spf (void)
};
fib_route_path_t *paths_1_1_1_2 = NULL, *input_paths_1_1_1_2, path_1_1_1_2 = {
.frp_addr = nh_1_1_1_2,
- .frp_bier_fib_index = bti,
.frp_sw_if_index = ~0,
};
fib_mpls_label_t fml_501 = {
@@ -825,7 +823,6 @@ bier_test_mpls_disp (void)
fib_route_path_t *paths_via_disp = NULL, path_via_disp = {
// .frp_addr = all-zeros
.frp_proto = DPO_PROTO_BIER,
- .frp_bier_fib_index = bdti1,
.frp_sw_if_index = ~0,
};
vec_add1(paths_via_disp, path_via_disp);
diff --git a/src/vnet/fib/fib_path.c b/src/vnet/fib/fib_path.c
index 2a4e6ab551f..8fd2b40a94b 100644
--- a/src/vnet/fib/fib_path.c
+++ b/src/vnet/fib/fib_path.c
@@ -272,16 +272,10 @@ typedef struct fib_path_t_ {
mpls_eos_bit_t fp_eos;
};
} fp_nh;
- union {
- /**
- * The FIB table index in which to find the next-hop.
- */
- fib_node_index_t fp_tbl_id;
- /**
- * The BIER FIB the fmask is in
- */
- index_t fp_bier_fib;
- };
+ /**
+ * The FIB table index in which to find the next-hop.
+ */
+ fib_node_index_t fp_tbl_id;
} recursive;
struct {
/**
@@ -359,7 +353,7 @@ typedef struct fib_path_t_ {
STRUCT_MARK(path_hash_end);
/**
- * Memebers in this last section represent information that is
+ * Members in this last section represent information that is
* dervied during resolution. It should not be copied to new paths
* nor compared.
*/
diff --git a/src/vnet/fib/fib_types.h b/src/vnet/fib/fib_types.h
index b5a58e7b674..18362e0965d 100644
--- a/src/vnet/fib/fib_types.h
+++ b/src/vnet/fib/fib_types.h
@@ -549,17 +549,11 @@ typedef struct fib_route_path_t_ {
*/
fib_rpf_id_t frp_rpf_id;
- union {
- /**
- * The FIB index to lookup the nexthop
- * Only valid for recursive paths.
- */
- u32 frp_fib_index;
- /**
- * The BIER table to resolve the fmask in
- */
- u32 frp_bier_fib_index;
- };
+ /**
+ * The FIB index to lookup the nexthop
+ * Only valid for recursive paths.
+ */
+ u32 frp_fib_index;
/**
* The outgoing MPLS label Stack. NULL implies no label.
*/