ip: fix fib and mfib locks

[vpp.git] / src / plugins / gbp / gbp_itf.c

diff --git a/src/plugins/gbp/gbp_itf.c b/src/plugins/gbp/gbp_itf.c
index a9e9225..738a7ac 100644 (file)
--- a/src/plugins/gbp/gbp_itf.c
+++ b/src/plugins/gbp/gbp_itf.c
@@ -17,6 +17,8 @@
 #include <plugins/gbp/gbp_bridge_domain.h>
 #include <plugins/gbp/gbp_route_domain.h>
 
+#include <vnet/ip/ip.h>
+
 #define foreach_gbp_itf_mode  \
   _(L2, "l2")                 \
   _(L3, "L3")
@@ -230,8 +232,7 @@ gbp_itf_l3_add_and_lock_i (u32 sw_if_index, index_t gri, gbp_itf_free_fn_t ff)
       ip6_sw_interface_enable_disable (gi->gi_sw_if_index, 1);
 
       FOR_EACH_FIB_IP_PROTOCOL (fproto)
-       ip_table_bind (fproto, gi->gi_sw_if_index,
-                      grd->grd_table_id[fproto], 1);
+      ip_table_bind (fproto, gi->gi_sw_if_index, grd->grd_table_id[fproto]);
 
       hash_set (gbp_itf_db, gi->gi_sw_if_index, gi - gbp_itf_pool);
     }
@@ -310,7 +311,7 @@ gbp_itf_unlock (gbp_itf_hdl_t * gh)
 
          gbp_itf_l3_set_input_feature (*gh, GBP_ITF_L3_FEAT_NONE);
          FOR_EACH_FIB_IP_PROTOCOL (fproto)
-           ip_table_bind (fproto, gi->gi_sw_if_index, 0, 0);
+         ip_table_bind (fproto, gi->gi_sw_if_index, 0);
 
          ip4_sw_interface_enable_disable (gi->gi_sw_if_index, 0);
          ip6_sw_interface_enable_disable (gi->gi_sw_if_index, 0);
@@ -539,10 +540,10 @@ gbp_itf_show (vlib_main_t * vm,
   vlib_cli_output (vm, "Interfaces:");
 
   /* *INDENT-OFF* */
-  pool_foreach_index (gii, gbp_itf_pool,
-  ({
+  pool_foreach_index (gii, gbp_itf_pool)
+   {
     vlib_cli_output (vm, "  [%d] %U", gii, format_gbp_itf, gii);
-  }));
+  }
   /* *INDENT-ON* */
 
   return (NULL);