summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuss White <russ@riw.us>2018-08-01 20:14:35 -0400
committerGitHub <noreply@github.com>2018-08-01 20:14:35 -0400
commitee55f64dc54bcec0c165836f47f2e2a45b7bdec8 (patch)
treedf06429a8d8a0603e96c21d2fe2e588abd866592
parent6960cd09c6cc24a9acaa199596a895170d155912 (diff)
parentc969b2edae68816f42a3893ac6dba7873e83981b (diff)
Merge pull request #2767 from donaldsharp/bgp_timers
bgpd: Intentionally stop some timers on instance removal
-rw-r--r--bgpd/bgpd.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index b5fb653bae..82da0245b5 100644
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -3120,6 +3120,9 @@ int bgp_delete(struct bgp *bgp)
assert(bgp);
THREAD_OFF(bgp->t_startup);
+ THREAD_OFF(bgp->t_maxmed_onstartup);
+ THREAD_OFF(bgp->t_update_delay);
+ THREAD_OFF(bgp->t_establish_wait);
if (BGP_DEBUG(zebra, ZEBRA)) {
if (bgp->inst_type == BGP_INSTANCE_TYPE_DEFAULT)