bgpd: Stop LLGR thread when deleting a peer and/or GR flags changed

Also valid when shutting down a BGP instance.

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>

diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index 4c151b2d374398862e00ee88758dabfe40b943fd..2c0d88d643b81e9ed46ba2b7ca39df6d9d6febe8 100644 (file)
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -2374,8 +2374,10 @@ void peer_nsf_stop(struct peer *peer)
        UNSET_FLAG(peer->sflags, PEER_STATUS_NSF_WAIT);
        UNSET_FLAG(peer->sflags, PEER_STATUS_NSF_MODE);
 
-       FOREACH_AFI_SAFI_NSF (afi, safi)
+       FOREACH_AFI_SAFI_NSF (afi, safi) {
                peer->nsf[afi][safi] = 0;
+               THREAD_OFF(peer->t_llgr_stale[afi][safi]);
+       }
 
        if (peer->t_gr_restart) {
                THREAD_OFF(peer->t_gr_restart);