4 files changed, 9 insertions, 9 deletions
diff --git a/src/vnet/gre/gre.c b/src/vnet/gre/gre.c
index 070c78e8984..449968c1be0 100644
--- a/src/vnet/gre/gre.c
+++ b/src/vnet/gre/gre.c
@@ -597,7 +597,7 @@ gre_init (vlib_main_t * vm)
   ip_main_t *im = &ip_main;
   ip_protocol_info_t *pi;
 
-  memset (gm, 0, sizeof (gm[0]));
+  clib_memset (gm, 0, sizeof (gm[0]));
   gm->vlib_main = vm;
   gm->vnet_main = vnet_get_main ();
 
diff --git a/src/vnet/gre/gre_api.c b/src/vnet/gre/gre_api.c
index 63d4ca4695b..c5658b52660 100644
--- a/src/vnet/gre/gre_api.c
+++ b/src/vnet/gre/gre_api.c
@@ -63,7 +63,7 @@ static void vl_api_gre_add_del_tunnel_t_handler
       rv = VNET_API_ERROR_SAME_SRC_DST;
       goto out;
     }
-  memset (a, 0, sizeof (*a));
+  clib_memset (a, 0, sizeof (*a));
 
   a->is_add = mp->is_add;
   a->tunnel_type = mp->tunnel_type;
@@ -103,7 +103,7 @@ static void send_gre_tunnel_details
   fib_table_t *ft;
 
   rmp = vl_msg_api_alloc (sizeof (*rmp));
-  memset (rmp, 0, sizeof (*rmp));
+  clib_memset (rmp, 0, sizeof (*rmp));
   rmp->_vl_msg_id = htons (VL_API_GRE_TUNNEL_DETAILS);
   if (!is_ipv6)
     {
diff --git a/src/vnet/gre/interface.c b/src/vnet/gre/interface.c
index 181a908022b..6be934af56c 100644
--- a/src/vnet/gre/interface.c
+++ b/src/vnet/gre/interface.c
@@ -281,7 +281,7 @@ vnet_gre_tunnel_add (vnet_gre_add_del_tunnel_args_t * a,
     return VNET_API_ERROR_IF_ALREADY_EXISTS;
 
   pool_get_aligned (gm->tunnels, t, CLIB_CACHE_LINE_BYTES);
-  memset (t, 0, sizeof (*t));
+  clib_memset (t, 0, sizeof (*t));
 
   /* Reconcile the real dev_instance and a possible requested instance */
   u32 t_idx = t - gm->tunnels;	/* tunnel index (or instance) */
@@ -606,7 +606,7 @@ create_gre_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->outer_fib_id = outer_fib_id;
   a->tunnel_type = t_type;
diff --git a/src/vnet/gre/node.c b/src/vnet/gre/node.c
index 056d00b23b0..89109bbc053 100644
--- a/src/vnet/gre/node.c
+++ b/src/vnet/gre/node.c
@@ -82,11 +82,11 @@ gre_input (vlib_main_t * vm,
   vnet_interface_main_t *im = &gm->vnet_main->interface_main;
 
   if (!is_ipv6)
-    memset (&cached_tunnel_key.gtk_v4, 0xff,
-	    sizeof (cached_tunnel_key.gtk_v4));
+    clib_memset (&cached_tunnel_key.gtk_v4, 0xff,
+		 sizeof (cached_tunnel_key.gtk_v4));
   else
-    memset (&cached_tunnel_key.gtk_v6, 0xff,
-	    sizeof (cached_tunnel_key.gtk_v6));
+    clib_memset (&cached_tunnel_key.gtk_v6, 0xff,
+		 sizeof (cached_tunnel_key.gtk_v6));
 
   from = vlib_frame_vector_args (from_frame);
   n_left_from = from_frame->n_vectors;