MTRIE Optimisations 2

[vpp.git] / src / vnet / cop / ip4_whitelist.c

diff --git a/src/vnet/cop/ip4_whitelist.c b/src/vnet/cop/ip4_whitelist.c
index d5121e7..6ef3d7d 100644 (file)
--- a/src/vnet/cop/ip4_whitelist.c
+++ b/src/vnet/cop/ip4_whitelist.c
@@ -125,13 +125,7 @@ ip4_cop_whitelist_node_fn (vlib_main_t * vm,
 
          mtrie0 = &ip4_fib_get (c0->fib_index)->mtrie;
 
-         leaf0 = IP4_FIB_MTRIE_LEAF_ROOT;
-
-         leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0,
-                                             &ip0->src_address, 0);
-
-         leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0,
-                                             &ip0->src_address, 1);
+          leaf0 = ip4_fib_mtrie_lookup_step_one (mtrie0, &ip0->src_address);
 
          leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0,
                                              &ip0->src_address, 2);
@@ -167,13 +161,7 @@ ip4_cop_whitelist_node_fn (vlib_main_t * vm,
                sizeof (c1[0]));
          mtrie1 = &ip4_fib_get (c1->fib_index)->mtrie;
 
-         leaf1 = IP4_FIB_MTRIE_LEAF_ROOT;
-
-         leaf1 = ip4_fib_mtrie_lookup_step (mtrie1, leaf1,
-                                             &ip1->src_address, 0);
-
-         leaf1 = ip4_fib_mtrie_lookup_step (mtrie1, leaf1,
-                                             &ip1->src_address, 1);
+          leaf1 = ip4_fib_mtrie_lookup_step_one (mtrie1, &ip1->src_address);
 
          leaf1 = ip4_fib_mtrie_lookup_step (mtrie1, leaf1,
                                              &ip1->src_address, 2);
@@ -267,13 +255,7 @@ ip4_cop_whitelist_node_fn (vlib_main_t * vm,
 
          mtrie0 = &ip4_fib_get (c0->fib_index)->mtrie;
 
-         leaf0 = IP4_FIB_MTRIE_LEAF_ROOT;
-
-         leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0, 
-                                             &ip0->src_address, 0);
-
-         leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0, 
-                                             &ip0->src_address, 1);
+          leaf0 = ip4_fib_mtrie_lookup_step_one (mtrie0, &ip0->src_address);
 
          leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0, 
                                              &ip0->src_address, 2);