summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonatas Abraitis <donatas@opensourcerouting.org>2025-02-02 09:51:48 +0200
committerGitHub <noreply@github.com>2025-02-02 09:51:48 +0200
commitb56de28f94ab0cf4b917d87ddd4de206e7e85190 (patch)
tree3049f181dafef2dea66143395d54e551196a254c
parent86102acdad597fe64b97af5b7b5c3e90262702b9 (diff)
parent650f91c0513497190b49ccadb84b852a079c0c1a (diff)
Merge pull request #17974 from FRRouting/mergify/bp/stable/10.1/pr-17971
bgpd: With suppress-fib-pending ensure withdrawal is sent (backport #17971)
-rw-r--r--bgpd/bgp_route.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index c61462f2be..e70ebabc35 100644
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -3806,6 +3806,12 @@ static void bgp_process_main_one(struct bgp *bgp, struct bgp_dest *dest,
BGP_PATH_ATTR_CHANGED);
UNSET_FLAG(new_select->flags, BGP_PATH_MULTIPATH_CHG);
UNSET_FLAG(new_select->flags, BGP_PATH_LINK_BW_CHG);
+ } else {
+ /*
+ * Ensure that on uninstall that the INSTALL_PENDING
+ * is no longer set
+ */
+ UNSET_FLAG(dest->flags, BGP_NODE_FIB_INSTALL_PENDING);
}
/* call bmp hook for loc-rib route update / withdraw after flags were