diff options
Diffstat (limited to 'vnet/vnet/ethernet')
| -rw-r--r-- | vnet/vnet/ethernet/arp.c | 28 | ||||
| -rw-r--r-- | vnet/vnet/ethernet/ethernet.h | 6 | ||||
| -rw-r--r-- | vnet/vnet/ethernet/init.c | 2 | ||||
| -rw-r--r-- | vnet/vnet/ethernet/interface.c | 4 | ||||
| -rw-r--r-- | vnet/vnet/ethernet/mac_swap.c | 8 | ||||
| -rw-r--r-- | vnet/vnet/ethernet/node.c | 14 |
6 files changed, 31 insertions, 31 deletions
diff --git a/vnet/vnet/ethernet/arp.c b/vnet/vnet/ethernet/arp.c index 1346d605ea8..c0b06e0f7b1 100644 --- a/vnet/vnet/ethernet/arp.c +++ b/vnet/vnet/ethernet/arp.c @@ -512,7 +512,7 @@ vnet_arp_set_ip4_over_ethernet_internal (vnet_main_t * vnm, if (fp) rv = (*fp) (mc->data, a->ethernet, sw_if_index, 0); - /* + /* * Signal the resolver process, as long as the user * says they want to be notified */ @@ -1095,9 +1095,9 @@ arp_input (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame) proxy_src.as_u32 = arp0->ip4_over_ethernet[1].ip4.data_u32; - /* + /* * Rewind buffer, direct code above not to - * think too hard about it. + * think too hard about it. * $$$ is the answer ever anything other than * vlib_buffer_reset(..)? */ @@ -1476,16 +1476,16 @@ vnet_arp_unset_ip4_over_ethernet_internal (vnet_main_t * vnm, memset (&args, 0, sizeof (args)); - /* + /* * Make sure that the route actually exists before we try to delete it, * and make sure that it's a rewrite adjacency. * - * If we point 1-N unnumbered interfaces at a loopback interface and - * shut down the loopback before shutting down 1-N unnumbered - * interfaces, the ARP cache will still have an entry, + * If we point 1-N unnumbered interfaces at a loopback interface and + * shut down the loopback before shutting down 1-N unnumbered + * interfaces, the ARP cache will still have an entry, * but the route will have disappeared. - * - * See also ip4_del_interface_routes (...) + * + * See also ip4_del_interface_routes (...) * -> ip4_delete_matching_routes (...). */ @@ -1496,7 +1496,7 @@ vnet_arp_unset_ip4_over_ethernet_internal (vnet_main_t * vnm, if (adj_index != lm->miss_adj_index) { adj = ip_get_adjacency (lm, adj_index); - /* + /* * Stupid control-plane trick: * admin down an interface (removes arp routes from fib), * bring the interface back up (does not reinstall them) @@ -1582,7 +1582,7 @@ vnet_proxy_arp_add_del (ip4_address_t * lo_addr, } /* - * Remove any proxy arp entries asdociated with the + * Remove any proxy arp entries asdociated with the * specificed fib. */ int @@ -1964,7 +1964,7 @@ arp_term_l2bd (vlib_main_t * vm, macp0 = (u8 *) hash_get (last_bd_config->mac_by_ip4, ip0); if (PREDICT_FALSE (!macp0)) - goto next_l2_feature; // MAC not found + goto next_l2_feature; // MAC not found // MAC found, send ARP reply - // Convert ARP request packet to ARP reply @@ -1976,7 +1976,7 @@ arp_term_l2bd (vlib_main_t * vm, clib_memcpy (eth0->src_address, macp0, 6); n_replies_sent += 1; - // For BVI, need to use l2-fwd node to send ARP reply as + // For BVI, need to use l2-fwd node to send ARP reply as // l2-output node cannot output packet to BVI properly cfg0 = vec_elt_at_index (l2im->configs, sw_if_index0); if (PREDICT_FALSE (cfg0->bvi)) @@ -2052,7 +2052,7 @@ VLIB_REGISTER_NODE (arp_term_l2bd_node, static) = { clib_error_t * arp_term_init (vlib_main_t * vm) -{ // Initialize the feature next-node indexes +{ // Initialize the feature next-node indexes feat_bitmap_init_next_nodes (vm, arp_term_l2bd_node.index, L2INPUT_N_FEAT, diff --git a/vnet/vnet/ethernet/ethernet.h b/vnet/vnet/ethernet/ethernet.h index be5b99c74b6..d0eec1fc6b4 100644 --- a/vnet/vnet/ethernet/ethernet.h +++ b/vnet/vnet/ethernet/ethernet.h @@ -444,7 +444,7 @@ eth_identify_subint (vnet_hw_interface_t * hi, // Each comparison is checking both the valid flag and the number of tags // (incorporating exact-match/non-exact-match). - // check for specific double tag + // check for specific double tag subint = &qinq_intf->subint; if ((subint->flags & match_flags) == match_flags) goto matched; @@ -454,7 +454,7 @@ eth_identify_subint (vnet_hw_interface_t * hi, if ((subint->flags & match_flags) == match_flags) goto matched; - // check for specific single tag + // check for specific single tag subint = &vlan_intf->single_tag_subint; if ((subint->flags & match_flags) == match_flags) goto matched; @@ -464,7 +464,7 @@ eth_identify_subint (vnet_hw_interface_t * hi, if ((subint->flags & match_flags) == match_flags) goto matched; - // check for default interface + // check for default interface subint = &main_intf->default_subint; if ((subint->flags & match_flags) == match_flags) goto matched; diff --git a/vnet/vnet/ethernet/init.c b/vnet/vnet/ethernet/init.c index b561a36144e..86597c4f66c 100644 --- a/vnet/vnet/ethernet/init.c +++ b/vnet/vnet/ethernet/init.c @@ -66,7 +66,7 @@ ethernet_init (vlib_main_t * vm) ethernet_main_t *em = ðernet_main; clib_error_t *error; - /* + /* * Set up the L2 path now, or we'll wipe out the L2 ARP * registration set up by ethernet_arp_init. */ diff --git a/vnet/vnet/ethernet/interface.c b/vnet/vnet/ethernet/interface.c index 9723ad9f7ff..88daa347fc2 100644 --- a/vnet/vnet/ethernet/interface.c +++ b/vnet/vnet/ethernet/interface.c @@ -298,7 +298,7 @@ simulated_ethernet_interface_tx (vlib_main_t * vm, vlib_buffer_t *b; // check tx node index, it is ethernet-input on loopback create - // but can be changed to l2-input if loopback is configured as + // but can be changed to l2-input if loopback is configured as // BVI of a BD (Bridge Domain). loop_node = vec_elt (nm->nodes, node->node_index); next_node_index = loop_node->next_nodes[next_index]; @@ -322,7 +322,7 @@ simulated_ethernet_interface_tx (vlib_main_t * vm, while (1) { // Set up RX and TX indices as if received from a real driver - // unless loopback is used as a BVI. For BVI case, leave TX index + // unless loopback is used as a BVI. For BVI case, leave TX index // and update l2_len in packet as required for l2 forwarding path vnet_buffer (b)->sw_if_index[VLIB_RX] = sw_if_index; if (bvi_flag) diff --git a/vnet/vnet/ethernet/mac_swap.c b/vnet/vnet/ethernet/mac_swap.c index 34dfdf7e09e..c0fec12e61e 100644 --- a/vnet/vnet/ethernet/mac_swap.c +++ b/vnet/vnet/ethernet/mac_swap.c @@ -81,9 +81,9 @@ static char *mac_swap_error_strings[] = { #undef _ }; -/* +/* * To drop a pkt and increment one of the previous counters: - * + * * set b0->error = error_node->errors[RANDOM_ERROR_SAMPLE]; * set next0 to a disposition index bound to "error-drop". * @@ -93,7 +93,7 @@ static char *mac_swap_error_strings[] = { * u32 node_counter_base_index = n->error_heap_index; * vlib_error_main_t * em = &vm->error_main; * em->counters[node_counter_base_index + MAC_SWAP_ERROR_SAMPLE] += 1; - * + * */ typedef enum @@ -348,7 +348,7 @@ VLIB_REGISTER_NODE (mac_swap_node,static) = { .vector_size = sizeof (u32), .format_trace = format_swap_trace, .type = VLIB_NODE_TYPE_INTERNAL, - + .n_errors = ARRAY_LEN(mac_swap_error_strings), .error_strings = mac_swap_error_strings, diff --git a/vnet/vnet/ethernet/node.c b/vnet/vnet/ethernet/node.c index 0261815a1c2..74d4f476d7a 100644 --- a/vnet/vnet/ethernet/node.c +++ b/vnet/vnet/ethernet/node.c @@ -273,7 +273,7 @@ determine_next_node (ethernet_main_t * em, SPARSE_VEC_INVALID_INDEX ? ETHERNET_ERROR_UNKNOWN_TYPE : *error0; // The table is not populated with LLC values, so check that now. - // If variant is variant_ethernet then we came from LLC processing. Don't + // If variant is variant_ethernet then we came from LLC processing. Don't // go back there; drop instead using by keeping the drop/bad table result. if ((type0 < 0x600) && (variant == ETHERNET_INPUT_VARIANT_ETHERNET)) { @@ -561,7 +561,7 @@ ethernet_input_inline (vlib_main_t * vm, // prior to calling this function. Thus only subinterface counters // are incremented here. // - // Interface level counters include packets received on the main + // Interface level counters include packets received on the main // interface and all subinterfaces. Subinterface level counters // include only those packets received on that subinterface // Increment stats if the subint is valid and it is not the main intf @@ -576,7 +576,7 @@ ethernet_input_inline (vlib_main_t * vm, stats_n_bytes += len0; // Batch stat increments from the same subinterface so counters - // don't need to be incremented for every packet. + // don't need to be incremented for every packet. if (PREDICT_FALSE (new_sw_if_index0 != stats_sw_if_index)) { stats_n_packets -= 1; @@ -956,7 +956,7 @@ ethernet_sw_interface_add_del (vnet_main_t * vnm, // not implemented yet or not ethernet if (unsupported) { - // this is the NYI case + // this is the NYI case error = clib_error_return (0, "not implemented yet"); } goto done; @@ -1089,8 +1089,8 @@ next_by_ethertype_init (next_by_ethertype_t * l3_next) l3_next->sparse_index_by_input_next_index[ETHERNET_INPUT_NEXT_PUNT] = SPARSE_VEC_INVALID_INDEX; - /* - * Make sure we don't wipe out an ethernet registration by mistake + /* + * Make sure we don't wipe out an ethernet registration by mistake * Can happen if init function ordering constraints are missing. */ if (CLIB_DEBUG > 0) @@ -1218,7 +1218,7 @@ ethernet_register_l2_input (vlib_main_t * vm, u32 node_index) em->l2_next = vlib_node_add_next (vm, ethernet_input_node.index, node_index); - /* + /* * Even if we never use these arcs, we have to align the next indices... */ i = vlib_node_add_next (vm, ethernet_input_type_node.index, node_index); |