From 582bb29ac724f46af35516ecfee6cf11a69e3f7a Mon Sep 17 00:00:00 2001 From: Stephen Worley Date: Fri, 4 Jun 2021 11:50:40 -0400 Subject: [PATCH] zebra: dont install implicit NULL labels non-vni Don't install implict NULL labels with non-vni label'd routes. This returns behavior to how it was before adding the DVNI code. Ticket: #2677036 Testing Done: precommit, manual Signed-off-by: Stephen Worley --- zebra/rt_netlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zebra/rt_netlink.c b/zebra/rt_netlink.c index 390c78b7ac..31f35a92ad 100644 --- a/zebra/rt_netlink.c +++ b/zebra/rt_netlink.c @@ -1333,7 +1333,7 @@ static int build_label_stack(struct mpls_label_stack *nh_label, int num_labels = 0; for (int i = 0; nh_label && i < nh_label->num_labels; i++) { - if (nh_label_type == ZEBRA_LSP_EVPN + if (nh_label_type != ZEBRA_LSP_EVPN && nh_label->label[i] == MPLS_LABEL_IMPLICIT_NULL) continue;