]> git.puffer.fish Git - mirror/frr.git/commitdiff
bgpd: Do not fail when going from GR mode to GR 10777/head
authorDonald Sharp <sharpd@nvidia.com>
Thu, 10 Mar 2022 14:33:57 +0000 (09:33 -0500)
committermergify-bot <noreply@mergify.com>
Fri, 11 Mar 2022 14:52:26 +0000 (14:52 +0000)
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)

bgpd/bgpd.c

index 43046f7f18116d155392a00aee459038d9c89c62..7e528b21916ef7096e582829d8c3e24f48a89d19 100644 (file)
@@ -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
                },