From: Donatas Abraitis <donatas@opensourcerouting.org>
Date: Fri, 22 Jul 2022 05:26:08 +0000 (+0300)
Subject: Merge pull request #11657 from donaldsharp/why_timer
X-Git-Tag: base_8.4~208
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=eed5b70f94b51c05bdbcebf39ade792213fd124b;p=matthieu%2Ffrr.git

Merge pull request #11657 from donaldsharp/why_timer

convert thread_cancel to THREAD_OFF
---

eed5b70f94b51c05bdbcebf39ade792213fd124b
diff --cc bgpd/bgp_fsm.c
index f66c889fb2,ae214859d7..b570c84d8b
--- a/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)