Merge remote-tracking branch 'frr/master' into pull-624

1 files changed, 6 insertions, 4 deletions

diff --git a/zebra/zebra_mpls.h b/zebra/zebra_mpls.h
index 1f17de67a3..52b947c064 100644
--- a/zebra/zebra_mpls.h
+++ b/zebra/zebra_mpls.h
@@ -43,6 +43,8 @@
   (((nhlfe)->nexthop->type == NEXTHOP_TYPE_IPV6 || \
     (nhlfe)->nexthop->type == NEXTHOP_TYPE_IPV6_IFINDEX) ? AF_INET6 : AF_INET)
 
+#define MPLS_LABEL_HELPSTR "Specify label(s) for this route\nOne or more " \
+                           "labels in the range (16-1048575) separated by '/'\n"
 
 /* Typedefs */
 
@@ -208,13 +210,13 @@ zebra_mpls_write_label_block_config (struct vty *vty, struct zebra_vrf *vrf);
  * Install dynamic LSP entry.
  */
 int
-zebra_mpls_lsp_install (struct zebra_vrf *zvrf, struct route_node *rn, struct rib *rib);
+zebra_mpls_lsp_install (struct zebra_vrf *zvrf, struct route_node *rn, struct route_entry *re);
 
 /*
  * Uninstall dynamic LSP entry, if any. 
  */
 int
-zebra_mpls_lsp_uninstall (struct zebra_vrf *zvrf, struct route_node *rn, struct rib *rib);
+zebra_mpls_lsp_uninstall (struct zebra_vrf *zvrf, struct route_node *rn, struct route_entry *re);
 
 /*
  * Registration from a client for the label binding for a FEC. If a binding
@@ -449,9 +451,9 @@ lsp_distance (enum lsp_types_t type)
  * are converted into LSPs.
  */
 static inline enum lsp_types_t
-lsp_type_from_rib_type (int rib_type)
+lsp_type_from_re_type (int re_type)
 {
-  switch (rib_type)
+  switch (re_type)
     {
       case ZEBRA_ROUTE_STATIC:
         return ZEBRA_LSP_STATIC;