diff options
| -rw-r--r-- | src/vnet/l2/l2_bvi.h | 31 |
1 files changed, 11 insertions, 20 deletions
diff --git a/src/vnet/l2/l2_bvi.h b/src/vnet/l2/l2_bvi.h index 662ec402a87..cc86072fab7 100644 --- a/src/vnet/l2/l2_bvi.h +++ b/src/vnet/l2/l2_bvi.h @@ -40,31 +40,25 @@ l2_to_bvi (vlib_main_t * vlib_main, vlib_buffer_t * b0, u32 bvi_sw_if_index, next_by_ethertype_t * l3_next, u32 * next0) { - u8 l2_len; - u16 ethertype; - u8 *l3h; - ethernet_header_t *e0; - vnet_hw_interface_t *hi; - - e0 = vlib_buffer_get_current (b0); - hi = vnet_get_sup_hw_interface (vnet_main, bvi_sw_if_index); - /* Perform L3 my-mac filter */ - if ((!ethernet_address_cast (e0->dst_address)) && - (!eth_mac_equal ((u8 *) e0, hi->hw_address))) + ethernet_header_t *e0 = vlib_buffer_get_current (b0); + if (!ethernet_address_cast (e0->dst_address)) { - return TO_BVI_ERR_BAD_MAC; + vnet_hw_interface_t *hi = + vnet_get_sup_hw_interface (vnet_main, bvi_sw_if_index); + if (!eth_mac_equal (e0->dst_address, hi->hw_address)) + return TO_BVI_ERR_BAD_MAC; } /* Save L2 header position which may be changed due to packet replication */ vnet_buffer (b0)->l2_hdr_offset = b0->current_data; /* Strip L2 header */ - l2_len = vnet_buffer (b0)->l2.l2_len; + u8 l2_len = vnet_buffer (b0)->l2.l2_len; vlib_buffer_advance (b0, l2_len); - l3h = vlib_buffer_get_current (b0); - ethertype = clib_net_to_host_u16 (*(u16 *) (l3h - 2)); + u8 *l3h = vlib_buffer_get_current (b0); + u16 ethertype = clib_net_to_host_u16 (*(u16 *) (l3h - 2)); /* Set the input interface to be the BVI interface */ vnet_buffer (b0)->sw_if_index[VLIB_RX] = bvi_sw_if_index; @@ -82,9 +76,7 @@ l2_to_bvi (vlib_main_t * vlib_main, else { /* uncommon ethertype, check table */ - u32 i0; - - i0 = sparse_vec_index (l3_next->input_next_by_type, ethertype); + u32 i0 = sparse_vec_index (l3_next->input_next_by_type, ethertype); *next0 = vec_elt (l3_next->input_next_by_type, i0); if (i0 == SPARSE_VEC_INVALID_INDEX) @@ -97,8 +89,7 @@ l2_to_bvi (vlib_main_t * vlib_main, vlib_increment_combined_counter (vnet_main->interface_main.combined_sw_if_counters + VNET_INTERFACE_COUNTER_RX, - vlib_main->thread_index, - vnet_buffer (b0)->sw_if_index[VLIB_RX], + vlib_main->thread_index, bvi_sw_if_index, 1, vlib_buffer_length_in_chain (vlib_main, b0)); return TO_BVI_ERR_OK; } |