[PATCH] net/rte_net: fix inner L2 length for tunneled Ethernet packets

[Khadem Ullah]

Fix incorrect inner_l2_len values for VXLAN, VXLAN-GPE, GTPU, and Geneve.
These protocols carry full Ethernet frames, so inner_l2_len should be
set to the size of an Ethernet header (14 bytes), not include tunnel or
UDP headers.

Fixes: 44fb6c0f51 ('net: initial tunnel type parser')
Cc: sta...@dpdk.org

Signed-off-by: Khadem Ullah <14pwcse1...@uetpeshawar.edu.pk>
---
 lib/net/rte_net.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/net/rte_net.c b/lib/net/rte_net.c
index 44fb6c0f51..ca9260a67b 100644
--- a/lib/net/rte_net.c
+++ b/lib/net/rte_net.c
@@ -198,7 +198,7 @@ ptype_tunnel_with_udp(uint16_t *proto, const struct 
rte_mbuf *m,
        case RTE_VXLAN_DEFAULT_PORT: {
                *off += sizeof(struct rte_vxlan_hdr);
                hdr_lens->tunnel_len = sizeof(struct rte_vxlan_hdr);
-               hdr_lens->inner_l2_len = RTE_ETHER_VXLAN_HLEN;
+               hdr_lens->inner_l2_len = sizeof(struct rte_ether_hdr);
                *proto = RTE_VXLAN_GPE_TYPE_ETH; /* just for eth header parse. 
*/
                return RTE_PTYPE_TUNNEL_VXLAN;
        }
@@ -210,7 +210,7 @@ ptype_tunnel_with_udp(uint16_t *proto, const struct 
rte_mbuf *m,
                        return 0;
                *off += sizeof(struct rte_vxlan_gpe_hdr);
                hdr_lens->tunnel_len = sizeof(struct rte_vxlan_gpe_hdr);
-               hdr_lens->inner_l2_len = RTE_ETHER_VXLAN_GPE_HLEN;
+               hdr_lens->inner_l2_len = sizeof(struct rte_ether_hdr);
                *proto = vgh->proto;
 
                return RTE_PTYPE_TUNNEL_VXLAN_GPE;
@@ -244,7 +244,7 @@ ptype_tunnel_with_udp(uint16_t *proto, const struct 
rte_mbuf *m,
                        *proto = 0;
                }
                *off += gtp_len;
-               hdr_lens->inner_l2_len = gtp_len + sizeof(struct rte_udp_hdr);
+               hdr_lens->inner_l2_len = sizeof(struct rte_ether_hdr);
                hdr_lens->tunnel_len = gtp_len;
                if (port_no == RTE_GTPC_UDP_PORT)
                        return RTE_PTYPE_TUNNEL_GTPC;
@@ -262,7 +262,7 @@ ptype_tunnel_with_udp(uint16_t *proto, const struct 
rte_mbuf *m,
                geneve_len = sizeof(*gnh) + gnh->opt_len * 4;
                *off += geneve_len;
                hdr_lens->tunnel_len = geneve_len;
-               hdr_lens->inner_l2_len = sizeof(struct rte_udp_hdr) + 
geneve_len;
+               hdr_lens->inner_l2_len = sizeof(struct rte_ether_hdr);
                *proto = gnh->proto;
                if (gnh->proto == 0)
                        *proto = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4);
-- 
2.47.1