diff options
| author | Donald Sharp <sharpd@nvidia.com> | 2022-11-08 07:11:18 -0500 |
|---|---|---|
| committer | Donald Sharp <sharpd@nvidia.com> | 2022-11-08 08:11:52 -0500 |
| commit | 89c73443e8cfd3d6809e8a036151849c3bcf518c (patch) | |
| tree | 200e8970c1c883df6cac0571604f9f9413731dfb /bgpd/bgp_mac.c | |
| parent | 8fb15d02fe676de000754e56a183264ed89c6d81 (diff) | |
bgpd: Make calling bgp_soft_reconfig_in consistent
Not all places were checking to see if soft reconfiguration
was turned on before calling into it to do all that work.
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Diffstat (limited to 'bgpd/bgp_mac.c')
| -rw-r--r-- | bgpd/bgp_mac.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/bgpd/bgp_mac.c b/bgpd/bgp_mac.c index 02b7e64869..b9649ac4da 100644 --- a/bgpd/bgp_mac.c +++ b/bgpd/bgp_mac.c @@ -242,19 +242,18 @@ static void bgp_mac_rescan_evpn_table(struct bgp *bgp, struct ethaddr *macaddr) if (!peer_established(peer)) continue; - if (CHECK_FLAG(peer->af_flags[afi][safi], - PEER_FLAG_SOFT_RECONFIG)) { - if (bgp_debug_update(peer, NULL, NULL, 1)) - zlog_debug("Processing EVPN MAC interface change on peer %s (inbound, soft-reconfig)", - peer->host); - - bgp_soft_reconfig_in(peer, afi, safi); - } else { + if (bgp_debug_update(peer, NULL, NULL, 1)) + zlog_debug( + "Processing EVPN MAC interface change on peer %s %s", + peer->host, + CHECK_FLAG(peer->af_flags[afi][safi], + PEER_FLAG_SOFT_RECONFIG) + ? "(inbound, soft-reconfig)" + : ""); + + if (!bgp_soft_reconfig_in(peer, afi, safi)) { struct bgp_table *table = bgp->rib[afi][safi]; - if (bgp_debug_update(peer, NULL, NULL, 1)) - zlog_debug("Processing EVPN MAC interface change on peer %s", - peer->host); bgp_process_mac_rescan_table(bgp, peer, table, macaddr); } } |