4 files changed, 8 insertions, 8 deletions
diff --git a/src/plugins/gbp/gbp_api.c b/src/plugins/gbp/gbp_api.c
index 0cbe9910101..6bd1abc727e 100644
--- a/src/plugins/gbp/gbp_api.c
+++ b/src/plugins/gbp/gbp_api.c
@@ -143,7 +143,7 @@ gbp_endpoint_send_details (gbp_endpoint_t * gbpe, void *args)
   if (!mp)
     return 1;
 
-  memset (mp, 0, sizeof (*mp));
+  clib_memset (mp, 0, sizeof (*mp));
   mp->_vl_msg_id = ntohs (VL_API_GBP_ENDPOINT_DETAILS + GBP_MSG_BASE);
   mp->context = ctx->context;
 
@@ -242,7 +242,7 @@ gbp_subnet_send_details (u32 table_id,
   if (!mp)
     return 1;
 
-  memset (mp, 0, sizeof (*mp));
+  clib_memset (mp, 0, sizeof (*mp));
   mp->_vl_msg_id = ntohs (VL_API_GBP_SUBNET_DETAILS + GBP_MSG_BASE);
   mp->context = ctx->context;
 
@@ -285,7 +285,7 @@ gbp_endpoint_group_send_details (gbp_endpoint_group_t * gepg, void *args)
   if (!mp)
     return 1;
 
-  memset (mp, 0, sizeof (*mp));
+  clib_memset (mp, 0, sizeof (*mp));
   mp->_vl_msg_id = ntohs (VL_API_GBP_ENDPOINT_GROUP_DETAILS + GBP_MSG_BASE);
   mp->context = ctx->context;
 
@@ -351,7 +351,7 @@ gbp_recirc_send_details (gbp_recirc_t * gr, void *args)
   if (!mp)
     return 1;
 
-  memset (mp, 0, sizeof (*mp));
+  clib_memset (mp, 0, sizeof (*mp));
   mp->_vl_msg_id = ntohs (VL_API_GBP_RECIRC_DETAILS + GBP_MSG_BASE);
   mp->context = ctx->context;
 
@@ -409,7 +409,7 @@ gbp_contract_send_details (gbp_contract_t * gbpc, void *args)
   if (!mp)
     return 1;
 
-  memset (mp, 0, sizeof (*mp));
+  clib_memset (mp, 0, sizeof (*mp));
   mp->_vl_msg_id = ntohs (VL_API_GBP_CONTRACT_DETAILS + GBP_MSG_BASE);
   mp->context = ctx->context;
 
diff --git a/src/plugins/gbp/gbp_endpoint_group.c b/src/plugins/gbp/gbp_endpoint_group.c
index 27d404e09dd..095c8fe607b 100644
--- a/src/plugins/gbp/gbp_endpoint_group.c
+++ b/src/plugins/gbp/gbp_endpoint_group.c
@@ -61,7 +61,7 @@ gbp_endpoint_group_add (epg_id_t epg_id,
       fib_protocol_t fproto;
 
       pool_get (gbp_endpoint_group_pool, gepg);
-      memset (gepg, 0, sizeof (*gepg));
+      clib_memset (gepg, 0, sizeof (*gepg));
 
       gepg->gepg_id = epg_id;
       gepg->gepg_bd = bd_id;
diff --git a/src/plugins/gbp/gbp_policy_dpo.c b/src/plugins/gbp/gbp_policy_dpo.c
index 3a06604121b..a2d9510b838 100644
--- a/src/plugins/gbp/gbp_policy_dpo.c
+++ b/src/plugins/gbp/gbp_policy_dpo.c
@@ -110,7 +110,7 @@ gbp_policy_dpo_add_or_lock (dpo_proto_t dproto,
   dpo_id_t parent = DPO_INVALID;
 
   gpd = gbp_policy_dpo_alloc ();
-  memset (gpd, 0, sizeof (*gpd));
+  clib_memset (gpd, 0, sizeof (*gpd));
 
   gpd->gpd_proto = dproto;
   gpd->gpd_sw_if_index = sw_if_index;
diff --git a/src/plugins/gbp/gbp_recirc.c b/src/plugins/gbp/gbp_recirc.c
index 576ec8512bc..95e8066d443 100644
--- a/src/plugins/gbp/gbp_recirc.c
+++ b/src/plugins/gbp/gbp_recirc.c
@@ -46,7 +46,7 @@ gbp_recirc_add (u32 sw_if_index, epg_id_t epg_id, u8 is_ext)
       fib_protocol_t fproto;
 
       pool_get (gbp_recirc_pool, gr);
-      memset (gr, 0, sizeof (*gr));
+      clib_memset (gr, 0, sizeof (*gr));
       gri = gr - gbp_recirc_pool;
 
       gr->gr_epg = epg_id;