diff options
| -rw-r--r-- | src/vat/api_format.c | 43 | ||||
| -rw-r--r-- | src/vnet/gso/gso_api.c | 48 | ||||
| -rw-r--r-- | src/vnet/vnet_all_api_h.h | 1 |
3 files changed, 6 insertions, 86 deletions
diff --git a/src/vat/api_format.c b/src/vat/api_format.c index 3e5c29412a7..7b2681bbbd1 100644 --- a/src/vat/api_format.c +++ b/src/vat/api_format.c @@ -2864,7 +2864,6 @@ _(delete_subif_reply) \ _(l2_interface_pbb_tag_rewrite_reply) \ _(set_punt_reply) \ _(feature_enable_disable_reply) \ -_(feature_gso_enable_disable_reply) \ _(sw_interface_tag_add_del_reply) \ _(sw_interface_add_del_mac_address_reply) \ _(hw_interface_set_mtu_reply) \ @@ -3046,7 +3045,6 @@ _(SET_PUNT_REPLY, set_punt_reply) \ _(IP_TABLE_DETAILS, ip_table_details) \ _(IP_ROUTE_DETAILS, ip_route_details) \ _(FEATURE_ENABLE_DISABLE_REPLY, feature_enable_disable_reply) \ -_(FEATURE_GSO_ENABLE_DISABLE_REPLY, feature_gso_enable_disable_reply) \ _(SW_INTERFACE_TAG_ADD_DEL_REPLY, sw_interface_tag_add_del_reply) \ _(SW_INTERFACE_ADD_DEL_MAC_ADDRESS_REPLY, sw_interface_add_del_mac_address_reply) \ _(L2_XCONNECT_DETAILS, l2_xconnect_details) \ @@ -11426,45 +11424,6 @@ api_feature_enable_disable (vat_main_t * vam) } static int -api_feature_gso_enable_disable (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_feature_gso_enable_disable_t *mp; - u32 sw_if_index = ~0; - u8 enable = 1; - int ret; - - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) - ; - else if (unformat (i, "sw_if_index %d", &sw_if_index)) - ; - else if (unformat (i, "enable")) - enable = 1; - else if (unformat (i, "disable")) - enable = 0; - else - break; - } - - if (sw_if_index == ~0) - { - errmsg ("missing interface name or sw_if_index"); - return -99; - } - - /* Construct the API message */ - M (FEATURE_GSO_ENABLE_DISABLE, mp); - mp->sw_if_index = ntohl (sw_if_index); - mp->enable_disable = enable; - - S (mp); - W (ret); - return ret; -} - -static int api_sw_interface_tag_add_del (vat_main_t * vam) { unformat_input_t *i = vam->input; @@ -12994,8 +12953,6 @@ _(ip_mtable_dump, "") \ _(ip_mroute_dump, "table-id [ip4|ip6]") \ _(feature_enable_disable, "arc_name <arc_name> " \ "feature_name <feature_name> <intfc> | sw_if_index <nn> [disable]") \ -_(feature_gso_enable_disable, "<intfc> | sw_if_index <nn> " \ - "[enable | disable] ") \ _(sw_interface_tag_add_del, "<intfc> | sw_if_index <nn> tag <text>" \ "[disable]") \ _(sw_interface_add_del_mac_address, "<intfc> | sw_if_index <nn> " \ diff --git a/src/vnet/gso/gso_api.c b/src/vnet/gso/gso_api.c index d3426142f1c..588dabe20da 100644 --- a/src/vnet/gso/gso_api.c +++ b/src/vnet/gso/gso_api.c @@ -21,27 +21,13 @@ #include <vlibmemory/api.h> #include <vnet/gso/gso.h> -#include <vnet/vnet_msg_enum.h> - -#define vl_typedefs /* define message structures */ -#include <vnet/vnet_all_api_h.h> -#undef vl_typedefs - -#define vl_endianfun /* define message structures */ -#include <vnet/vnet_all_api_h.h> -#undef vl_endianfun - -/* instantiate all the print functions we know about */ -#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__) -#define vl_printfun -#include <vnet/vnet_all_api_h.h> -#undef vl_printfun +#include <vnet/format_fns.h> +#include <vnet/gso/gso.api_enum.h> +#include <vnet/gso/gso.api_types.h> +#define REPLY_MSG_ID_BASE gso_main.msg_id_base #include <vlibapi/api_helper_macros.h> -#define foreach_feature_gso_api_msg \ -_(FEATURE_GSO_ENABLE_DISABLE, feature_gso_enable_disable) - static void vl_api_feature_gso_enable_disable_t_handler (vl_api_feature_gso_enable_disable_t * mp) @@ -60,37 +46,15 @@ static void REPLY_MACRO (VL_API_FEATURE_GSO_ENABLE_DISABLE_REPLY); } -#define vl_msg_name_crc_list -#include <vnet/gso/gso.api.h> -#undef vl_msg_name_crc_list - -static void -setup_message_id_table (api_main_t * am) -{ -#define _(id,n,crc) vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id); - foreach_vl_msg_name_crc_gso; -#undef _ -} +#include <vnet/gso/gso.api.c> static clib_error_t * feature_gso_api_hookup (vlib_main_t * vm) { - api_main_t *am = vlibapi_get_main (); - -#define _(N,n) \ - vl_msg_api_set_handlers(VL_API_##N, #n, \ - vl_api_##n##_t_handler, \ - vl_noop_handler, \ - vl_api_##n##_t_endian, \ - vl_api_##n##_t_print, \ - sizeof(vl_api_##n##_t), 1); - foreach_feature_gso_api_msg; -#undef _ - /* * Set up the (msg_name, crc, message-id) table */ - setup_message_id_table (am); + gso_main.msg_id_base = setup_message_id_table (); return 0; } diff --git a/src/vnet/vnet_all_api_h.h b/src/vnet/vnet_all_api_h.h index 7f758dd1f17..d973b6f026e 100644 --- a/src/vnet/vnet_all_api_h.h +++ b/src/vnet/vnet_all_api_h.h @@ -59,7 +59,6 @@ #include <vnet/devices/pipe/pipe.api.h> #include <vnet/syslog/syslog.api.h> #include <vnet/devices/virtio/virtio.api.h> -#include <vnet/gso/gso.api.h> #include <vnet/flow/flow.api.h> /* |