From 371298399e62e4101aaf88c503834be6ec21c1ba Mon Sep 17 00:00:00 2001 From: Stephen Worley Date: Wed, 16 Nov 2022 13:15:32 -0500 Subject: [PATCH] zebra: account for non-evpn ecmp Account for non-evpn nexthops in ecmp groups when doing the DVNI check. Signed-off-by: Stephen Worley --- zebra/zebra_nhg.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/zebra/zebra_nhg.c b/zebra/zebra_nhg.c index d0d3c38a22fb..194609b01260 100644 --- a/zebra/zebra_nhg.c +++ b/zebra/zebra_nhg.c @@ -2771,6 +2771,10 @@ static bool nexthop_list_set_evpn_dvni(struct route_entry *re, re_vrf_vni = get_l3vni_vni(re->vrf_id); for (; nexthop; nexthop = nexthop->next) { + if (!nexthop->nh_label || + nexthop->nh_label_type != ZEBRA_LSP_EVPN) + continue; + nh_vni = label2vni(&nexthop->nh_label->label[0]); if (nh_vni != re_vrf_vni)