Merge pull request #11242 from patrasar/pimv6_issue_11233

[mirror_frr.git] / ospfd / ospf_ism.c

diff --git a/ospfd/ospf_ism.c b/ospfd/ospf_ism.c
index 36e97f877906de225d4369006fa559c5886e0e4d..97da61034f1e65f12130b41d90f3cb8b26e6d5ea 100644 (file)
--- a/ospfd/ospf_ism.c
+++ b/ospfd/ospf_ism.c
@@ -45,7 +45,7 @@
 
 DEFINE_HOOK(ospf_ism_change,
            (struct ospf_interface * oi, int state, int oldstate),
-           (oi, state, oldstate))
+           (oi, state, oldstate));
 
 /* elect DR and BDR. Refer to RFC2319 section 9.4 */
 static struct ospf_neighbor *ospf_dr_election_sub(struct list *routers)
@@ -248,7 +248,7 @@ int ospf_dr_election(struct ospf_interface *oi)
 }
 
 
-int ospf_hello_timer(struct thread *thread)
+void ospf_hello_timer(struct thread *thread)
 {
        struct ospf_interface *oi;
 
@@ -263,11 +263,9 @@ int ospf_hello_timer(struct thread *thread)
 
        /* Hello timer set. */
        OSPF_HELLO_TIMER_ON(oi);
-
-       return 0;
 }
 
-static int ospf_wait_timer(struct thread *thread)
+static void ospf_wait_timer(struct thread *thread)
 {
        struct ospf_interface *oi;
 
@@ -278,8 +276,6 @@ static int ospf_wait_timer(struct thread *thread)
                zlog_debug("ISM[%s]: Timer (Wait timer expire)", IF_NAME(oi));
 
        OSPF_ISM_EVENT_SCHEDULE(oi, ISM_WaitTimer);
-
-       return 0;
 }
 
 /* Hook function called after ospf ISM event is occurred. And vty's
@@ -575,7 +571,7 @@ static void ism_change_state(struct ospf_interface *oi, int state)
 }
 
 /* Execute ISM event process. */
-int ospf_ism_event(struct thread *thread)
+void ospf_ism_event(struct thread *thread)
 {
        int event;
        int next_state;
@@ -601,6 +597,4 @@ int ospf_ism_event(struct thread *thread)
 
        /* Make sure timer is set. */
        ism_timer_set(oi);
-
-       return 0;
 }