Merge pull request #11657 from donaldsharp/why_timer

convert thread_cancel to THREAD_OFF

diff --cc bgpd/bgp_fsm.c
index f66c889fb2d08b3361d92a09da64f807234ee6c2,ae214859d7692e86a0b5c9792a0a8f7022673aac..b570c84d8b2a440be95436c505286963e8c3eb8f
--- 1/bgpd/bgp_fsm.c
--- 2/bgpd/bgp_fsm.c
+++ b/bgpd/bgp_fsm.c
@@@ -1494,14 -1493,14 +1493,14 @@@ int bgp_stop(struct peer *peer
        THREAD_OFF(peer->t_connect_check_w);
  
        /* Stop all timers. */
-       BGP_TIMER_OFF(peer->t_start);
-       BGP_TIMER_OFF(peer->t_connect);
-       BGP_TIMER_OFF(peer->t_holdtime);
-       BGP_TIMER_OFF(peer->t_routeadv);
-       BGP_TIMER_OFF(peer->t_delayopen);
+       THREAD_OFF(peer->t_start);
+       THREAD_OFF(peer->t_connect);
+       THREAD_OFF(peer->t_holdtime);
+       THREAD_OFF(peer->t_routeadv);
+       THREAD_OFF(peer->t_delayopen);
  
        /* Clear input and output buffer.  */
 -      frr_with_mutex(&peer->io_mtx) {
 +      frr_with_mutex (&peer->io_mtx) {
                if (peer->ibuf)
                        stream_fifo_clean(peer->ibuf);
                if (peer->obuf)

diff --cc bgpd/bgp_packet.c
Simple merge