diff mbox series

[v3,2/6] net: fix L2TPv2 common header

Message ID 20220129062434.2455711-3-jie1x.wang@intel.com (mailing list archive)
State Changes Requested, archived
Delegated to: Ferruh Yigit
Headers
Series support L2TPv2 for AVF RSS hash and FDIR |

Checks

Context Check Description
ci/checkpatch success coding style OK

Commit Message

Jie Wang Jan. 29, 2022, 6:24 a.m. UTC 
  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.

Fixes: 3a929df1f286 ("ethdev: support L2TPv2 and PPP procotol")
Cc: stable@dpdk.org

Signed-off-by: Jie Wang <jie1x.wang@intel.com>
---
 lib/net/rte_l2tpv2.h | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

Comments

Ori Kam Jan. 30, 2022, 9:17 a.m. UTC | #1 
> -----Original Message-----
> From: Jie Wang <jie1x.wang@intel.com>
> Sent: Saturday, January 29, 2022 8:25 AM
> To: dev@dpdk.org
> Cc: stevex.yang@intel.com; Ori Kam <orika@nvidia.com>; aman.deep.singh@intel.com;
> ferruh.yigit@intel.com; NBU-Contact-Thomas Monjalon (EXTERNAL) <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 v3 2/6] net: fix L2TPv2 common header
> 
> 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.
> 
> Fixes: 3a929df1f286 ("ethdev: support L2TPv2 and PPP procotol")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Jie Wang <jie1x.wang@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

Acked-by: Ori Kam <orika@nvidia.com>
Best,
Ori
Ferruh Yigit Feb. 1, 2022, 12:20 p.m. UTC | #2 
On 1/30/2022 9:17 AM, Ori Kam wrote:
> 
> 
>> -----Original Message-----
>> From: Jie Wang <jie1x.wang@intel.com>
>> Sent: Saturday, January 29, 2022 8:25 AM
>> To: dev@dpdk.org
>> Cc: stevex.yang@intel.com; Ori Kam <orika@nvidia.com>; aman.deep.singh@intel.com;
>> ferruh.yigit@intel.com; NBU-Contact-Thomas Monjalon (EXTERNAL) <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 v3 2/6] net: fix L2TPv2 common header
>>
>> 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.
>>
>> Fixes: 3a929df1f286 ("ethdev: support L2TPv2 and PPP procotol")
>> Cc: stable@dpdk.org
>>
>> Signed-off-by: Jie Wang <jie1x.wang@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
> 
> Acked-by: Ori Kam <orika@nvidia.com>
> 

Acked-by: Ferruh Yigit <ferruh.yigit@intel.com>

What do you think putting the link of the related RFC in the commit log
for reference: https://datatracker.ietf.org/doc/html/rfc2661#section-3.1
diff mbox series

Patch

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
 		};
 	};