X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fgeneve%2Fgeneve.c;h=ac097f915cb48e9eccb0a823ddd534d32620cf9d;hb=b474380f;hp=1fe73e44cddd8749a44a3a2a4c7f1878f5f1ae5d;hpb=e5453d0fa29f39a7f78a7e22815566a7f4c9e5ef;p=vpp.git

diff --git a/src/vnet/geneve/geneve.c b/src/vnet/geneve/geneve.c
index 1fe73e44cdd..ac097f915cb 100644
--- a/src/vnet/geneve/geneve.c
+++ b/src/vnet/geneve/geneve.c
@@ -351,12 +351,6 @@ mcast_shared_remove (ip46_address_t * remote)
   hash_unset_mem_free (&geneve_main.mcast_shared, remote);
 }
 
-static inline fib_protocol_t
-fib_ip_proto (bool is_ip6)
-{
-  return (is_ip6) ? FIB_PROTOCOL_IP6 : FIB_PROTOCOL_IP4;
-}
-
 int vnet_geneve_add_del_tunnel
   (vnet_geneve_add_del_tunnel_args_t * a, u32 * sw_if_indexp)
 {
@@ -587,8 +581,8 @@ int vnet_geneve_add_del_tunnel
       si->flags |= VNET_SW_INTERFACE_FLAG_HIDDEN;
 
       /* make sure tunnel is removed from l2 bd or xconnect */
-      set_int_l2_mode (vxm->vlib_main, vnm, MODE_L3, t->sw_if_index, 0, 0, 0,
-		       0);
+      set_int_l2_mode (vxm->vlib_main, vnm, MODE_L3, t->sw_if_index, 0,
+		       L2_BD_PORT_TYPE_NORMAL, 0, 0);
       vec_add1 (vxm->free_geneve_tunnel_hw_if_indices, t->hw_if_index);
 
       vxm->tunnel_index_by_sw_if_index[t->sw_if_index] = ~0;