summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormu.duojiao <mu.duojiao@zte.com.cn>2018-10-17 10:59:09 +0800
committerMarco Varlese <marco.varlese@suse.de>2018-10-17 07:54:25 +0000
commitb3aff922ffbddd61b44df50271e4aaee2820a432 (patch)
treedfa65813f6bfa4bb961eb512fcf401eb4df4bdc7
parent7d76878ab3eea9d233d569d9b714a40924fbaa8b (diff)
VPP-1459:Ip4 lookup fail when exist prefix cover.v18.10-rc2
Change-Id: I4ba0aeb65219596475345e42b8cd34019f5594c6 Signed-off-by: mu.duojiao <mu.duojiao@zte.com.cn> (cherry picked from commit 9744e6d0273c0d7d11ab4f271c8694f69d51ccf3)
-rwxr-xr-x[-rw-r--r--]src/vnet/ip/ip4_mtrie.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/vnet/ip/ip4_mtrie.c b/src/vnet/ip/ip4_mtrie.c
index 6cd199a971e..fbb8a748074 100644..100755
--- a/src/vnet/ip/ip4_mtrie.c
+++ b/src/vnet/ip/ip4_mtrie.c
@@ -551,9 +551,7 @@ unset_leaf (ip4_fib_mtrie_t * m,
old_ply->leaves[i] =
ip4_fib_mtrie_leaf_set_adj_index (a->cover_adj_index);
- old_ply->dst_address_bits_of_leaves[i] =
- clib_max (old_ply->dst_address_bits_base,
- a->cover_address_length);
+ old_ply->dst_address_bits_of_leaves[i] = a->cover_address_length;
old_ply->n_non_empty_leafs +=
ip4_fib_mtrie_leaf_is_non_empty (old_ply, i);