diff options
author | Damjan Marion <damarion@cisco.com> | 2024-03-12 17:42:49 +0100 |
---|---|---|
committer | Florin Coras <florin.coras@gmail.com> | 2024-03-12 19:29:56 +0000 |
commit | c3148b1be8f519c80c4417c21b978dfef72b351b (patch) | |
tree | 2511eb86e5c429ab018716fed0366164e6faf679 /src/vnet/ethernet | |
parent | e2ed59933153d665ee43add2de03a581627b73fa (diff) |
misc: remove GNU Indent directives
Type: refactor
Change-Id: I5235bf3e9aff58af6ba2c14e8c6529c4fc9ec86c
Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'src/vnet/ethernet')
-rw-r--r-- | src/vnet/ethernet/arp_packet.h | 2 | ||||
-rw-r--r-- | src/vnet/ethernet/init.c | 4 | ||||
-rw-r--r-- | src/vnet/ethernet/interface.c | 14 | ||||
-rw-r--r-- | src/vnet/ethernet/mac_address.c | 2 | ||||
-rw-r--r-- | src/vnet/ethernet/node.c | 2 | ||||
-rw-r--r-- | src/vnet/ethernet/p2p_ethernet_api.c | 2 | ||||
-rw-r--r-- | src/vnet/ethernet/p2p_ethernet_input.c | 2 | ||||
-rw-r--r-- | src/vnet/ethernet/packet.h | 2 |
8 files changed, 0 insertions, 30 deletions
diff --git a/src/vnet/ethernet/arp_packet.h b/src/vnet/ethernet/arp_packet.h index c406dade6e2..9a9df680853 100644 --- a/src/vnet/ethernet/arp_packet.h +++ b/src/vnet/ethernet/arp_packet.h @@ -110,12 +110,10 @@ typedef enum IP4_ARP_N_NEXT, } ip4_arp_next_t; -/* *INDENT-OFF* */ typedef CLIB_PACKED (struct { mac_address_t mac; ip4_address_t ip4; }) ethernet_arp_ip4_over_ethernet_address_t; -/* *INDENT-ON* */ STATIC_ASSERT (sizeof (ethernet_arp_ip4_over_ethernet_address_t) == 10, "Packet ethernet address and IP4 address too big"); diff --git a/src/vnet/ethernet/init.c b/src/vnet/ethernet/init.c index f78b65c7cc0..3921e1ec0e6 100644 --- a/src/vnet/ethernet/init.c +++ b/src/vnet/ethernet/init.c @@ -62,7 +62,6 @@ add_type (ethernet_main_t * em, ethernet_type_t type, char *type_name) } /* Built-in ip4 tx feature path definition */ -/* *INDENT-OFF* */ VNET_FEATURE_ARC_INIT (ethernet_output, static) = { .arc_name = "ethernet-output", @@ -77,7 +76,6 @@ VNET_FEATURE_INIT (ethernet_tx_drop, static) = .node_name = "error-drop", .runs_before = 0, /* not before any other features */ }; -/* *INDENT-ON* */ static clib_error_t * ethernet_init (vlib_main_t * vm) @@ -107,7 +105,6 @@ ethernet_init (vlib_main_t * vm) return 0; } -/* *INDENT-OFF* */ VLIB_INIT_FUNCTION (ethernet_init) = { /* @@ -119,7 +116,6 @@ VLIB_INIT_FUNCTION (ethernet_init) = "llc_init", "vnet_feature_init"), }; -/* *INDENT-ON* */ ethernet_main_t * ethernet_get_main (vlib_main_t * vm) diff --git a/src/vnet/ethernet/interface.c b/src/vnet/ethernet/interface.c index 849024238bd..f1bb6b81070 100644 --- a/src/vnet/ethernet/interface.c +++ b/src/vnet/ethernet/interface.c @@ -334,7 +334,6 @@ ethernet_set_max_frame_size (vnet_main_t *vnm, vnet_hw_interface_t *hi, "underlying driver doesn't support changing Max Frame Size"); } -/* *INDENT-OFF* */ VNET_HW_INTERFACE_CLASS (ethernet_hw_interface_class) = { .name = "Ethernet", .tx_hash_fn_type = VNET_HASH_FN_TYPE_ETHERNET, @@ -347,7 +346,6 @@ VNET_HW_INTERFACE_CLASS (ethernet_hw_interface_class) = { .mac_addr_change_function = ethernet_mac_change, .set_max_frame_size = ethernet_set_max_frame_size, }; -/* *INDENT-ON* */ uword unformat_ethernet_interface (unformat_input_t * input, va_list * args) @@ -760,7 +758,6 @@ simulated_ethernet_mac_change (vnet_hw_interface_t * hi, } -/* *INDENT-OFF* */ VNET_DEVICE_CLASS (ethernet_simulated_device_class) = { .name = "Loopback", .format_device_name = format_simulated_ethernet_name, @@ -768,7 +765,6 @@ VNET_DEVICE_CLASS (ethernet_simulated_device_class) = { .admin_up_down_function = simulated_ethernet_admin_up_down, .mac_addr_change_function = simulated_ethernet_mac_change, }; -/* *INDENT-ON* */ /* * Maintain a bitmap of allocated loopback instance numbers. @@ -957,13 +953,11 @@ create_simulated_ethernet_interfaces (vlib_main_t * vm, * Example of how to create a loopback interface: * @cliexcmd{loopback create-interface} ?*/ -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (create_simulated_ethernet_interface_command, static) = { .path = "loopback create-interface", .short_help = "loopback create-interface [mac <mac-addr>] [instance <instance>]", .function = create_simulated_ethernet_interfaces, }; -/* *INDENT-ON* */ /*? * Create a loopback interface. Optionally, a MAC Address can be @@ -976,13 +970,11 @@ VLIB_CLI_COMMAND (create_simulated_ethernet_interface_command, static) = { * Example of how to create a loopback interface: * @cliexcmd{create loopback interface} ?*/ -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (create_loopback_interface_command, static) = { .path = "create loopback interface", .short_help = "create loopback interface [mac <mac-addr>] [instance <instance>]", .function = create_simulated_ethernet_interfaces, }; -/* *INDENT-ON* */ ethernet_interface_t * ethernet_get_interface (ethernet_main_t * em, u32 hw_if_index) @@ -1193,13 +1185,11 @@ delete_sub_interface (vlib_main_t * vm, * Example of how to delete a loopback interface: * @cliexcmd{loopback delete-interface intfc loop0} ?*/ -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (delete_simulated_ethernet_interface_command, static) = { .path = "loopback delete-interface", .short_help = "loopback delete-interface intfc <interface>", .function = delete_simulated_ethernet_interfaces, }; -/* *INDENT-ON* */ /*? * Delete a loopback interface. @@ -1211,13 +1201,11 @@ VLIB_CLI_COMMAND (delete_simulated_ethernet_interface_command, static) = { * Example of how to delete a loopback interface: * @cliexcmd{delete loopback interface intfc loop0} ?*/ -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (delete_loopback_interface_command, static) = { .path = "delete loopback interface", .short_help = "delete loopback interface intfc <interface>", .function = delete_simulated_ethernet_interfaces, }; -/* *INDENT-ON* */ /*? * Delete a sub-interface. @@ -1226,13 +1214,11 @@ VLIB_CLI_COMMAND (delete_loopback_interface_command, static) = { * Example of how to delete a sub-interface: * @cliexcmd{delete sub-interface GigabitEthernet0/8/0.200} ?*/ -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (delete_sub_interface_command, static) = { .path = "delete sub-interface", .short_help = "delete sub-interface <interface>", .function = delete_sub_interface, }; -/* *INDENT-ON* */ /* ethernet { ... } configuration. */ /*? diff --git a/src/vnet/ethernet/mac_address.c b/src/vnet/ethernet/mac_address.c index 2237c3772b8..098b3ce19c1 100644 --- a/src/vnet/ethernet/mac_address.c +++ b/src/vnet/ethernet/mac_address.c @@ -15,13 +15,11 @@ #include <vnet/ethernet/mac_address.h> -/* *INDENT-OFF* */ const mac_address_t ZERO_MAC_ADDRESS = { .bytes = { 0, 0, 0, 0, 0, 0, }, }; -/* *INDENT-ON* */ u8 * format_mac_address_t (u8 * s, va_list * args) diff --git a/src/vnet/ethernet/node.c b/src/vnet/ethernet/node.c index 4ef575a85fc..e2558eeca41 100644 --- a/src/vnet/ethernet/node.c +++ b/src/vnet/ethernet/node.c @@ -2098,7 +2098,6 @@ static char *ethernet_error_strings[] = { #undef ethernet_error }; -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (ethernet_input_node) = { .name = "ethernet-input", /* Takes a vector of packets. */ @@ -2140,7 +2139,6 @@ VLIB_REGISTER_NODE (ethernet_input_not_l2_node) = { #undef _ }, }; -/* *INDENT-ON* */ #ifndef CLIB_MARCH_VARIANT void diff --git a/src/vnet/ethernet/p2p_ethernet_api.c b/src/vnet/ethernet/p2p_ethernet_api.c index a9a8cc0a444..903678ce445 100644 --- a/src/vnet/ethernet/p2p_ethernet_api.c +++ b/src/vnet/ethernet/p2p_ethernet_api.c @@ -58,14 +58,12 @@ vl_api_p2p_ethernet_add_t_handler (vl_api_p2p_ethernet_add_t * mp) BAD_SW_IF_INDEX_LABEL; - /* *INDENT-OFF* */ REPLY_MACRO2(VL_API_P2P_ETHERNET_ADD_REPLY, ({ rmp->sw_if_index = htonl(p2pe_if_index); })); - /* *INDENT-ON* */ } void diff --git a/src/vnet/ethernet/p2p_ethernet_input.c b/src/vnet/ethernet/p2p_ethernet_input.c index 3e9589e0e19..3d81e99cff2 100644 --- a/src/vnet/ethernet/p2p_ethernet_input.c +++ b/src/vnet/ethernet/p2p_ethernet_input.c @@ -235,7 +235,6 @@ VLIB_NODE_FN (p2p_ethernet_input_node) (vlib_main_t * vm, return frame->n_vectors; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (p2p_ethernet_input_node) = { .name = "p2p-ethernet-input", .vector_size = sizeof (u32), @@ -253,7 +252,6 @@ VLIB_REGISTER_NODE (p2p_ethernet_input_node) = { [0] = "error-drop", }, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/vnet/ethernet/packet.h b/src/vnet/ethernet/packet.h index e1e42badd06..007f93596f3 100644 --- a/src/vnet/ethernet/packet.h +++ b/src/vnet/ethernet/packet.h @@ -184,7 +184,6 @@ typedef struct #define ETHERNET_N_PBB (1 << 24) } ethernet_pbb_header_t; -/* *INDENT-OFF* */ typedef CLIB_PACKED (struct { /* Backbone source/destination address. */ @@ -201,7 +200,6 @@ typedef CLIB_PACKED (struct /* 3 bit priority, 1 bit DEI, 1 bit UCA, 3 bit RES and 24 bit I_SID (service identifier) */ u32 priority_dei_uca_res_sid; }) ethernet_pbb_header_packed_t; -/* *INDENT-ON* */ #endif /* included_ethernet_packet_h */ |