X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fvxlan-gpe%2Fvxlan_gpe.c;h=a7eaba6a49f592ca2ac2e70feb4cc30b377024a5;hb=refs%2Fchanges%2F40%2F16340%2F2;hp=b511a7dbdd4f75422fb1aa3d3461d84dde2b34ac;hpb=bdc0e6b7204ea0211d4f7881497e4306586fb9ef;p=vpp.git

diff --git a/src/vnet/vxlan-gpe/vxlan_gpe.c b/src/vnet/vxlan-gpe/vxlan_gpe.c
index b511a7dbdd4..a7eaba6a49f 100644
--- a/src/vnet/vxlan-gpe/vxlan_gpe.c
+++ b/src/vnet/vxlan-gpe/vxlan_gpe.c
@@ -509,7 +509,7 @@ int vnet_vxlan_gpe_add_del_tunnel
 	return VNET_API_ERROR_TUNNEL_EXIST;
 
       pool_get_aligned (ngm->tunnels, t, CLIB_CACHE_LINE_BYTES);
-      memset (t, 0, sizeof (*t));
+      clib_memset (t, 0, sizeof (*t));
 
       /* copy from arg structure */
 /* *INDENT-OFF* */
@@ -543,14 +543,14 @@ int vnet_vxlan_gpe_add_del_tunnel
       if (!is_ip6)
 	{
 	  key4_copy = clib_mem_alloc (sizeof (*key4_copy));
-	  clib_memcpy (key4_copy, &key4, sizeof (*key4_copy));
+	  clib_memcpy_fast (key4_copy, &key4, sizeof (*key4_copy));
 	  hash_set_mem (ngm->vxlan4_gpe_tunnel_by_key, key4_copy,
 			t - ngm->tunnels);
 	}
       else
 	{
 	  key6_copy = clib_mem_alloc (sizeof (*key6_copy));
-	  clib_memcpy (key6_copy, &key6, sizeof (*key6_copy));
+	  clib_memcpy_fast (key6_copy, &key6, sizeof (*key6_copy));
 	  hash_set_mem (ngm->vxlan6_gpe_tunnel_by_key, key6_copy,
 			t - ngm->tunnels);
 	}
@@ -713,8 +713,8 @@ int vnet_vxlan_gpe_add_del_tunnel
       vnet_sw_interface_set_flags (vnm, t->sw_if_index, 0 /* down */ );
       vnet_sw_interface_t *si = vnet_get_sw_interface (vnm, t->sw_if_index);
       si->flags |= VNET_SW_INTERFACE_FLAG_HIDDEN;
-      set_int_l2_mode (ngm->vlib_main, vnm, MODE_L3, t->sw_if_index, 0, 0, 0,
-		       0);
+      set_int_l2_mode (ngm->vlib_main, vnm, MODE_L3, t->sw_if_index, 0,
+		       L2_BD_PORT_TYPE_NORMAL, 0, 0);
       vec_add1 (ngm->free_vxlan_gpe_tunnel_hw_if_indices, t->hw_if_index);
 
       ngm->tunnel_index_by_sw_if_index[t->sw_if_index] = ~0;
@@ -914,7 +914,7 @@ vxlan_gpe_add_del_tunnel_command_fn (vlib_main_t * vm,
       goto done;
     }
 
-  memset (a, 0, sizeof (*a));
+  clib_memset (a, 0, sizeof (*a));
 
   a->is_add = is_add;
   a->is_ip6 = ipv6_set;