diff options
| -rw-r--r-- | bgpd/bgp_fsm.c | 6 | ||||
| -rw-r--r-- | bgpd/bgpd.c | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/bgpd/bgp_fsm.c b/bgpd/bgp_fsm.c index 91265ed358..15e9955872 100644 --- a/bgpd/bgp_fsm.c +++ b/bgpd/bgp_fsm.c @@ -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 diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c index 5cc5feba3a..19c7020d99 100644 --- a/bgpd/bgpd.c +++ b/bgpd/bgpd.c @@ -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(); } |