summaryrefslogtreecommitdiff
path: root/zebra/irdp_main.c
diff options
context:
space:
mode:
authorDonatas Abraitis <donatas@opensourcerouting.org>2022-07-22 08:26:08 +0300
committerGitHub <noreply@github.com>2022-07-22 08:26:08 +0300
commiteed5b70f94b51c05bdbcebf39ade792213fd124b (patch)
tree82932e6c0215ec11400b2b9e7efd911d7880d285 /zebra/irdp_main.c
parentcb6c39645fae5211bd15b43a1b7879fb4c4b308c (diff)
parent2783a6921c8fd3917caa539df82e0d9f2a23eb0c (diff)
Merge pull request #11657 from donaldsharp/why_timer
convert thread_cancel to THREAD_OFF
Diffstat (limited to 'zebra/irdp_main.c')
-rw-r--r--zebra/irdp_main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/zebra/irdp_main.c b/zebra/irdp_main.c
index 43478c98f1..65aad49a25 100644
--- a/zebra/irdp_main.c
+++ b/zebra/irdp_main.c
@@ -260,7 +260,7 @@ void irdp_advert_off(struct interface *ifp)
if (!irdp)
return;
- thread_cancel(&irdp->t_advertise);
+ THREAD_OFF(irdp->t_advertise);
if (ifp->connected)
for (ALL_LIST_ELEMENTS(ifp->connected, node, nnode, ifc)) {
@@ -295,7 +295,7 @@ void process_solicit(struct interface *ifp)
return;
irdp->flags |= IF_SOLICIT;
- thread_cancel(&irdp->t_advertise);
+ THREAD_OFF(irdp->t_advertise);
timer = (frr_weak_random() % MAX_RESPONSE_DELAY) + 1;