X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fvxlan-gbp%2Fvxlan_gbp.c;h=7b09b57bd59a7063ff9621b5b4eff1b55c3de8e3;hb=097fa66b986f06281f603767d321ab13ab6c88c3;hp=e39c26fc5d150e9936ac79026e9814ecb419a1da;hpb=76b5649d074ab198cbf5737ac76d21649a61bffd;p=vpp.git

diff --git a/src/vnet/vxlan-gbp/vxlan_gbp.c b/src/vnet/vxlan-gbp/vxlan_gbp.c
index e39c26fc5d1..7b09b57bd59 100644
--- a/src/vnet/vxlan-gbp/vxlan_gbp.c
+++ b/src/vnet/vxlan-gbp/vxlan_gbp.c
@@ -557,6 +557,7 @@ int vnet_vxlan_gbp_tunnel_add_del
 		.frp_fib_index = ~0,
 		.frp_weight = 0,
 		.frp_flags = FIB_ROUTE_PATH_LOCAL,
+		.frp_mitf_flags = MFIB_ITF_FLAG_FORWARD,
 	      };
 	      const mfib_prefix_t mpfx = {
 		.fp_proto = fp,
@@ -571,16 +572,15 @@ int vnet_vxlan_gbp_tunnel_add_del
 	       */
 	      mfib_table_entry_path_update (t->encap_fib_index,
 					    &mpfx,
-					    MFIB_SOURCE_VXLAN_GBP,
-					    &path, MFIB_ITF_FLAG_FORWARD);
+					    MFIB_SOURCE_VXLAN_GBP, &path);
 
 	      path.frp_sw_if_index = a->mcast_sw_if_index;
 	      path.frp_flags = FIB_ROUTE_PATH_FLAG_NONE;
+	      path.frp_mitf_flags = MFIB_ITF_FLAG_ACCEPT;
 	      mfei = mfib_table_entry_path_update (t->encap_fib_index,
 						   &mpfx,
 						   MFIB_SOURCE_VXLAN_GBP,
-						   &path,
-						   MFIB_ITF_FLAG_ACCEPT);
+						   &path);
 
 	      /*
 	       * Create the mcast adjacency to send traffic to the group
@@ -1144,14 +1144,10 @@ clib_error_t *
 vxlan_gbp_init (vlib_main_t * vm)
 {
   vxlan_gbp_main_t *vxm = &vxlan_gbp_main;
-  clib_error_t *error;
 
   vxm->vnet_main = vnet_get_main ();
   vxm->vlib_main = vm;
 
-  if ((error = vlib_call_init_function (vm, punt_init)))
-    return (error);
-
   /* initialize the ip6 hash */
   clib_bihash_init_16_8 (&vxm->vxlan4_gbp_tunnel_by_key, "vxlan4-gbp",
 			 VXLAN_GBP_HASH_NUM_BUCKETS,
@@ -1175,10 +1171,15 @@ vxlan_gbp_init (vlib_main_t * vm)
 			  "VXLAN-GBP-no-such-v6-tunnel",
 			  &vxm->punt_no_such_tunnel[FIB_PROTOCOL_IP6]);
 
-  return (error);
+  return (0);
 }
 
-VLIB_INIT_FUNCTION (vxlan_gbp_init);
+/* *INDENT-OFF* */
+VLIB_INIT_FUNCTION (vxlan_gbp_init) =
+{
+  .runs_after = VLIB_INITS("punt_init"),
+};
+/* *INDENT-ON* */
 
 /*
  * fd.io coding-style-patch-verification: ON