3 files changed, 6 insertions, 6 deletions
diff --git a/src/vnet/ipsec-gre/interface.c b/src/vnet/ipsec-gre/interface.c
index 7dc8301e96a..700072350ca 100644
--- a/src/vnet/ipsec-gre/interface.c
+++ b/src/vnet/ipsec-gre/interface.c
@@ -105,7 +105,7 @@ vnet_ipsec_gre_add_del_tunnel (vnet_ipsec_gre_add_del_tunnel_args_t * a,
   u64 key;
   ipsec_add_del_ipsec_gre_tunnel_args_t args;
 
-  memset (&args, 0, sizeof (args));
+  clib_memset (&args, 0, sizeof (args));
   args.is_add = a->is_add;
   args.local_sa_id = a->lsa;
   args.remote_sa_id = a->rsa;
@@ -122,7 +122,7 @@ vnet_ipsec_gre_add_del_tunnel (vnet_ipsec_gre_add_del_tunnel_args_t * a,
 	return VNET_API_ERROR_INVALID_VALUE;
 
       pool_get_aligned (igm->tunnels, t, CLIB_CACHE_LINE_BYTES);
-      memset (t, 0, sizeof (*t));
+      clib_memset (t, 0, sizeof (*t));
 
       if (vec_len (igm->free_ipsec_gre_tunnel_hw_if_indices) > 0)
 	{
@@ -270,7 +270,7 @@ create_ipsec_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->lsa = lsa;
   a->rsa = rsa;
diff --git a/src/vnet/ipsec-gre/ipsec_gre.c b/src/vnet/ipsec-gre/ipsec_gre.c
index abf81e05bb9..758807be175 100644
--- a/src/vnet/ipsec-gre/ipsec_gre.c
+++ b/src/vnet/ipsec-gre/ipsec_gre.c
@@ -374,7 +374,7 @@ ipsec_gre_init (vlib_main_t * vm)
   ipsec_gre_main_t *igm = &ipsec_gre_main;
   clib_error_t *error;
 
-  memset (igm, 0, sizeof (igm[0]));
+  clib_memset (igm, 0, sizeof (igm[0]));
   igm->vlib_main = vm;
   igm->vnet_main = vnet_get_main ();
 
diff --git a/src/vnet/ipsec-gre/ipsec_gre_api.c b/src/vnet/ipsec-gre/ipsec_gre_api.c
index c29b9b8816e..3f85c4fc266 100644
--- a/src/vnet/ipsec-gre/ipsec_gre_api.c
+++ b/src/vnet/ipsec-gre/ipsec_gre_api.c
@@ -62,7 +62,7 @@ vl_api_ipsec_gre_add_del_tunnel_t_handler (vl_api_ipsec_gre_add_del_tunnel_t *
       goto out;
     }
 
-  memset (a, 0, sizeof (*a));
+  clib_memset (a, 0, sizeof (*a));
 
   /* ip addresses sent in network byte order */
   clib_memcpy (&(a->src), mp->src_address, 4);
@@ -88,7 +88,7 @@ static void send_ipsec_gre_tunnel_details
   vl_api_ipsec_gre_tunnel_details_t *rmp;
 
   rmp = vl_msg_api_alloc (sizeof (*rmp));
-  memset (rmp, 0, sizeof (*rmp));
+  clib_memset (rmp, 0, sizeof (*rmp));
   rmp->_vl_msg_id = ntohs (VL_API_IPSEC_GRE_TUNNEL_DETAILS);
   clib_memcpy (rmp->src_address, &(t->tunnel_src), 4);
   clib_memcpy (rmp->dst_address, &(t->tunnel_dst), 4);