From cc83907475a21327e89da60532f0490619a9f07e Mon Sep 17 00:00:00 2001 From: Ameya Dharkar Date: Fri, 9 Aug 2019 15:21:27 -0700 Subject: [PATCH] Zebra: Incorrect L3VNI for FPM rtmsg for EVPN RT-5 prefix We used the vrf_id in the rtm_table field of the netlink rtmsg to fetch L3VNI. But, now we program table_id to rtm_table field instead of vrf_id. Thus, L3VNI fetched using rtm_table is incorrect. Instead, use nexthop->vrf_id to fetch the L3VNI. Signed-off-by: Ameya Dharkar --- zebra/zebra_fpm_netlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zebra/zebra_fpm_netlink.c b/zebra/zebra_fpm_netlink.c index 822def318a..f347d3955c 100644 --- a/zebra/zebra_fpm_netlink.c +++ b/zebra/zebra_fpm_netlink.c @@ -238,7 +238,7 @@ static int netlink_route_info_add_nh(netlink_route_info_t *ri, if (re && CHECK_FLAG(re->flags, ZEBRA_FLAG_EVPN_ROUTE)) { nhi.encap_info.encap_type = FPM_NH_ENCAP_VXLAN; - zl3vni = zl3vni_from_vrf(ri->rtm_table); + zl3vni = zl3vni_from_vrf(nexthop->vrf_id); if (zl3vni && is_l3vni_oper_up(zl3vni)) { /* Add VNI to VxLAN encap info */