summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonald Sharp <donaldsharp72@gmail.com>2024-11-22 18:33:44 -0500
committerGitHub <noreply@github.com>2024-11-22 18:33:44 -0500
commit0268aef6ad215efb469b27bff30dfb43aa265f97 (patch)
tree5694548c76158be446f23837ec9371d1d492f69c
parent321638388dacc9062c30a7658911cee2f16791f1 (diff)
parent02d922c6b19a243da300aa64505585fe40f15722 (diff)
Merge pull request #17489 from FRRouting/mergify/bp/stable/10.0/pr-17487
bgpd: Do not reset peers on suppress-fib toggling (backport #17487)
-rw-r--r--bgpd/bgpd.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index 557a64cf53..bb218cf121 100644
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -461,6 +461,10 @@ void bgp_suppress_fib_pending_set(struct bgp *bgp, bool set)
if (bgp->inst_type == BGP_INSTANCE_TYPE_VIEW)
return;
+ /* Do nothing if already in a desired state */
+ if (set == !!CHECK_FLAG(bgp->flags, BGP_FLAG_SUPPRESS_FIB_PENDING))
+ return;
+
if (set) {
SET_FLAG(bgp->flags, BGP_FLAG_SUPPRESS_FIB_PENDING);
/* Send msg to zebra for the first instance of bgp enabled