diff options
Diffstat (limited to 'zebra/zebra_vxlan.c')
| -rw-r--r-- | zebra/zebra_vxlan.c | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/zebra/zebra_vxlan.c b/zebra/zebra_vxlan.c index fdf21a135a..6a3b1bfbe3 100644 --- a/zebra/zebra_vxlan.c +++ b/zebra/zebra_vxlan.c @@ -826,8 +826,7 @@ static int zvni_map_to_svi_ns(struct ns *ns, struct interface **p_ifp = (struct interface **)_p_ifp; struct zebra_if *zif; - if (!in_param) - return NS_WALK_STOP; + assert(in_param && p_ifp); /* TODO: Optimize with a hash. */ for (rn = route_top(zns->if_table); rn; rn = route_next(rn)) { @@ -842,8 +841,7 @@ static int zvni_map_to_svi_ns(struct ns *ns, vl = (struct zebra_l2info_vlan *)&zif->l2info.vl; if (vl->vid == in_param->vid) { - if (p_ifp) - *p_ifp = tmp_if; + *p_ifp = tmp_if; return NS_WALK_STOP; } } @@ -2122,13 +2120,6 @@ static int zebra_vxlan_handle_vni_transition(struct zebra_vrf *zvrf, vni_t vni, return 0; zevpn = zebra_evpn_add(vni); - if (!zevpn) { - flog_err(EC_ZEBRA_VNI_ADD_FAILED, - "Adding L2-VNI - Failed to add VNI hash, VNI %u", - vni); - - return -1; - } /* Find bridge interface for the VNI */ vlan_if = zvni_map_to_svi(vxl->access_vlan, @@ -5169,16 +5160,8 @@ int zebra_vxlan_if_add(struct interface *ifp) /* Create or update EVPN hash. */ zevpn = zebra_evpn_lookup(vni); - if (!zevpn) { + if (!zevpn) zevpn = zebra_evpn_add(vni); - if (!zevpn) { - flog_err( - EC_ZEBRA_VNI_ADD_FAILED, - "Failed to add EVPN hash, IF %s(%u) VNI %u", - ifp->name, ifp->ifindex, vni); - return -1; - } - } if (zevpn->local_vtep_ip.s_addr != vxl->vtep_ip.s_addr || zevpn->mcast_grp.s_addr != vxl->mcast_grp.s_addr) { |