summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@cumulusnetworks.com>2017-03-15 20:15:40 +0100
committerDonald Sharp <sharpd@cumulusnetworks.com>2017-04-06 16:32:08 +0200
commitaa1ce2dc70dee20345fb0e0b7f7618b56a738d3c (patch)
treee3aabfd1ffd4a96377b1463375625dd94050141a
parentbgpd: Fix iana_afi_t afi_t confusion (diff)
downloadfrr-aa1ce2dc70dee20345fb0e0b7f7618b56a738d3c.tar.xz
frr-aa1ce2dc70dee20345fb0e0b7f7618b56a738d3c.zip
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>
-rw-r--r--zebra/zebra_mpls_null.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/zebra/zebra_mpls_null.c b/zebra/zebra_mpls_null.c
index 6b0a91de0..0b4d670fd 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,