diff options
| author |   Mohsin Kazmi <sykazmi@cisco.com> | 2019-07-29 11:39:26 +0200 |
|---|---|---|
| committer |   Andrew Yourtchenko <ayourtch@gmail.com> | 2019-08-19 08:39:57 +0000 |
| commit | 6bde1f4cd1ec703e04e880118d440a1c8d49b8f4 (patch) | |
| tree | aa82329412790b25039704332942aadda3f74d8f /src/vnet/pg | |
| parent | 859c6a5d01a996ee64d44feadf077424bb1889f9 (diff) | |
gso: fix l3 and l4 header offset in case of tagged interface
previously, PG and virtio interfaces calculate wrong l3 and l4
header offset. This patch fixes this issue.
Type: fix
Ticket: VPP-1739
Change-Id: I5ba978e464babeb65e0711e1027320d46b3b9932
Signed-off-by: Mohsin Kazmi <sykazmi@cisco.com>
(cherry picked from commit 14bea1bb6505c0134dd5d2a18bcc436ce72cd149)
Diffstat (limited to 'src/vnet/pg')
| -rw-r--r-- | src/vnet/pg/input.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/vnet/pg/input.c b/src/vnet/pg/input.c index 757a2916640..bb760b09b26 100644 --- a/src/vnet/pg/input.c +++ b/src/vnet/pg/input.c @@ -1541,6 +1541,20 @@ fill_gso_buffer_flags (vlib_main_t * vm, u32 * buffers, u32 n_buffers, u16 ethertype = clib_net_to_host_u16 (eh->type); u16 l2hdr_sz = sizeof (ethernet_header_t); + if (ethernet_frame_is_tagged (ethertype)) + { + ethernet_vlan_header_t *vlan = (ethernet_vlan_header_t *) (eh + 1); + + ethertype = clib_net_to_host_u16 (vlan->type); + l2hdr_sz += sizeof (*vlan); + if (ethertype == ETHERNET_TYPE_VLAN) + { + vlan++; + ethertype = clib_net_to_host_u16 (vlan->type); + l2hdr_sz += sizeof (*vlan); + } + } + vnet_buffer (b0)->l2_hdr_offset = 0; vnet_buffer (b0)->l3_hdr_offset = l2hdr_sz; if (PREDICT_TRUE (ethertype == ETHERNET_TYPE_IP4)) |