]> git.puffer.fish Git - matthieu/frr.git/commitdiff
zebra: Fix usage of HAVE_CUMULUS
authorDonald Sharp <sharpd@cumulusnetworks.com>
Wed, 15 Mar 2017 19:15:40 +0000 (15:15 -0400)
committerDonald Sharp <sharpd@cumulusnetworks.com>
Thu, 6 Apr 2017 14:32:08 +0000 (10:32 -0400)
The function zebra_mpls_lsp_label_consistent needs
to be wrappered by HAVE_CUMULUS

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
zebra/zebra_mpls_null.c

index 6b0a91de029ae50e7e25641a1a6722a63687f846..0b4d670fdadfdcaff714f892966efcc3b254c84f 100644 (file)
@@ -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,