From 552f5626b30f94051a915f24b85c37042c26eadb Mon Sep 17 00:00:00 2001 From: Xiao Liang Date: Fri, 22 Oct 2021 15:45:33 +0800 Subject: [PATCH] zebra: Fix EVPN route nexthop config order EVPN route add should be queued to preserve the config order. In particular, against deletion in rib_delete(). Signed-off-by: Xiao Liang (cherry picked from commit 8244ba34aa479cbf32b48f0ffc7dbda16601fb77) --- zebra/zapi_msg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zebra/zapi_msg.c b/zebra/zapi_msg.c index b839d1d754..f9308b1aec 100644 --- a/zebra/zapi_msg.c +++ b/zebra/zapi_msg.c @@ -1590,7 +1590,7 @@ static struct nexthop *nexthop_from_zapi(const struct zapi_nexthop *api_nh, vtep_ip.ipa_type = IPADDR_V4; memcpy(&(vtep_ip.ipaddr_v4), &(api_nh->gate.ipv4), sizeof(struct in_addr)); - zebra_vxlan_evpn_vrf_route_add( + zebra_rib_queue_evpn_route_add( api_nh->vrf_id, &api_nh->rmac, &vtep_ip, p); } break; @@ -1623,7 +1623,7 @@ static struct nexthop *nexthop_from_zapi(const struct zapi_nexthop *api_nh, vtep_ip.ipa_type = IPADDR_V6; memcpy(&vtep_ip.ipaddr_v6, &(api_nh->gate.ipv6), sizeof(struct in6_addr)); - zebra_vxlan_evpn_vrf_route_add( + zebra_rib_queue_evpn_route_add( api_nh->vrf_id, &api_nh->rmac, &vtep_ip, p); } break; -- 2.39.5