summaryrefslogtreecommitdiffstats
path: root/src/vnet
diff options
context:
space:
mode:
authorNeale Ranns <nranns@cisco.com>2019-02-22 12:40:53 +0000
committerNeale Ranns <nranns@cisco.com>2019-03-26 20:40:46 +0000
commit8d6723968945d686b94f780b5a755fd3a73d4be6 (patch)
tree1432d159b831e81d3ea8b80f177cbd183e6fe38c /src/vnet
parent327fbae5959f52c7fe670d8d204faaf2c8781a17 (diff)
Callback functions must have the correct signature
Change-Id: I642823bdc3c7006a0b719ec1e3a9cd75b2b37253 Signed-off-by: Neale Ranns <nranns@cisco.com> (cherry picked from commit 8f215b4a03a98bf94931a09b23ab0fbd8ccd1ab9)
Diffstat (limited to 'src/vnet')
-rw-r--r--src/vnet/adj/adj.c4
-rw-r--r--src/vnet/ethernet/arp.c4
-rw-r--r--src/vnet/interface.h4
3 files changed, 8 insertions, 4 deletions
diff --git a/src/vnet/adj/adj.c b/src/vnet/adj/adj.c
index b844073ecfb..3ca3d6015f9 100644
--- 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 e6e3a515b97..ec176de9309 100644
--- a/src/vnet/ethernet/arp.c
+++ b/src/vnet/ethernet/arp.c
@@ -2615,7 +2615,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 f6f486e4591..cbad30f1d13 100644
--- 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; \