From aa1ce2dc70dee20345fb0e0b7f7618b56a738d3c Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Wed, 15 Mar 2017 15:15:40 -0400 Subject: [PATCH] zebra: Fix usage of HAVE_CUMULUS The function zebra_mpls_lsp_label_consistent needs to be wrappered by HAVE_CUMULUS Signed-off-by: Donald Sharp --- zebra/zebra_mpls_null.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/zebra/zebra_mpls_null.c b/zebra/zebra_mpls_null.c index 6b0a91de02..0b4d670fda 100644 --- a/zebra/zebra_mpls_null.c +++ b/zebra/zebra_mpls_null.c @@ -98,6 +98,7 @@ zebra_mpls_write_lsp_config (struct vty *vty, struct zebra_vrf *zvrf) return 0; } +#ifdef HAVE_CUMULUS int zebra_mpls_lsp_label_consistent (struct zebra_vrf *zvrf, mpls_label_t in_label, mpls_label_t out_label, enum nexthop_types_t gtype, @@ -105,6 +106,7 @@ zebra_mpls_lsp_label_consistent (struct zebra_vrf *zvrf, mpls_label_t in_label, { return 0; } +#endif int zebra_mpls_static_lsp_add (struct zebra_vrf *zvrf, mpls_label_t in_label, -- 2.39.5