patch 'net: fix L2TPv2 common header' has been queued to stable release 21.11.1
Kevin Traynor
ktraynor at redhat.com
Mon Feb 21 16:35:50 CET 2022
Hi,
FYI, your patch has been queued to stable release 21.11.1
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/26/22. 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/kevintraynor/dpdk-stable
This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/851b597291901044f72d4150887ab1449dc59e8a
Thanks.
Kevin
---
>From 851b597291901044f72d4150887ab1449dc59e8a Mon Sep 17 00:00:00 2001
From: Jie Wang <jie1x.wang at intel.com>
Date: Wed, 9 Feb 2022 17:38:53 +0800
Subject: [PATCH] net: fix L2TPv2 common header
[ upstream commit 9747f6955b01005bb19e8dfacd64c4bb92dbd07e ]
The fields of L2TPv2 common header were reversed in big endian and
little endian.
This patch fixes this error to ensure L2TPv2 can be parsed correctly.
For L2TP reference:
https://datatracker.ietf.org/doc/html/rfc2661#section-3.1
Fixes: 3a929df1f286 ("ethdev: support L2TPv2 and PPP procotol")
Signed-off-by: Jie Wang <jie1x.wang at intel.com>
Acked-by: Ori Kam <orika at nvidia.com>
Acked-by: Ferruh Yigit <ferruh.yigit at intel.com>
---
lib/net/rte_l2tpv2.h | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/lib/net/rte_l2tpv2.h b/lib/net/rte_l2tpv2.h
index 938a993b48..1f3ad3f03c 100644
--- a/lib/net/rte_l2tpv2.h
+++ b/lib/net/rte_l2tpv2.h
@@ -90,23 +90,23 @@ struct rte_l2tpv2_common_hdr {
struct {
#if RTE_BYTE_ORDER == RTE_LITTLE_ENDIAN
- uint16_t t:1; /**< message Type */
- uint16_t l:1; /**< length option bit */
- uint16_t res1:2; /**< reserved */
- uint16_t s:1; /**< ns/nr option bit */
- uint16_t res2:1; /**< reserved */
- uint16_t o:1; /**< offset option bit */
- uint16_t p:1; /**< priority option bit */
- uint16_t res3:4; /**< reserved */
uint16_t ver:4; /**< protocol version */
+ uint16_t res3:4; /**< reserved */
+ uint16_t p:1; /**< priority option bit */
+ uint16_t o:1; /**< offset option bit */
+ uint16_t res2:1; /**< reserved */
+ uint16_t s:1; /**< ns/nr option bit */
+ uint16_t res1:2; /**< reserved */
+ uint16_t l:1; /**< length option bit */
+ uint16_t t:1; /**< message Type */
#elif RTE_BYTE_ORDER == RTE_BIG_ENDIAN
- uint16_t ver:4; /**< protocol version */
- uint16_t res3:4; /**< reserved */
- uint16_t p:1; /**< priority option bit */
- uint16_t o:1; /**< offset option bit */
- uint16_t res2:1; /**< reserved */
- uint16_t s:1; /**< ns/nr option bit */
- uint16_t res1:2; /**< reserved */
- uint16_t l:1; /**< length option bit */
uint16_t t:1; /**< message Type */
+ uint16_t l:1; /**< length option bit */
+ uint16_t res1:2; /**< reserved */
+ uint16_t s:1; /**< ns/nr option bit */
+ uint16_t res2:1; /**< reserved */
+ uint16_t o:1; /**< offset option bit */
+ uint16_t p:1; /**< priority option bit */
+ uint16_t res3:4; /**< reserved */
+ uint16_t ver:4; /**< protocol version */
#endif
};
--
2.34.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2022-02-21 15:22:48.038467585 +0000
+++ 0161-net-fix-L2TPv2-common-header.patch 2022-02-21 15:22:44.310704619 +0000
@@ -1 +1 @@
-From 9747f6955b01005bb19e8dfacd64c4bb92dbd07e Mon Sep 17 00:00:00 2001
+From 851b597291901044f72d4150887ab1449dc59e8a Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 9747f6955b01005bb19e8dfacd64c4bb92dbd07e ]
+
@@ -15 +16,0 @@
-Cc: stable at dpdk.org
More information about the stable
mailing list