]> git.puffer.fish Git - mirror/frr.git/commitdiff
bgpd: Do not call bgp_soft_reconfig_in() twice in a row on policy change 13146/head
authorDonatas Abraitis <donatas@opensourcerouting.org>
Wed, 29 Mar 2023 20:21:35 +0000 (23:21 +0300)
committerDonatas Abraitis <donatas@opensourcerouting.org>
Wed, 29 Mar 2023 20:21:35 +0000 (23:21 +0300)
Just realized it was a stupid copy/paste.

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
bgpd/bgpd.c

index 43885883eaa9e2874866b1f666153ba3ed1b6790..97238bc38b14d924361387176959736b1dc0f02c 100644 (file)
@@ -5677,11 +5677,8 @@ void peer_on_policy_change(struct peer *peer, afi_t afi, safi_t safi,
                if (bgp_soft_reconfig_in(peer, afi, safi))
                        return;
 
-               if (CHECK_FLAG(peer->af_flags[afi][safi],
-                              PEER_FLAG_SOFT_RECONFIG))
-                       bgp_soft_reconfig_in(peer, afi, safi);
-               else if (CHECK_FLAG(peer->cap, PEER_CAP_REFRESH_OLD_RCV) ||
-                        CHECK_FLAG(peer->cap, PEER_CAP_REFRESH_NEW_RCV))
+               if (CHECK_FLAG(peer->cap, PEER_CAP_REFRESH_OLD_RCV) ||
+                   CHECK_FLAG(peer->cap, PEER_CAP_REFRESH_NEW_RCV))
                        bgp_route_refresh_send(peer, afi, safi, 0, 0, 0,
                                               BGP_ROUTE_REFRESH_NORMAL);
        }