This is to backport the upstream fix on top of bgpd-restart-bit-fix.patch

[quagga-dev 11878] [PATCH] bgpd: stop startup timer on stopping BGP (fixes dd49eb1)

diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index 75656d249e49e27acd729d884dabd29a53ff86ed..07124a26791e49397fc230531f8fc8efbf94a434 100644 (file)
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -2628,6 +2628,8 @@ bgp_delete (struct bgp *bgp)
   afi_t afi;
   int i;
 
+  THREAD_OFF (bgp->t_startup);
+
   for (ALL_LIST_ELEMENTS (bgp->peer, node, next, peer))
     {
       if (peer->status == Established ||