Remove unused argument to vlib_feature_next

[vpp.git] / src / plugins / ila / ila.c

diff --git a/src/plugins/ila/ila.c b/src/plugins/ila/ila.c
index e0f3907..9313872 100644 (file)
--- a/src/plugins/ila/ila.c
+++ b/src/plugins/ila/ila.c
@@ -517,8 +517,8 @@ ila_sir2ila (vlib_main_t * vm,
          ip61->dst_address.as_u64[0] = ila_address1->as_u64[0];
          ip61->dst_address.as_u64[1] = ila_address1->as_u64[1];
 
-         vnet_feature_next (vnet_buffer (p0)->sw_if_index[VLIB_RX], &next0, p0);
-         vnet_feature_next (vnet_buffer (p1)->sw_if_index[VLIB_RX], &next1, p1);
+         vnet_feature_next (&next0, p0);
+         vnet_feature_next (&next1, p1);
 
          vlib_validate_buffer_enqueue_x2 (vm, node, next_index, to_next,
                                           n_left_to_next, pi0, pi1, next0,
@@ -569,7 +569,7 @@ ila_sir2ila (vlib_main_t * vm,
          ip60->dst_address.as_u64[0] = ila_address0->as_u64[0];
          ip60->dst_address.as_u64[1] = ila_address0->as_u64[1];
 
-         vnet_feature_next (vnet_buffer (p0)->sw_if_index[VLIB_RX], &next0, p0);
+         vnet_feature_next (&next0, p0);
 
          vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
                                           n_left_to_next, pi0, next0);
@@ -736,8 +736,7 @@ ila_add_del_entry (ila_add_del_entry_args_t * args)
              fib_table_entry_special_add(0,
                                          &next_hop,
                                          FIB_SOURCE_RR,
-                                         FIB_ENTRY_FLAG_NONE,
-                                         ADJ_INDEX_INVALID);
+                                         FIB_ENTRY_FLAG_NONE);
          e->next_hop_child_index =
              fib_entry_child_add(e->next_hop_fib_entry_index,
                                  ila_fib_node_type,
@@ -825,6 +824,7 @@ ila_interface (u32 sw_if_index, u8 disable)
 /* *INDENT-OFF* */
 VLIB_PLUGIN_REGISTER () = {
     .version = VPP_BUILD_VER,
+    .description = "Identifier-locator addressing for IPv6",
 };
 /* *INDENT-ON* */
 
@@ -949,6 +949,7 @@ ila_entry_command_fn (vlib_main_t * vm,
   ila_add_del_entry_args_t args = { 0 };
   u8 next_hop_set = 0;
   int ret;
+  clib_error_t *error = 0;
 
   args.type = ILA_TYPE_IID;
   args.csum_mode = ILA_CSUM_MODE_NO_ACTION;
@@ -986,19 +987,29 @@ ila_entry_command_fn (vlib_main_t * vm,
       else if (unformat (line_input, "del"))
        args.is_del = 1;
       else
-       return clib_error_return (0, "parse error: '%U'",
-                                 format_unformat_error, line_input);
+       {
+         error = clib_error_return (0, "parse error: '%U'",
+                                    format_unformat_error, line_input);
+         goto done;
+       }
     }
 
-  unformat_free (line_input);
-
   if (!next_hop_set)
-      return clib_error_return (0, "Specified a next hop");
+    {
+      error = clib_error_return (0, "Specified a next hop");
+      goto done;
+    }
 
   if ((ret = ila_add_del_entry (&args)))
-    return clib_error_return (0, "ila_add_del_entry returned error %d", ret);
+    {
+      error = clib_error_return (0, "ila_add_del_entry returned error %d", ret);
+      goto done;
+    }
 
-  return NULL;
+done:
+  unformat_free (line_input);
+
+  return error;
 }
 
 VLIB_CLI_COMMAND (ila_entry_command, static) =