diff options
Diffstat (limited to 'src/vnet/adj')
-rw-r--r-- | src/vnet/adj/adj_delegate.h | 2 | ||||
-rw-r--r-- | src/vnet/adj/adj_glean.c | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/vnet/adj/adj_delegate.h b/src/vnet/adj/adj_delegate.h index 096c1823e27..d49c6661c19 100644 --- a/src/vnet/adj/adj_delegate.h +++ b/src/vnet/adj/adj_delegate.h @@ -80,7 +80,7 @@ typedef u8 * (*adj_delegate_format_t)(const adj_delegate_t *aed, u8 *s); /** * Notification that an adjacency has been created */ -typedef u8 * (*adj_delegate_adj_created_t)(adj_index_t ai); +typedef void (*adj_delegate_adj_created_t)(adj_index_t ai); /** * An ADJ delegate virtual function table diff --git a/src/vnet/adj/adj_glean.c b/src/vnet/adj/adj_glean.c index 338d7320d53..65ccda1f5b8 100644 --- a/src/vnet/adj/adj_glean.c +++ b/src/vnet/adj/adj_glean.c @@ -149,8 +149,7 @@ adj_glean_interface_state_change (vnet_main_t * vnm, fib_protocol_t proto; ip_adjacency_t *adj; - - for (proto = FIB_PROTOCOL_IP4; proto <= FIB_PROTOCOL_IP6; proto++) + FOR_EACH_FIB_IP_PROTOCOL(proto) { if (sw_if_index >= vec_len(adj_gleans[proto]) || ADJ_INDEX_INVALID == adj_gleans[proto][sw_if_index]) @@ -242,7 +241,7 @@ adj_glean_interface_delete (vnet_main_t * vnm, return (NULL); } - for (proto = FIB_PROTOCOL_IP4; proto <= FIB_PROTOCOL_IP6; proto++) + FOR_EACH_FIB_IP_PROTOCOL(proto) { if (sw_if_index >= vec_len(adj_gleans[proto]) || ADJ_INDEX_INVALID == adj_gleans[proto][sw_if_index]) |