From: Jie Wang <jie1x.wang@intel.com>
To: dev@dpdk.org
Cc: stevex.yang@intel.com, orika@nvidia.com,
aman.deep.singh@intel.com, ferruh.yigit@intel.com,
thomas@monjalon.net, andrew.rybchenko@oktetlabs.ru,
jingjing.wu@intel.com, beilei.xing@intel.com,
qi.z.zhang@intel.com, olivier.matz@6wind.com,
Jie Wang <jie1x.wang@intel.com>,
stable@dpdk.org
Subject: [PATCH v5 2/6] net: fix L2TPv2 common header
Date: Wed, 9 Feb 2022 17:38:53 +0800 [thread overview]
Message-ID: <20220209093857.79364-3-jie1x.wang@intel.com> (raw)
In-Reply-To: <20220209093857.79364-1-jie1x.wang@intel.com>
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")
Cc: stable@dpdk.org
Signed-off-by: Jie Wang <jie1x.wang@intel.com>
Acked-by: Ori Kam <orika@nvidia.com>
Acked-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
lib/net/rte_l2tpv2.h | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 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
@@ -89,16 +89,6 @@ struct rte_l2tpv2_common_hdr {
__extension__
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 */
-#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 */
@@ -108,6 +98,16 @@ struct rte_l2tpv2_common_hdr {
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 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.25.1
next prev parent reply other threads:[~2022-02-09 9:39 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-29 6:24 [PATCH v3 0/6] support L2TPv2 for AVF RSS hash and FDIR Jie Wang
2022-01-29 6:24 ` [PATCH v3 1/6] ethdev: add L2TPv2 RSS offload type Jie Wang
2022-01-30 9:15 ` Ori Kam
2022-02-01 12:19 ` Ferruh Yigit
2022-01-29 6:24 ` [PATCH v3 2/6] net: fix L2TPv2 common header Jie Wang
2022-01-30 9:17 ` Ori Kam
2022-02-01 12:20 ` Ferruh Yigit
2022-01-29 6:24 ` [PATCH v3 3/6] app/testpmd: add 6 types of L2TPv2 message Jie Wang
2022-01-30 9:19 ` Ori Kam
2022-01-29 6:24 ` [PATCH v3 4/6] common/iavf: add session ID fields for L2TPv2 Jie Wang
2022-01-29 6:24 ` [PATCH v3 5/6] net/iavf: support L2TPv2 for AVF HASH Jie Wang
2022-01-29 6:24 ` [PATCH v3 6/6] net/iavf: support L2TPv2 for AVF FDIR Jie Wang
2022-02-01 12:22 ` [PATCH v3 0/6] support L2TPv2 for AVF RSS hash and FDIR Ferruh Yigit
2022-02-08 8:38 ` [PATCH v4 " Jie Wang
2022-02-08 8:38 ` [PATCH v4 1/6] ethdev: add L2TPv2 RSS offload type Jie Wang
2022-02-08 13:13 ` Ferruh Yigit
2022-02-08 14:43 ` Ferruh Yigit
2022-02-08 8:38 ` [PATCH v4 2/6] net: fix L2TPv2 common header Jie Wang
2022-02-08 8:38 ` [PATCH v4 3/6] app/testpmd: add 6 types of L2TPv2 message Jie Wang
2022-02-08 8:38 ` [PATCH v4 4/6] common/iavf: add session ID fields for L2TPv2 Jie Wang
2022-02-08 8:38 ` [PATCH v4 5/6] net/iavf: support L2TPv2 for AVF HASH Jie Wang
2022-02-09 7:01 ` Xing, Beilei
2022-02-09 7:43 ` Wang, Jie1X
2022-02-09 8:17 ` Zhang, Qi Z
2022-02-08 8:38 ` [PATCH v4 6/6] net/iavf: support L2TPv2 for AVF FDIR Jie Wang
2022-02-09 7:30 ` Xing, Beilei
2022-02-09 7:45 ` Wang, Jie1X
2022-02-08 14:44 ` [PATCH v4 0/6] support L2TPv2 for AVF RSS hash and FDIR Ferruh Yigit
2022-02-09 8:20 ` Zhang, Qi Z
2022-02-09 9:38 ` [PATCH v5 " Jie Wang
2022-02-09 9:38 ` [PATCH v5 1/6] ethdev: add L2TPv2 RSS offload type Jie Wang
2022-02-09 20:42 ` Ferruh Yigit
2022-02-09 9:38 ` Jie Wang [this message]
2022-02-09 9:38 ` [PATCH v5 3/6] app/testpmd: add 6 types of L2TPv2 message Jie Wang
2022-02-09 9:38 ` [PATCH v5 4/6] common/iavf: add session ID fields for L2TPv2 Jie Wang
2022-02-11 1:37 ` Zhang, Qi Z
2022-02-09 9:38 ` [PATCH v5 5/6] net/iavf: support L2TPv2 for AVF HASH Jie Wang
2022-02-09 12:21 ` Xing, Beilei
2022-02-09 9:38 ` [PATCH v5 6/6] net/iavf: support L2TPv2 for AVF FDIR Jie Wang
2022-02-09 20:44 ` [PATCH v5 0/6] support L2TPv2 for AVF RSS hash and FDIR Ferruh Yigit
2022-02-10 2:13 ` Wang, Jie1X
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220209093857.79364-3-jie1x.wang@intel.com \
--to=jie1x.wang@intel.com \
--cc=aman.deep.singh@intel.com \
--cc=andrew.rybchenko@oktetlabs.ru \
--cc=beilei.xing@intel.com \
--cc=dev@dpdk.org \
--cc=ferruh.yigit@intel.com \
--cc=jingjing.wu@intel.com \
--cc=olivier.matz@6wind.com \
--cc=orika@nvidia.com \
--cc=qi.z.zhang@intel.com \
--cc=stable@dpdk.org \
--cc=stevex.yang@intel.com \
--cc=thomas@monjalon.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).