X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Finterface_cli.c;h=b15d283fe4918f4323de29d5cbc66c0d647a8464;hb=5d9df1db07969fea8f391bd48ba14cceb840da1e;hp=9271f5b78c5076eb4fd762cefb7be2cd12507f88;hpb=54f7c51fd5a1ea927a4df3a989f62afdf9d6c0c5;p=vpp.git diff --git a/src/vnet/interface_cli.c b/src/vnet/interface_cli.c index 9271f5b78c5..b15d283fe49 100644 --- a/src/vnet/interface_cli.c +++ b/src/vnet/interface_cli.c @@ -326,14 +326,15 @@ show_sw_interfaces (vlib_main_t * vm, /* intf input features are masked by bridge domain */ if (l2_input->bridge) fb &= l2input_bd_config (l2_input->bd_index)->feature_bitmap; - vlib_cli_output (vm, "\nl2-input:\n%U", format_l2_input_features, fb); + vlib_cli_output (vm, "\nl2-input:\n%U", format_l2_input_features, fb, + 1); l2_output_config_t *l2_output = l2output_intf_config (sw_if_index); vlib_cli_output (vm, "\nl2-output:"); if (l2_output->out_vtr_flag) vlib_cli_output (vm, "%10s (%s)", "VTR", "--internal--"); vlib_cli_output (vm, "%U", format_l2_output_features, - l2_output->feature_bitmap); + l2_output->feature_bitmap, 1); return 0; } if (show_tag) @@ -687,7 +688,7 @@ create_sub_interfaces (vlib_main_t * vm, goto done; } - memset (&template, 0, sizeof (template)); + clib_memset (&template, 0, sizeof (template)); template.sub.eth.raw_flags = 0; if (unformat (input, "%d default", &id_min)) @@ -814,14 +815,14 @@ done: * subinterfaces to handle a range of VLAN IDs. * * - create sub-interfaces dot1q|dot1ad |any [exact-match] - - * Use this command to specify the outer VLAN ID, to either be explicited or to make the + * Use this command to specify the outer VLAN ID, to either be explicit or to make the * VLAN ID different from the 'subId'. * * - create sub-interfaces dot1q|dot1ad |any inner-dot1q * |any [exact-match] - Use this command to specify the outer VLAN ID and - * the innner VLAN ID. + * the inner VLAN ID. * - * When 'dot1q' or 'dot1ad' is explictly entered, subinterfaces + * When 'dot1q' or 'dot1ad' is explicitly entered, subinterfaces * can be configured as either exact-match or non-exact match. Non-exact match is the CLI * default. If 'exact-match' is specified, packets must have the same number of * VLAN tags as the configuration. For non-exact-match, packets must at least that number @@ -964,7 +965,7 @@ set_unnumbered (vlib_main_t * vm, if (~0 == unnumbered_sw_if_index) return clib_error_return (0, "Specify the unnumbered interface"); if (enable && ~0 == inherit_from_sw_if_index) - return clib_error_return (0, "When enabling unnumberered specify the" + return clib_error_return (0, "When enabling unnumbered specify the" " IP enabled interface that it uses"); vnet_sw_interface_update_unnumbered (unnumbered_sw_if_index, @@ -1520,7 +1521,7 @@ show_interface_rx_placement_fn (vlib_main_t * vm, unformat_input_t * input, })); if (vec_len (s) > 0) { - vlib_cli_output(vm, "Thread %u (%v):\n%v", index, + vlib_cli_output(vm, "Thread %u (%s):\n%v", index, vlib_worker_threads[index].name, s); vec_reset_length (s); }