From: Donald Sharp <sharpd@nvidia.com>
Date: Thu, 10 Mar 2022 14:33:57 +0000 (-0500)
Subject: bgpd: Do not fail when going from GR mode to GR
X-Git-Tag: frr-8.2.2.rc~2^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=refs%2Fpull%2F10777%2Fhead;p=mirror%2Ffrr.git

bgpd: Do not fail when going from GR mode to GR

If you enter:

router bgp 325
  bgp graceful-restart
  bgp graceful-restart
!

The second command entered will fail.  This is not
something that should be failing as that it's a no-op.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
(cherry picked from commit 624037727072a9087c936cb7f221bc53c22932f2)
---

diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index 43046f7f18..7e528b2191 100644
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -1223,7 +1223,7 @@ int bgp_global_gr_init(struct bgp *bgp)
 		{
 		/*Event -> */
 		/*GLOBAL_GR_cmd*/ /*no_Global_GR_cmd*/
-			GLOBAL_INVALID,  GLOBAL_HELPER,
+			GLOBAL_GR,  GLOBAL_HELPER,
 		/*GLOBAL_DISABLE_cmd*/ /*no_Global_Disable_cmd*/
 			GLOBAL_DISABLE,  GLOBAL_INVALID
 		},