From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Wed, 15 Mar 2017 19:15:40 +0000 (-0400)
Subject: zebra: Fix usage of HAVE_CUMULUS
X-Git-Tag: reindent-master-before~213^2~14
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=aa1ce2dc70dee20345fb0e0b7f7618b56a738d3c;p=matthieu%2Ffrr.git

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 <sharpd@cumulusnetworks.com>
---

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,