summaryrefslogtreecommitdiffstats
path: root/bgpd/bgp_errors.c
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@cumulusnetworks.com>2019-06-18 15:21:49 +0200
committerDonald Sharp <sharpd@cumulusnetworks.com>2019-06-18 15:26:00 +0200
commitd5568431f7d002571568b2f94c0b5150a11d29c8 (patch)
treec1a036cf8ed90689c402cf7251a535acb222fa41 /bgpd/bgp_errors.c
parentMerge pull request #4530 from donaldsharp/pim_debugs (diff)
downloadfrr-d5568431f7d002571568b2f94c0b5150a11d29c8.tar.xz
frr-d5568431f7d002571568b2f94c0b5150a11d29c8.zip
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 <sharpd@cumulusnetworks.com>
Diffstat (limited to 'bgpd/bgp_errors.c')
-rw-r--r--bgpd/bgp_errors.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/bgpd/bgp_errors.c b/bgpd/bgp_errors.c
index 6e181697d..d9aba87e3 100644
--- a/bgpd/bgp_errors.c
+++ b/bgpd/bgp_errors.c
@@ -427,12 +427,6 @@ static struct log_ref ferr_bgp_err[] = {
.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",
.description = "BGP configuration attempted for a different AS than currently configured",