patch 'net: fix L2 length for GRE packets' has been queued to stable release 22.11.11

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 22.11.11

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/14/25. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/bluca/dpdk-stable

This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/908a8673c827df75b58b4ca152e2b3b0afb57117

Thanks.

Luca Boccassi

---
>From 908a8673c827df75b58b4ca152e2b3b0afb57117 Mon Sep 17 00:00:00 2001
From: Dengdui Huang <huangdengdui at huawei.com>
Date: Wed, 23 Jul 2025 18:47:10 +0800
Subject: [PATCH] net: fix L2 length for GRE packets

[ upstream commit cb699a047d1f2c1cead545db2d266ab5f396b550 ]

The meaning of L2_len in the parsing result of the rte_net_get_ptype()
is the same as the L2_len field in the mbuf. For tunnel packets,
the L2_len should include protocol header of tunnel packets.

Bugzilla ID: 1754
Fixes: d21d855464ff ("net: support GRE in software packet type parser")

Signed-off-by: Dengdui Huang <huangdengdui at huawei.com>
Reviewed-by: Chengwen Feng <fengchengwen at huawei.com>
---
 lib/net/rte_net.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/net/rte_net.c b/lib/net/rte_net.c
index d680accc16..5862ed0776 100644
--- a/lib/net/rte_net.c
+++ b/lib/net/rte_net.c
@@ -376,6 +376,7 @@ l3:
 
 		pkt_type |= ptype_tunnel(&proto, m, &off);
 		hdr_lens->tunnel_len = off - prev_off;
+		hdr_lens->inner_l2_len = off - prev_off;
 	}
 
 	/* same job for inner header: we need to duplicate the code
-- 
2.47.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2025-11-12 16:20:42.586714786 +0000
+++ 0042-net-fix-L2-length-for-GRE-packets.patch	2025-11-12 16:20:41.003718817 +0000
@@ -1 +1 @@
-From cb699a047d1f2c1cead545db2d266ab5f396b550 Mon Sep 17 00:00:00 2001
+From 908a8673c827df75b58b4ca152e2b3b0afb57117 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit cb699a047d1f2c1cead545db2d266ab5f396b550 ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org
@@ -21 +22 @@
-index 44fb6c0f51..c70b57fdc0 100644
+index d680accc16..5862ed0776 100644
@@ -24 +25 @@
-@@ -481,6 +481,7 @@ l3:
+@@ -376,6 +376,7 @@ l3:
@@ -26 +27 @@
- 		pkt_type |= ptype_tunnel_without_udp(&proto, m, &off);
+ 		pkt_type |= ptype_tunnel(&proto, m, &off);