X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fmpls%2Fmpls.c;h=4076a8980a9a286e9551c60c3bce9cfc01f891be;hb=9db6ada779794779158163f6293b479ae7f6ad5e;hp=be72d3f829f7bf374becfd2cff9d0b2e95b242b5;hpb=31ed74407643595fdce206e9d7487108fb8b33ab;p=vpp.git

diff --git a/src/vnet/mpls/mpls.c b/src/vnet/mpls/mpls.c
index be72d3f829f..4076a8980a9 100644
--- a/src/vnet/mpls/mpls.c
+++ b/src/vnet/mpls/mpls.c
@@ -228,7 +228,7 @@ vnet_mpls_local_label (vlib_main_t * vm,
   eos = MPLS_EOS;
   is_del = 0;
   local_label = MPLS_LABEL_INVALID;
-  memset(&pfx, 0, sizeof(pfx));
+  clib_memset(&pfx, 0, sizeof(pfx));
   payload_proto = DPO_PROTO_MPLS;
 
    /* Get a line of input. */
@@ -274,7 +274,7 @@ vnet_mpls_local_label (vlib_main_t * vm,
 	;
       else
       {
-          error = clib_error_return (0, "unkown input: %U",
+          error = clib_error_return (0, "unknown input: %U",
                                      format_unformat_error, line_input);
           goto done;
       }
@@ -312,7 +312,6 @@ vnet_mpls_local_label (vlib_main_t * vm,
   else
   {
       fib_node_index_t fib_index;
-      u32 fi;
 
       if (NULL == rpaths)
       {
@@ -325,24 +324,6 @@ vnet_mpls_local_label (vlib_main_t * vm,
       pfx.fp_label = local_label;
       pfx.fp_payload_proto = rpaths[0].frp_proto;
 
-      /*
-       * the CLI parsing stored table Ids, swap to FIB indicies
-       */
-      if (FIB_NODE_INDEX_INVALID == rpath.frp_sw_if_index)
-      {
-	  fi = fib_table_find(dpo_proto_to_fib(pfx.fp_payload_proto),
-                              rpaths[0].frp_fib_index);
-
-	  if (~0 == fi)
-	  {
-	      error = clib_error_return(0 , "%U Via table %d does not exist",
-					format_dpo_proto, pfx.fp_payload_proto,
-					rpaths[0].frp_fib_index);
-	      goto done;
-	  }
-	  rpaths[0].frp_fib_index = fi;
-      }
-
       fib_index = mpls_fib_index_from_table_id(table_id);
 
       if (FIB_NODE_INDEX_INVALID == fib_index)
@@ -462,13 +443,6 @@ VLIB_CLI_COMMAND (mpls_table_command, static) = {
   .is_mp_safe = 1,
 };
 
-int
-mpls_fib_reset_labels (u32 fib_id)
-{
-  // FIXME
-  return 0;
-}
-
 static clib_error_t *
 mpls_init (vlib_main_t * vm)
 {