X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Flisp-gpe%2Flisp_gpe_adjacency.c;h=6f85dc4a7614e63554f493ef58551d0a11fdbf19;hb=b7b929931a07fbb27b43d5cd105f366c3e29807e;hp=7db1c9bbb728d5260e595da89ad32f1c2b5796e1;hpb=f55f9b851f59264d737d92c6277a87588c565d24;p=vpp.git

diff --git a/src/vnet/lisp-gpe/lisp_gpe_adjacency.c b/src/vnet/lisp-gpe/lisp_gpe_adjacency.c
index 7db1c9bbb72..6f85dc4a761 100644
--- a/src/vnet/lisp-gpe/lisp_gpe_adjacency.c
+++ b/src/vnet/lisp-gpe/lisp_gpe_adjacency.c
@@ -115,7 +115,7 @@ ip46_address_to_ip_address (const ip46_address_t * a, ip_address_t * b)
 {
   if (ip46_address_is_ip4 (a))
     {
-      memset (b, 0, sizeof (*b));
+      clib_memset (b, 0, sizeof (*b));
       ip_address_set (b, &a->ip4, IP4);
     }
   else
@@ -293,7 +293,7 @@ lisp_gpe_increment_stats_counters (lisp_cp_main_t * lcm, ip_adjacency_t * adj,
     return;
 
   lisp_stats_key_t key;
-  memset (&key, 0, sizeof (key));
+  clib_memset (&key, 0, sizeof (key));
   key.fwd_entry_index = feip[0];
   key.tunnel_index = ladj->tunnel_index;
 
@@ -307,7 +307,8 @@ lisp_gpe_increment_stats_counters (lisp_cp_main_t * lcm, ip_adjacency_t * adj,
 }
 
 static void
-lisp_gpe_fixup (vlib_main_t * vm, ip_adjacency_t * adj, vlib_buffer_t * b)
+lisp_gpe_fixup (vlib_main_t * vm,
+		ip_adjacency_t * adj, vlib_buffer_t * b, const void *data)
 {
   lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
 
@@ -348,6 +349,7 @@ lisp_gpe_update_adjacency (vnet_main_t * vnm, u32 sw_if_index, adj_index_t ai)
   linkt = adj_get_link_type (ai);
   adj_nbr_midchain_update_rewrite
     (ai, lisp_gpe_fixup,
+     NULL,
      (VNET_LINK_ETHERNET == linkt ?
       ADJ_FLAG_MIDCHAIN_NO_COUNT :
       ADJ_FLAG_NONE),
@@ -393,7 +395,7 @@ lisp_gpe_adjacency_find_or_create_and_lock (const locator_pair_t * pair,
     {
 
       pool_get (lisp_adj_pool, ladj);
-      memset (ladj, 0, sizeof (*ladj));
+      clib_memset (ladj, 0, sizeof (*ladj));
       lai = (ladj - lisp_adj_pool);
 
       ip_address_copy (&ladj->remote_rloc, &pair->rmt_loc);