From: Neale Ranns <nranns@cisco.com>
Date: Wed, 9 Aug 2017 12:43:35 +0000 (-0700)
Subject: MPLS tunnel - multiple labels on the CLI - fix cut and paste robot errors
X-Git-Tag: v17.10-rc1~263
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=9104a40aeb655982ed4eb0daf048a51902428813;p=vpp.git

MPLS tunnel - multiple labels on the CLI - fix cut and paste robot errors

Change-Id: I675af62d9c0c9cf2e340bf19e902695861d4e4b5
Signed-off-by: Neale Ranns <nranns@cisco.com>
---

diff --git a/src/vnet/mpls/mpls_tunnel.c b/src/vnet/mpls/mpls_tunnel.c
index 5211c926055..2d5521f447a 100644
--- a/src/vnet/mpls/mpls_tunnel.c
+++ b/src/vnet/mpls/mpls_tunnel.c
@@ -802,20 +802,11 @@ vnet_create_mpls_tunnel_command_fn (vlib_main_t * vm,
             is_del = 0;
         else if (unformat (line_input, "out-labels"))
 	{
-            if (vec_len (rpaths) == 0)
-	    {
-                error = clib_error_return (0, "Paths then labels");
-                goto done;
-            }
-            else
+            while (unformat (line_input, "%U",
+                             unformat_mpls_unicast_label,
+                             &out_label))
             {
-                while (unformat (line_input, "%U",
-                                 unformat_mpls_unicast_label,
-                                 &out_label))
-                {
-                    vec_add1 (rpaths[vec_len (rpaths) - 1].frp_label_stack,
-                              out_label);
-                }
+                vec_add1 (rpath.frp_label_stack, out_label);
             }
 	}
         else if (unformat (line_input, "via %U %U",