proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-11-03 23:47:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bgpd: No need to test if a thread is running for BGP_TIMER_OFF

Browse Source 
Handles that inside the macro.

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
This commit is contained in:
Donatas Abraitis 2021-12-21 10:57:07 +02:00
parent 20044d8090
commit 22472feef8
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bgpd/bgp_fsm.c
View File

@ -509,8 +509,7 @@ static int bgp_connect_timer(struct thread *thread)
peer = THREAD_ARG(thread);
/* stop the DelayOpenTimer if it is running */
if (peer->t_delayopen)
BGP_TIMER_OFF(peer->t_delayopen);
BGP_TIMER_OFF(peer->t_delayopen);
assert(!peer->t_write);
assert(!peer->t_read);
@ -830,8 +829,7 @@ void bgp_adjust_routeadv(struct peer *peer)
* different
* duration and schedule write thread immediately.
*/
if (peer->t_routeadv)
BGP_TIMER_OFF(peer->t_routeadv);
BGP_TIMER_OFF(peer->t_routeadv);
peer->synctime = bgp_clock();
/* If suppress fib pending is enabled, route is advertised to

3
bgpd/bgpd.c
View File

@ -7876,8 +7876,7 @@ void bgp_terminate(void)
bgp_notify_send(peer, BGP_NOTIFY_CEASE,
BGP_NOTIFY_CEASE_PEER_UNCONFIG);
if (bm->t_rmap_update)
BGP_TIMER_OFF(bm->t_rmap_update);
BGP_TIMER_OFF(bm->t_rmap_update);
bgp_mac_finish();
}