Merge pull request #13649 from donaldsharp/unlock_the_node_or_else

[mirror_frr.git] / pimd / pim_igmpv3.c

diff --git a/pimd/pim_igmpv3.c b/pimd/pim_igmpv3.c
index 3c7b1fc827af68ce07806a5ffb13d28bfb858252..15078dd1ecd2bde09039315422bcb0db74baa0d3 100644 (file)
--- a/pimd/pim_igmpv3.c
+++ b/pimd/pim_igmpv3.c
@@ -112,7 +112,7 @@ static void igmp_source_timer(struct event *t)
        struct gm_source *source;
        struct gm_group *group;
 
-       source = THREAD_ARG(t);
+       source = EVENT_ARG(t);
 
        group = source->source_group;
 
@@ -187,7 +187,7 @@ static void source_timer_off(struct gm_group *group, struct gm_source *source)
                        group_str, source_str, group->interface->name);
        }
 
-       THREAD_OFF(source->t_source_timer);
+       EVENT_OFF(source->t_source_timer);
 }
 
 static void igmp_source_timer_on(struct gm_group *group,
@@ -209,8 +209,8 @@ static void igmp_source_timer_on(struct gm_group *group,
                        source_str, group->interface->name);
        }
 
-       thread_add_timer_msec(router->master, igmp_source_timer, source,
-                             interval_msec, &source->t_source_timer);
+       event_add_timer_msec(router->master, igmp_source_timer, source,
+                            interval_msec, &source->t_source_timer);
 
        /*
          RFC 3376: 6.3. IGMPv3 Source-Specific Forwarding Rules
@@ -1206,7 +1206,7 @@ static void igmp_group_retransmit(struct event *t)
        int num_retransmit_sources_left;
        int send_with_sflag_set; /* boolean */
 
-       group = THREAD_ARG(t);
+       group = EVENT_ARG(t);
 
        if (PIM_DEBUG_GM_TRACE) {
                char group_str[INET_ADDRSTRLEN];
@@ -1281,9 +1281,8 @@ static void group_retransmit_timer_on(struct gm_group *group)
                        group->interface->name);
        }
 
-       thread_add_timer_msec(router->master, igmp_group_retransmit, group,
-                             lmqi_msec,
-                             &group->t_group_query_retransmit_timer);
+       event_add_timer_msec(router->master, igmp_group_retransmit, group,
+                            lmqi_msec, &group->t_group_query_retransmit_timer);
 }
 
 static long igmp_group_timer_remain_msec(struct gm_group *group)