Callback functions must have the correct signature

Change-Id: I642823bdc3c7006a0b719ec1e3a9cd75b2b37253
Signed-off-by: Neale Ranns <nranns@cisco.com>

diff --git a/src/vnet/adj/adj.c b/src/vnet/adj/adj.c
index b844073..3ca3d60 100644 (file)
--- a/src/vnet/adj/adj.c
+++ b/src/vnet/adj/adj.c
@@ -431,10 +431,12 @@ adj_mtu_update_walk_cb (adj_index_t ai,
     return (ADJ_WALK_RC_CONTINUE);
 }
 
-static void
+static clib_error_t *
 adj_mtu_update (vnet_main_t * vnm, u32 sw_if_index, u32 flags)
 {
   adj_walk (sw_if_index, adj_mtu_update_walk_cb, NULL);
+
+  return (NULL);
 }
 
 VNET_SW_INTERFACE_MTU_CHANGE_FUNCTION(adj_mtu_update);

diff --git a/src/vnet/ethernet/arp.c b/src/vnet/ethernet/arp.c
index dded56a..6b651e7 100644 (file)
--- a/src/vnet/ethernet/arp.c
+++ b/src/vnet/ethernet/arp.c
@@ -2613,7 +2613,7 @@ send_ip4_garp_w_addr (vlib_main_t * vm,
 /*
  * Remove any arp entries asociated with the specificed interface
  */
-void
+static clib_error_t *
 vnet_arp_delete_sw_interface (vnet_main_t * vnm, u32 sw_if_index, u32 is_add)
 {
   if (!is_add && sw_if_index != ~0)
@@ -2632,6 +2632,8 @@ vnet_arp_delete_sw_interface (vnet_main_t * vnm, u32 sw_if_index, u32 is_add)
       }));
       /* *INDENT-ON* */
     }
+
+  return (NULL);
 }
 
 VNET_SW_INTERFACE_ADD_DEL_FUNCTION (vnet_arp_delete_sw_interface);

diff --git a/src/vnet/interface.h b/src/vnet/interface.h
index 5c41859..ec76057 100644 (file)
--- a/src/vnet/interface.h
+++ b/src/vnet/interface.h
@@ -131,7 +131,7 @@ static void __vnet_interface_function_deinit_##tag##_##f (void)         \
 {                                                                       \
  vnet_main_t * vnm = vnet_get_main();                                   \
  _vnet_interface_function_list_elt_t *next;                             \
- if (vnm->tag##_functions[p]->fp == (void *) &f)                        \
+ if (vnm->tag##_functions[p]->fp == f)                                  \
     {                                                                   \
       vnm->tag##_functions[p] =                                         \
         vnm->tag##_functions[p]->next_interface_function;               \
@@ -140,7 +140,7 @@ static void __vnet_interface_function_deinit_##tag##_##f (void)         \
   next = vnm->tag##_functions[p];                                       \
   while (next->next_interface_function)                                 \
     {                                                                   \
-      if (next->next_interface_function->fp == (void *) &f)             \
+      if (next->next_interface_function->fp == f)                       \
         {                                                               \
           next->next_interface_function =                               \
             next->next_interface_function->next_interface_function;     \