zebra: cleanup checking zebra_evpn_mac_add function's return value

This function is sure to return correct value by "assert", so the
checking its return value should be removed.

Signed-off-by: anlan_cs <anlan_cs@tom.com>

diff --git a/zebra/zebra_evpn_mac.c b/zebra/zebra_evpn_mac.c
index e285c206b8d14075ad17b2cf6b4062f9d70052a4..d3791f3e58785ec308566b69feaf7ee8919eb7ce 100644 (file)
--- a/zebra/zebra_evpn_mac.c
+++ b/zebra/zebra_evpn_mac.c
@@ -2034,13 +2034,6 @@ int zebra_evpn_mac_remote_macip_add(
        if (update_mac) {
                if (!mac) {
                        mac = zebra_evpn_mac_add(zevpn, macaddr);
-                       if (!mac) {
-                               zlog_warn(
-                                       "Failed to add MAC %pEA VNI %u Remote VTEP %pI4",
-                                       macaddr, zevpn->vni, &vtep_ip);
-                               return -1;
-                       }
-
                        zebra_evpn_es_mac_ref(mac, esi);
 
                        /* Is this MAC created for a MACIP? */
@@ -2182,14 +2175,6 @@ int zebra_evpn_add_update_local_mac(struct zebra_vrf *zvrf,
                                local_inactive ? " local-inactive" : "");
 
                mac = zebra_evpn_mac_add(zevpn, macaddr);
-               if (!mac) {
-                       flog_err(
-                               EC_ZEBRA_MAC_ADD_FAILED,
-                               "Failed to add MAC %pEA intf %s(%u) VID %u VNI %u",
-                               macaddr, ifp->name, ifp->ifindex, vid,
-                               zevpn->vni);
-                       return -1;
-               }
                SET_FLAG(mac->flags, ZEBRA_MAC_LOCAL);
                es_change = zebra_evpn_local_mac_update_fwd_info(mac, ifp, vid);
                if (sticky)
@@ -2486,15 +2471,8 @@ int zebra_evpn_mac_gw_macip_add(struct interface *ifp, struct zebra_evpn *zevpn,
                local_ns_id = zvrf->zns->ns_id;
 
        mac = zebra_evpn_mac_lookup(zevpn, macaddr);
-       if (!mac) {
+       if (!mac)
                mac = zebra_evpn_mac_add(zevpn, macaddr);
-               if (!mac) {
-                       flog_err(EC_ZEBRA_MAC_ADD_FAILED,
-                                "Failed to add MAC %pEA intf %s(%u) VID %u",
-                                macaddr, ifp->name, ifp->ifindex, vlan_id);
-                       return -1;
-               }
-       }
 
        /* Set "local" forwarding info. */
        zebra_evpn_mac_clear_fwd_info(mac);

diff --git a/zebra/zebra_evpn_neigh.c b/zebra/zebra_evpn_neigh.c
index 5fb4e076655cf0f47997915f4da2ecd2222cadd1..7299391ef6959203785ca6c28426af47f44bc280 100644 (file)
--- a/zebra/zebra_evpn_neigh.c
+++ b/zebra/zebra_evpn_neigh.c
@@ -1286,12 +1286,6 @@ int zebra_evpn_local_neigh_update(struct zebra_evpn *zevpn,
                                   macaddr, ip, zevpn->vni);
 
                zmac = zebra_evpn_mac_add(zevpn, macaddr);
-               if (!zmac) {
-                       zlog_debug("Failed to add MAC %pEA VNI %u", macaddr,
-                                  zevpn->vni);
-                       return -1;
-               }
-
                zebra_evpn_mac_clear_fwd_info(zmac);
                memset(&zmac->flags, 0, sizeof(uint32_t));
                SET_FLAG(zmac->flags, ZEBRA_MAC_AUTO);