bgpd: Fix for Helper node doesn't set R-bit in OPEN message after the reload.

BGP Helper node doesn't set R-bit in OPEN message after the
restart or reload of the BGP router.

Signed-off-by: Biswajit Sadhu <sadhub@vmware.com>

diff --git a/bgpd/bgp_open.c b/bgpd/bgp_open.c
index 89437a5149969bc5ab0fbc239cd750317fad5178..82a17671e90838783412be3bbf0ca55b89642554 100644 (file)
--- a/bgpd/bgp_open.c
+++ b/bgpd/bgp_open.c
@@ -1332,9 +1332,7 @@ static void bgp_peer_send_gr_capability(struct stream *s, struct peer *peer,
                rcapp = stream_get_endp(s);
                stream_putc(s, 0);
                restart_time = peer->bgp->restart_time;
-               if ((peer->bgp->t_startup) &&
-                       (CHECK_FLAG(peer->flags,
-                               PEER_FLAG_GRACEFUL_RESTART))) {
+               if (peer->bgp->t_startup) {
                        SET_FLAG(restart_time, RESTART_R_BIT);
                        SET_FLAG(peer->cap, PEER_CAP_RESTART_BIT_ADV);
                }