4 files changed, 10 insertions, 10 deletions
diff --git a/src/vnet/mfib/ip4_mfib.c b/src/vnet/mfib/ip4_mfib.c
index 7040fa71764..eaa61c0f86c 100644
--- a/src/vnet/mfib/ip4_mfib.c
+++ b/src/vnet/mfib/ip4_mfib.c
@@ -39,7 +39,7 @@ ip4_create_mfib_with_table_id (u32 table_id,
     mfib_table_t *mfib_table;
 
     pool_get_aligned(ip4_main.mfibs, mfib_table, CLIB_CACHE_LINE_BYTES);
-    memset(mfib_table, 0, sizeof(*mfib_table));
+    clib_memset(mfib_table, 0, sizeof(*mfib_table));
 
     mfib_table->mft_proto = FIB_PROTOCOL_IP4;
     mfib_table->mft_index =
@@ -425,12 +425,12 @@ ip4_show_mfib (vlib_main_t * vm,
         }
         else if (unformat (input, "%U/%d", unformat_ip4_address, &grp, &mask))
         {
-            memset(&src, 0, sizeof(src));
+            clib_memset(&src, 0, sizeof(src));
             matching = 1;
         }
         else if (unformat (input, "%U", unformat_ip4_address, &grp))
         {
-            memset(&src, 0, sizeof(src));
+            clib_memset(&src, 0, sizeof(src));
             matching = 1;
             mask = 32;
         }
diff --git a/src/vnet/mfib/ip6_mfib.c b/src/vnet/mfib/ip6_mfib.c
index 1c1f5db71f7..e98ac42374a 100644
--- a/src/vnet/mfib/ip6_mfib.c
+++ b/src/vnet/mfib/ip6_mfib.c
@@ -168,7 +168,7 @@ ip6_create_mfib_with_table_id (u32 table_id,
     };
 
     pool_get_aligned(ip6_main.mfibs, mfib_table, CLIB_CACHE_LINE_BYTES);
-    memset(mfib_table, 0, sizeof(*mfib_table));
+    clib_memset(mfib_table, 0, sizeof(*mfib_table));
 
     mfib_table->mft_proto = FIB_PROTOCOL_IP6;
     mfib_table->mft_index =
@@ -340,7 +340,7 @@ ip6_mfib_table_get_index_for_sw_if_index (u32 sw_if_index)
     if (_len <= 128)                                                \
     {                                                               \
         memcpy((_key)->mask+1, &ip6_main.fib_masks[_len], 16);      \
-        memset((_key)->mask+17, 0, 16);                             \
+        clib_memset((_key)->mask+17, 0, 16);                             \
     }                                                               \
     else                                                            \
     {                                                               \
@@ -434,7 +434,7 @@ ip6_mfib_table_entry_insert (ip6_mfib_t *mfib,
 {
     ip6_mfib_node_t *i6mn = clib_mem_alloc(sizeof(*i6mn));
 
-    memset(i6mn->i6mn_nodes, 0, sizeof(i6mn->i6mn_nodes));
+    clib_memset(i6mn->i6mn_nodes, 0, sizeof(i6mn->i6mn_nodes));
 
     IP6_MFIB_MK_KEY_MASK(grp, src, len, &i6mn->i6mn_key);
     i6mn->i6mn_entry = mfib_entry_index;
@@ -601,12 +601,12 @@ ip6_show_mfib (vlib_main_t * vm,
         }
         else if (unformat (input, "%U/%d", unformat_ip6_address, &grp, &mask))
         {
-            memset(&src, 0, sizeof(src));
+            clib_memset(&src, 0, sizeof(src));
             matching = 1;
         }
         else if (unformat (input, "%U", unformat_ip6_address, &grp))
         {
-            memset(&src, 0, sizeof(src));
+            clib_memset(&src, 0, sizeof(src));
             matching = 1;
             mask = 128;
         }
diff --git a/src/vnet/mfib/mfib_entry.c b/src/vnet/mfib/mfib_entry.c
index a8d2f89cd55..90b223e3c25 100644
--- a/src/vnet/mfib/mfib_entry.c
+++ b/src/vnet/mfib/mfib_entry.c
@@ -403,7 +403,7 @@ mfib_entry_alloc (u32 fib_index,
 
     /*
      * Some of the members require non-default initialisation
-     * so we also init those that don't and thus save on the call to memset.
+     * so we also init those that don't and thus save on the call to clib_memset.
      */
     mfib_entry->mfe_flags = 0;
     mfib_entry->mfe_fib_index = fib_index;
diff --git a/src/vnet/mfib/mfib_test.c b/src/vnet/mfib/mfib_test.c
index 4d519cd460f..2a12a38ef80 100644
--- a/src/vnet/mfib/mfib_test.c
+++ b/src/vnet/mfib/mfib_test.c
@@ -342,7 +342,7 @@ mfib_test_i (fib_protocol_t PROTO,
     int res;
 
     mfib_prefix_t all_1s;
-    memset(&all_1s, 0xfd, sizeof(all_1s));
+    clib_memset(&all_1s, 0xfd, sizeof(all_1s));
 
     res = 0;
     n_entries = pool_elts(mfib_entry_pool);