summaryrefslogtreecommitdiffstats
path: root/pimd/pim6_mld.c
diff options
context:
space:
mode:
authorMark Stapp <mjs@labn.net>2023-07-11 22:03:38 +0200
committerMark Stapp <mjs@labn.net>2023-07-25 16:17:48 +0200
commitadca5c22c573f17b09b96a0994953c8f643fd301 (patch)
tree84894373c496a0279b3fc5eb944803c53bcb6c34 /pimd/pim6_mld.c
parentMerge pull request #14076 from chiragshah6/fdev1 (diff)
downloadfrr-adca5c22c573f17b09b96a0994953c8f643fd301.tar.xz
frr-adca5c22c573f17b09b96a0994953c8f643fd301.zip
* : include event ptr in event_execute api
Include an event ptr-to-ptr in the event_execute() api call, like the various schedule api calls. This allows the execute() api to cancel an existing scheduled task if that task is being executed inline. Signed-off-by: Mark Stapp <mjs@labn.net>
Diffstat (limited to 'pimd/pim6_mld.c')
-rw-r--r--pimd/pim6_mld.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/pimd/pim6_mld.c b/pimd/pim6_mld.c
index ed9967e7a..20ef9216a 100644
--- a/pimd/pim6_mld.c
+++ b/pimd/pim6_mld.c
@@ -1367,7 +1367,7 @@ static void gm_bump_querier(struct gm_if *gm_ifp)
gm_ifp->n_startup = gm_ifp->cur_qrv;
- event_execute(router->master, gm_t_query, gm_ifp, 0);
+ event_execute(router->master, gm_t_query, gm_ifp, 0, NULL);
}
static void gm_t_other_querier(struct event *t)
@@ -1380,7 +1380,7 @@ static void gm_t_other_querier(struct event *t)
gm_ifp->querier = pim_ifp->ll_lowest;
gm_ifp->n_startup = gm_ifp->cur_qrv;
- event_execute(router->master, gm_t_query, gm_ifp, 0);
+ event_execute(router->master, gm_t_query, gm_ifp, 0, NULL);
}
static void gm_handle_query(struct gm_if *gm_ifp,
@@ -2267,7 +2267,7 @@ static void gm_update_ll(struct interface *ifp)
return;
gm_ifp->n_startup = gm_ifp->cur_qrv;
- event_execute(router->master, gm_t_query, gm_ifp, 0);
+ event_execute(router->master, gm_t_query, gm_ifp, 0, NULL);
}
void gm_ifp_update(struct interface *ifp)