diff options
Diffstat (limited to 'ospfd/ospf_nsm.c')
| -rw-r--r-- | ospfd/ospf_nsm.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/ospfd/ospf_nsm.c b/ospfd/ospf_nsm.c index e3cf1cfc8b..c538d1a09a 100644 --- a/ospfd/ospf_nsm.c +++ b/ospfd/ospf_nsm.c @@ -59,7 +59,7 @@ DEFINE_HOOK(ospf_nsm_change, static void nsm_clear_adj(struct ospf_neighbor *); /* OSPF NSM Timer functions. */ -static int ospf_inactivity_timer(struct thread *thread) +static void ospf_inactivity_timer(struct thread *thread) { struct ospf_neighbor *nbr; @@ -84,11 +84,9 @@ static int ospf_inactivity_timer(struct thread *thread) OSPF_NSM_TIMER_ON(nbr->t_inactivity, ospf_inactivity_timer, nbr->v_inactivity); } - - return 0; } -static int ospf_db_desc_timer(struct thread *thread) +static void ospf_db_desc_timer(struct thread *thread) { struct ospf_neighbor *nbr; @@ -106,8 +104,6 @@ static int ospf_db_desc_timer(struct thread *thread) /* DD Retransmit timer set. */ OSPF_NSM_TIMER_ON(nbr->t_db_desc, ospf_db_desc_timer, nbr->v_db_desc); - - return 0; } /* Hook function called after ospf NSM event is occurred. @@ -776,7 +772,7 @@ static void nsm_change_state(struct ospf_neighbor *nbr, int state) } /* Execute NSM event process. */ -int ospf_nsm_event(struct thread *thread) +void ospf_nsm_event(struct thread *thread) { int event; int next_state; @@ -846,8 +842,6 @@ int ospf_nsm_event(struct thread *thread) */ if (nbr->state == NSM_Deleted) ospf_nbr_delete(nbr); - - return 0; } /* Check loading state. */ |