X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Finterface_cli.c;h=c9f11546b319359845ffaadc8fdd24b3b13150c5;hb=f0ca1e8d92114582ec9142bd15a40f1eb0102793;hp=55433fe83141c74167c093ccbdbd9e0e03ae244b;hpb=47a3d9975fa3af7a7537b565d6511dadc0df61fb;p=vpp.git diff --git a/src/vnet/interface_cli.c b/src/vnet/interface_cli.c index 55433fe8314..c9f11546b31 100644 --- a/src/vnet/interface_cli.c +++ b/src/vnet/interface_cli.c @@ -112,8 +112,8 @@ show_or_clear_hw_interfaces (vlib_main_t * vm, /* Gather interfaces. */ if (vec_len (hw_if_indices) == 0) - pool_foreach (hi, im->hw_interfaces, - vec_add1 (hw_if_indices, hi - im->hw_interfaces)); + pool_foreach (hi, im->hw_interfaces) + vec_add1 (hw_if_indices, hi - im->hw_interfaces); if (verbose < 0) verbose = 1; /* default to verbose (except bond) */ @@ -139,12 +139,12 @@ show_or_clear_hw_interfaces (vlib_main_t * vm, hi, verbose); /* *INDENT-OFF* */ - clib_bitmap_foreach (hw_idx, hi->bond_info, - ({ + clib_bitmap_foreach (hw_idx, hi->bond_info) + { shi = vnet_get_hw_interface(vnm, hw_idx); vlib_cli_output (vm, "%U\n", format_vnet_hw_interface, vnm, shi, verbose); - })); + } /* *INDENT-ON* */ } } @@ -395,12 +395,12 @@ show_sw_interfaces (vlib_main_t * vm, vec_new (vnet_sw_interface_t, pool_elts (im->sw_interfaces)); _vec_len (sorted_sis) = 0; /* *INDENT-OFF* */ - pool_foreach (si, im->sw_interfaces, - ({ + pool_foreach (si, im->sw_interfaces) + { int visible = vnet_swif_is_api_visible (si); if (visible) - vec_add1 (sorted_sis, si[0]);} - )); + vec_add1 (sorted_sis, si[0]); + } /* *INDENT-ON* */ /* Sort by name. */ vec_sort_with_function (sorted_sis, sw_interface_name_compare); @@ -1207,12 +1207,12 @@ show_interface_sec_mac_addr_fn (vlib_main_t * vm, unformat_input_t * input, vec_new (vnet_sw_interface_t, pool_elts (im->sw_interfaces)); _vec_len (sorted_sis) = 0; /* *INDENT-OFF* */ - pool_foreach (si, im->sw_interfaces, - ({ + pool_foreach (si, im->sw_interfaces) + { int visible = vnet_swif_is_api_visible (si); if (visible) - vec_add1 (sorted_sis, si[0]);} - )); + vec_add1 (sorted_sis, si[0]); + } /* *INDENT-ON* */ /* Sort by name. */ vec_sort_with_function (sorted_sis, sw_interface_name_compare); @@ -1233,11 +1233,11 @@ show_interface_sec_mac_addr_fn (vlib_main_t * vm, unformat_input_t * input, if (ei && ei->secondary_addrs) { - mac_address_t *sec_addr; + ethernet_interface_address_t *sec_addr; vec_foreach (sec_addr, ei->secondary_addrs) { - vlib_cli_output (vm, " %U", format_mac_address_t, sec_addr); + vlib_cli_output (vm, " %U", format_mac_address_t, &sec_addr->mac); } } } @@ -1477,16 +1477,16 @@ VLIB_CLI_COMMAND (set_ip_directed_broadcast_command, static) = { static clib_error_t * set_hw_interface_rx_mode (vnet_main_t * vnm, u32 hw_if_index, - u32 queue_id, vnet_hw_interface_rx_mode mode) + u32 queue_id, vnet_hw_if_rx_mode mode) { vnet_hw_interface_t *hw = vnet_get_hw_interface (vnm, hw_if_index); vnet_device_class_t *dev_class = vnet_get_device_class (vnm, hw->dev_class_index); clib_error_t *error; - vnet_hw_interface_rx_mode old_mode; + vnet_hw_if_rx_mode old_mode; int rv; - if (mode == VNET_HW_INTERFACE_RX_MODE_DEFAULT) + if (mode == VNET_HW_IF_RX_MODE_DEFAULT) mode = hw->default_rx_mode; rv = vnet_hw_interface_get_rx_mode (vnm, hw_if_index, queue_id, &old_mode); @@ -1533,7 +1533,7 @@ set_hw_interface_rx_mode (vnet_main_t * vnm, u32 hw_if_index, clib_error_t * set_hw_interface_change_rx_mode (vnet_main_t * vnm, u32 hw_if_index, u8 queue_id_valid, u32 queue_id, - vnet_hw_interface_rx_mode mode) + vnet_hw_if_rx_mode mode) { clib_error_t *error = 0; vnet_hw_interface_t *hw; @@ -1566,7 +1566,7 @@ set_interface_rx_mode (vlib_main_t * vm, unformat_input_t * input, vnet_main_t *vnm = vnet_get_main (); u32 hw_if_index = (u32) ~ 0; u32 queue_id = (u32) ~ 0; - vnet_hw_interface_rx_mode mode = VNET_HW_INTERFACE_RX_MODE_UNKNOWN; + vnet_hw_if_rx_mode mode = VNET_HW_IF_RX_MODE_UNKNOWN; u8 queue_id_valid = 0; if (!unformat_user (input, unformat_line_input, line_input)) @@ -1580,11 +1580,11 @@ set_interface_rx_mode (vlib_main_t * vm, unformat_input_t * input, else if (unformat (line_input, "queue %d", &queue_id)) queue_id_valid = 1; else if (unformat (line_input, "polling")) - mode = VNET_HW_INTERFACE_RX_MODE_POLLING; + mode = VNET_HW_IF_RX_MODE_POLLING; else if (unformat (line_input, "interrupt")) - mode = VNET_HW_INTERFACE_RX_MODE_INTERRUPT; + mode = VNET_HW_IF_RX_MODE_INTERRUPT; else if (unformat (line_input, "adaptive")) - mode = VNET_HW_INTERFACE_RX_MODE_ADAPTIVE; + mode = VNET_HW_IF_RX_MODE_ADAPTIVE; else { error = clib_error_return (0, "parse error: '%U'", @@ -1599,7 +1599,7 @@ set_interface_rx_mode (vlib_main_t * vm, unformat_input_t * input, if (hw_if_index == (u32) ~ 0) return clib_error_return (0, "please specify valid interface name"); - if (mode == VNET_HW_INTERFACE_RX_MODE_UNKNOWN) + if (mode == VNET_HW_IF_RX_MODE_UNKNOWN) return clib_error_return (0, "please specify valid rx-mode"); error = set_hw_interface_change_rx_mode (vnm, hw_if_index, queue_id_valid, @@ -1663,8 +1663,8 @@ show_interface_rx_placement_fn (vlib_main_t * vm, unformat_input_t * input, /* *INDENT-OFF* */ foreach_vlib_main (({ - clib_bitmap_foreach (si, pn->sibling_bitmap, - ({ + clib_bitmap_foreach (si, pn->sibling_bitmap) + { rt = vlib_node_get_runtime_data (this_vlib_main, si); if (vec_len (rt->devices_and_queues)) @@ -1677,9 +1677,9 @@ show_interface_rx_placement_fn (vlib_main_t * vm, unformat_input_t * input, s = format (s, " %U queue %u (%U)\n", format_vnet_sw_if_index_name, vnm, hi->sw_if_index, dq->queue_id, - format_vnet_hw_interface_rx_mode, dq->mode); + format_vnet_hw_if_rx_mode, dq->mode); } - })); + } if (vec_len (s) > 0) { vlib_cli_output(vm, "Thread %u (%s):\n%v", index, @@ -1734,7 +1734,7 @@ set_hw_interface_rx_placement (u32 hw_if_index, u32 queue_id, vnet_main_t *vnm = vnet_get_main (); vnet_device_main_t *vdm = &vnet_device_main; clib_error_t *error = 0; - vnet_hw_interface_rx_mode mode = VNET_HW_INTERFACE_RX_MODE_UNKNOWN; + vnet_hw_if_rx_mode mode = VNET_HW_IF_RX_MODE_UNKNOWN; int rv; if (is_main)