diff options
| author |   Neale Ranns <nranns@cisco.com> | 2016-11-01 10:05:08 +0000 |
|---|---|---|
| committer |   Damjan Marion <dmarion.lists@gmail.com> | 2016-11-01 19:26:24 +0000 |
| commit | 8fe8cc21d1e389d8e971a303e53c9e703aaaa0e0 (patch) | |
| tree | dd42f4a0e7242ba9b2804dc2dd5619d2b837c13f /vnet/vnet/fib/fib_entry_src.c | |
| parent | 3b906b0d9b93a892831ce4d54d1d7ec3956ce2b4 (diff) | |
MPLS Exp-null Tests
Add some 'make test' unit tests for MPLS explicit NULL label handling.
Fix the stacking of the MPLS load-balance result form the lookup onto the IPx lookup object.
Change-Id: I890d1221b8e3dea99bcc714ed9d0154a5f602c52
Signed-off-by: Neale Ranns <nranns@cisco.com>
Diffstat (limited to 'vnet/vnet/fib/fib_entry_src.c')
| -rw-r--r-- | vnet/vnet/fib/fib_entry_src.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/vnet/vnet/fib/fib_entry_src.c b/vnet/vnet/fib/fib_entry_src.c index 2cbdf187..6fb2e64c 100644 --- a/vnet/vnet/fib/fib_entry_src.c +++ b/vnet/vnet/fib/fib_entry_src.c @@ -34,21 +34,6 @@ fib_entry_get_proto (const fib_entry_t * fib_entry) return (fib_entry->fe_prefix.fp_proto); } -static dpo_proto_t -fib_entry_get_payload_proto (const fib_entry_t * fib_entry) -{ - switch (fib_entry->fe_prefix.fp_proto) - { - case FIB_PROTOCOL_IP4: - case FIB_PROTOCOL_IP6: - return fib_proto_to_dpo(fib_entry->fe_prefix.fp_proto); - case FIB_PROTOCOL_MPLS: - return fib_entry->fe_prefix.fp_payload_proto; - } - - return (fib_proto_to_dpo(fib_entry->fe_prefix.fp_proto)); -} - void fib_entry_src_register (fib_source_t source, const fib_entry_src_vft_t *vft) @@ -344,7 +329,7 @@ fib_entry_src_mk_lb (fib_entry_t *fib_entry, .fct = fct, }; - lb_proto = fib_entry_get_payload_proto(fib_entry); + lb_proto = fib_proto_to_dpo(fib_entry->fe_prefix.fp_proto); fib_path_list_walk(esrc->fes_pl, fib_entry_src_collect_forwarding, |