Merge branch 'pr/2986'

[mirror_frr.git] / bgpd / bgp_zebra.c

diff --git a/bgpd/bgp_zebra.c b/bgpd/bgp_zebra.c
index 49fed16121e5d4652bc8bc7dd76331bff4a03813..0efba63737b102e8d7eb82d2c2fb1be828ca78bb 100644 (file)
--- a/bgpd/bgp_zebra.c
+++ b/bgpd/bgp_zebra.c
@@ -1095,8 +1095,8 @@ int bgp_zebra_get_table_range(uint32_t chunk_size,
                return -1;
        ret = tm_get_table_chunk(zclient, chunk_size, start, end);
        if (ret < 0) {
-               flog_err(BGP_ERR_TABLE_CHUNK,
-                         "BGP: Error getting table chunk %u", chunk_size);
+               flog_err(EC_BGP_TABLE_CHUNK,
+                        "BGP: Error getting table chunk %u", chunk_size);
                return -1;
        }
        zlog_info("BGP: Table Manager returns range from chunk %u is [%u %u]",
@@ -2407,10 +2407,10 @@ static int bgp_zebra_process_local_macip(int command, struct zclient *zclient,
        ipa_len = stream_getl(s);
        if (ipa_len != 0 && ipa_len != IPV4_MAX_BYTELEN
            && ipa_len != IPV6_MAX_BYTELEN) {
-               flog_err(BGP_ERR_MACIP_LEN,
-                         "%u:Recv MACIP %s with invalid IP addr length %d",
-                         vrf_id, (command == ZEBRA_MACIP_ADD) ? "Add" : "Del",
-                         ipa_len);
+               flog_err(EC_BGP_MACIP_LEN,
+                        "%u:Recv MACIP %s with invalid IP addr length %d",
+                        vrf_id, (command == ZEBRA_MACIP_ADD) ? "Add" : "Del",
+                        ipa_len);
                return -1;
        }
 
@@ -2504,13 +2504,13 @@ static void bgp_zebra_process_label_chunk(
        STREAM_GETL(s, last);
 
        if (zclient->redist_default != proto) {
-               flog_err(BGP_ERR_LM_ERROR, "Got LM msg with wrong proto %u",
-                         proto);
+               flog_err(EC_BGP_LM_ERROR, "Got LM msg with wrong proto %u",
+                        proto);
                return;
        }
        if (zclient->instance != instance) {
-               flog_err(BGP_ERR_LM_ERROR, "Got LM msg with wrong instance %u",
-                         proto);
+               flog_err(EC_BGP_LM_ERROR, "Got LM msg with wrong instance %u",
+                        proto);
                return;
        }
 
@@ -2518,8 +2518,8 @@ static void bgp_zebra_process_label_chunk(
                first < MPLS_LABEL_UNRESERVED_MIN ||
                last > MPLS_LABEL_UNRESERVED_MAX) {
 
-               flog_err(BGP_ERR_LM_ERROR, "%s: Invalid Label chunk: %u - %u",
-                         __func__, first, last);
+               flog_err(EC_BGP_LM_ERROR, "%s: Invalid Label chunk: %u - %u",
+                        __func__, first, last);
                return;
        }
        if (BGP_DEBUG(zebra, ZEBRA)) {