From d5568431f7d002571568b2f94c0b5150a11d29c8 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Tue, 18 Jun 2019 09:21:49 -0400 Subject: bgpd: BGP_ERR_MULTIPLE_INSTANCE_NOT_SET is an impossible condition This code is not returned anywhere in the system as that bgp is by default multiple-instance 'only' now. So remove the last remaining bits of it from the code base. Remove BGP_ERR_MULTIPLE_INSTANCE_USED too. Make bgp_get explicitly return BGP_SUCCESS instead of 0. Remove the multi-instance error code too. Signed-off-by: Donald Sharp --- bgpd/bgp_errors.c | 6 ------ 1 file changed, 6 deletions(-) (limited to 'bgpd/bgp_errors.c') diff --git a/bgpd/bgp_errors.c b/bgpd/bgp_errors.c index 6e181697d6..d9aba87e35 100644 --- a/bgpd/bgp_errors.c +++ b/bgpd/bgp_errors.c @@ -426,12 +426,6 @@ static struct log_ref ferr_bgp_err[] = { .description = "BGP attempted to create an EVPN ES entry and failed", .suggestion = "Most likely a bug. If the problem persists, report the problem for troubleshooting" }, - { - .code = EC_BGP_MULTI_INSTANCE, - .title = "BGP config multi-instance issue", - .description = "BGP configuration attempting multiple instances without enabling the feature", - .suggestion = "Correct the configuration so that bgp multiple-instance is enabled if desired" - }, { .code = EC_BGP_EVPN_AS_MISMATCH, .title = "BGP AS configuration issue", -- cgit v1.2.3