Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
ikev2: add support for custom ipsec-over-udp port
[vpp.git]
/
src
/
vnet
/
l2
/
l2_vtr.h
diff --git
a/src/vnet/l2/l2_vtr.h
b/src/vnet/l2/l2_vtr.h
index
99aedc9
..
1cd9209
100644
(file)
--- a/
src/vnet/l2/l2_vtr.h
+++ b/
src/vnet/l2/l2_vtr.h
@@
-20,6
+20,7
@@
#include <vlib/vlib.h>
#include <vnet/vnet.h>
#include <vlib/vlib.h>
#include <vnet/vnet.h>
+#include <vnet/ethernet/ethernet.h>
#include <vnet/ethernet/packet.h>
#include <vnet/l2/l2_vtr.h>
#include <vnet/ethernet/packet.h>
#include <vnet/l2/l2_vtr.h>
@@
-105,9
+106,11
@@
l2_vtr_process (vlib_buffer_t * b0, vtr_config_t * config)
*((u64 *) eth) = temp_8;
*((u32 *) (eth + 8)) = temp_4;
*((u64 *) eth) = temp_8;
*((u32 *) (eth + 8)) = temp_4;
- /* Update l2
_len
*/
+ /* Update l2
parameters
*/
vnet_buffer (b0)->l2.l2_len +=
(word) config->push_bytes - (word) config->pop_bytes;
vnet_buffer (b0)->l2.l2_len +=
(word) config->push_bytes - (word) config->pop_bytes;
+ vnet_buffer (b0)->l2_hdr_offset -=
+ (word) config->push_bytes - (word) config->pop_bytes;
/* Update vlan tag count */
ethernet_buffer_adjust_vlan_count_by_bytes (b0,
/* Update vlan tag count */
ethernet_buffer_adjust_vlan_count_by_bytes (b0,
@@
-267,7
+270,7
@@
u32 l2pbb_get (vlib_main_t * vlib_main,
u32 sw_if_index,
u32 * vtr_op,
u16 * outer_tag,
u32 sw_if_index,
u32 * vtr_op,
u16 * outer_tag,
-
u8 * b_dmac, u8 * b_smac
, u16 * b_vlanid, u32 * i_sid);
+
ethernet_header_t * eth_hdr
, u16 * b_vlanid, u32 * i_sid);
#endif /* included_vnet_l2_vtr_h */
#endif /* included_vnet_l2_vtr_h */