VPP-1459:Ip4 lookup fail when exist prefix cover. 25/15325/2 v18.10-rc2
authormu.duojiao <mu.duojiao@zte.com.cn>
Wed, 17 Oct 2018 02:59:09 +0000 (10:59 +0800)
committerMarco Varlese <marco.varlese@suse.de>
Wed, 17 Oct 2018 07:54:25 +0000 (07:54 +0000)
Change-Id: I4ba0aeb65219596475345e42b8cd34019f5594c6
Signed-off-by: mu.duojiao <mu.duojiao@zte.com.cn>
(cherry picked from commit 9744e6d0273c0d7d11ab4f271c8694f69d51ccf3)

src/vnet/ip/ip4_mtrie.c [changed mode: 0644->0755]

old mode 100644 (file)
new mode 100755 (executable)
index 6cd199a..fbb8a74
@@ -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);