diff options
| author | Donatas Abraitis <donatas@opensourcerouting.org> | 2022-07-22 08:26:08 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-22 08:26:08 +0300 |
| commit | eed5b70f94b51c05bdbcebf39ade792213fd124b (patch) | |
| tree | 82932e6c0215ec11400b2b9e7efd911d7880d285 /bgpd/bgp_vty.c | |
| parent | cb6c39645fae5211bd15b43a1b7879fb4c4b308c (diff) | |
| parent | 2783a6921c8fd3917caa539df82e0d9f2a23eb0c (diff) | |
Merge pull request #11657 from donaldsharp/why_timer
convert thread_cancel to THREAD_OFF
Diffstat (limited to 'bgpd/bgp_vty.c')
| -rw-r--r-- | bgpd/bgp_vty.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c index c91a62ba0e..695855f407 100644 --- a/bgpd/bgp_vty.c +++ b/bgpd/bgp_vty.c @@ -2055,7 +2055,7 @@ DEFUN (no_bgp_maxmed_onstartup, /* Cancel max-med onstartup if its on */ if (bgp->t_maxmed_onstartup) { - thread_cancel(&bgp->t_maxmed_onstartup); + THREAD_OFF(bgp->t_maxmed_onstartup); bgp->maxmed_onstartup_over = 1; } @@ -7256,7 +7256,7 @@ DEFUN (bgp_set_route_map_delay_timer, * fired. */ if (!rmap_delay_timer && bm->t_rmap_update) { - BGP_TIMER_OFF(bm->t_rmap_update); + THREAD_OFF(bm->t_rmap_update); thread_execute(bm->master, bgp_route_map_update_timer, NULL, 0); } |