vtr_tag1 = clib_net_to_host_u16 (vtr_tag1);
vtr_tag2 = clib_net_to_host_u16 (vtr_tag2);
- /* Determine number of vlan tags with explictly configured values */
+ /* Determine number of vlan tags with explicitly configured values */
cfg_tags = 0;
if (hw_no_tags || si->sub.eth.flags.no_tags)
{
}
in_config->pop_bytes = 8;
in_config->push_bytes = 0;
-
- out_config->push_bytes = in_config->pop_bytes;
- out_config->pop_bytes = in_config->push_bytes;
break;
case L2_VTR_PUSH_1:
*/
u32
l2pbb_get (vlib_main_t * vlib_main, vnet_main_t * vnet_main, u32 sw_if_index,
- u32 * vtr_op, u16 * outer_tag, u8 * b_dmac, u8 * b_smac,
+ u32 * vtr_op, u16 * outer_tag, ethernet_header_t * eth_hdr,
u16 * b_vlanid, u32 * i_sid)
{
u32 error = 1;
*vtr_op = L2_VTR_DISABLED;
*outer_tag = 0;
- *b_dmac = 0;
- *b_smac = 0;
*b_vlanid = 0;
*i_sid = 0;
else if (in_config->push_bytes)
*vtr_op = L2_VTR_PUSH_2;
- clib_memcpy (b_dmac, in_config->macs_tags.b_dst_address,
- sizeof (b_dmac));
- clib_memcpy (b_smac, in_config->macs_tags.b_src_address,
- sizeof (b_smac));
+ clib_memcpy (ð_hdr->dst_address, in_config->macs_tags.b_dst_address,
+ sizeof (eth_hdr->dst_address));
+ clib_memcpy (ð_hdr->src_address, in_config->macs_tags.b_src_address,
+ sizeof (eth_hdr->src_address));
*b_vlanid =
clib_host_to_net_u16 (in_config->macs_tags.priority_dei_id) & 0xFFF;
*i_sid =
- clib_host_to_net_u32 (in_config->
- macs_tags.priority_dei_uca_res_sid) & 0xFFFFF;
+ clib_host_to_net_u32 (in_config->macs_tags.
+ priority_dei_uca_res_sid) & 0xFFFFF;
error = 0;
}
done: