From 44bb3ab442eb2008ddeb30c078a709fc4a6468b6 Mon Sep 17 00:00:00 2001 From: zyxwvu Shi Date: Wed, 26 May 2021 10:33:55 +0800 Subject: [PATCH] bgpd: Do not delete peer_af when deactivating peer-group. There is no peer_af allocated in `peer_activate`. Trying to delete the structure just results in an no-op and a error return value. The error message "couldn't delete af structure for peer" is unexpected. Signed-off-by: zyxwvu Shi (cherry picked from commit 3057d1e45af0c7789a3b7adfcae882b0234fbf4c) --- bgpd/bgpd.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c index 3c76573182..597627b2f0 100644 --- a/bgpd/bgpd.c +++ b/bgpd/bgpd.c @@ -2310,13 +2310,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); } -- 2.39.5