Merge pull request #8734 from imzyxwvu/paf-deactivate

bgpd: Do not delete peer_af structure when deactivating peer-group from an address-family.
This commit is contained in:
Russ White 2021-07-13 06:35:30 -04:00 committed by GitHub
commit 171b5527b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -2317,13 +2317,6 @@ int peer_deactivate(struct peer *peer, afi_t afi, safi_t safi)
peer->afc[afi][safi] = 0;
group = peer->group;
if (peer_af_delete(peer, afi, safi) != 0) {
flog_err(
EC_BGP_PEER_DELETE,
"couldn't delete af structure for peer %s(%s, %s)",
peer->host, afi2str(afi), safi2str(safi));
}
for (ALL_LIST_ELEMENTS(group->peer, node, nnode, tmp_peer)) {
ret |= non_peergroup_deactivate_af(tmp_peer, afi, safi);
}