diff mbox series

net/mlx5: move GTP mask define to correct location

Message ID 6dd4f7a13e375c743e77555a6360e7bfa9b9aba5.1591795480.git.dekelp@mellanox.com (mailing list archive)
State Accepted, archived
Delegated to: Raslan Darawsheh
Headers
Series net/mlx5: move GTP mask define to correct location |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/iol-broadcom-Performance success Performance Testing PASS
ci/travis-robot success Travis build: passed
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-nxp-Performance success Performance Testing PASS
ci/iol-mellanox-Performance success Performance Testing PASS
ci/iol-testing success Testing PASS
ci/Intel-compilation success Compilation OK

Commit Message

Dekel Peled June 10, 2020, 1:25 p.m. UTC 
  Recent patch [1] added definition of mask MLX5_GTP_FLAGS_MASK, just
above function flow_dv_validate_item_gtp(), where it is used.

Patch was applied together with other patches which modified the same
file, so the mask was located further away from the function it is
used in.

This patch moves the mask definition to the proper location.

Signed-off-by: Dekel Peled <dekelp@mellanox.com>
Acked-by: Matan Azrad <matan@mellanox.com>

[1] Commit 563ac307a46b ("net/mlx5: support match on GTP flags")
---
 drivers/net/mlx5/mlx5_flow_dv.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

Comments

Raslan Darawsheh June 14, 2020, 10:29 a.m. UTC | #1 
Hi,

> -----Original Message-----
> From: Dekel Peled <dekelp@mellanox.com>
> Sent: Wednesday, June 10, 2020 4:25 PM
> To: Matan Azrad <matan@mellanox.com>; Slava Ovsiienko
> <viacheslavo@mellanox.com>; Raslan Darawsheh <rasland@mellanox.com>
> Cc: dev@dpdk.org
> Subject: [PATCH] net/mlx5: move GTP mask define to correct location
> 
> Recent patch [1] added definition of mask MLX5_GTP_FLAGS_MASK, just
> above function flow_dv_validate_item_gtp(), where it is used.
> 
> Patch was applied together with other patches which modified the same
> file, so the mask was located further away from the function it is
> used in.
> 
> This patch moves the mask definition to the proper location.
> 
> Signed-off-by: Dekel Peled <dekelp@mellanox.com>
> Acked-by: Matan Azrad <matan@mellanox.com>
> 
> [1] Commit 563ac307a46b ("net/mlx5: support match on GTP flags")
> ---
>  drivers/net/mlx5/mlx5_flow_dv.c | 24 ++++++++++++------------
>  1 file changed, 12 insertions(+), 12 deletions(-)
> 
> diff --git a/drivers/net/mlx5/mlx5_flow_dv.c
> b/drivers/net/mlx5/mlx5_flow_dv.c
> index 81f5bd4..d645d2d 100644
> --- a/drivers/net/mlx5/mlx5_flow_dv.c
> +++ b/drivers/net/mlx5/mlx5_flow_dv.c
> @@ -1639,18 +1639,6 @@ struct field_modify_info modify_tcp[] = {
>  	return 0;
>  }
> 
> -/*
> - * GTP flags are contained in 1 byte of the format:
> - * -------------------------------------------
> - * | bit   | 0 - 2   | 3  | 4   | 5 | 6 | 7  |
> - * |-----------------------------------------|
> - * | value | Version | PT | Res | E | S | PN |
> - * -------------------------------------------
> - *
> - * Matching is supported only for GTP flags E, S, PN.
> - */
> -#define MLX5_GTP_FLAGS_MASK	0x07
> -
>  /**
>   * Validate VLAN item.
>   *
> @@ -1724,6 +1712,18 @@ struct field_modify_info modify_tcp[] = {
>  	return 0;
>  }
> 
> +/*
> + * GTP flags are contained in 1 byte of the format:
> + * -------------------------------------------
> + * | bit   | 0 - 2   | 3  | 4   | 5 | 6 | 7  |
> + * |-----------------------------------------|
> + * | value | Version | PT | Res | E | S | PN |
> + * -------------------------------------------
> + *
> + * Matching is supported only for GTP flags E, S, PN.
> + */
> +#define MLX5_GTP_FLAGS_MASK	0x07
> +
>  /**
>   * Validate GTP item.
>   *
> --
> 1.8.3.1

Patch applied to next-net-mlx,

Kindest regards,
Raslan Darawsheh
Ferruh Yigit June 16, 2020, 10:27 a.m. UTC | #2 
On 6/10/2020 2:25 PM, Dekel Peled wrote:
> Recent patch [1] added definition of mask MLX5_GTP_FLAGS_MASK, just
> above function flow_dv_validate_item_gtp(), where it is used.
> 
> Patch was applied together with other patches which modified the same
> file, so the mask was located further away from the function it is
> used in.
> 
> This patch moves the mask definition to the proper location.
> 
> Signed-off-by: Dekel Peled <dekelp@mellanox.com>
> Acked-by: Matan Azrad <matan@mellanox.com>
> 
> [1] Commit 563ac307a46b ("net/mlx5: support match on GTP flags")


Better to add this as 'Fixes', instead of reference, so this way it helps for
the backporting etc..

    Fixes: b88341ca35fc ("net/mlx5: convert flow dev handle to indexed")
    Cc: stable@dpdk.org


> ---
>  drivers/net/mlx5/mlx5_flow_dv.c | 24 ++++++++++++------------
>  1 file changed, 12 insertions(+), 12 deletions(-)
> 
> diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
> index 81f5bd4..d645d2d 100644
> --- a/drivers/net/mlx5/mlx5_flow_dv.c
> +++ b/drivers/net/mlx5/mlx5_flow_dv.c
> @@ -1639,18 +1639,6 @@ struct field_modify_info modify_tcp[] = {
>  	return 0;
>  }
>  
> -/*
> - * GTP flags are contained in 1 byte of the format:
> - * -------------------------------------------
> - * | bit   | 0 - 2   | 3  | 4   | 5 | 6 | 7  |
> - * |-----------------------------------------|
> - * | value | Version | PT | Res | E | S | PN |
> - * -------------------------------------------
> - *
> - * Matching is supported only for GTP flags E, S, PN.
> - */
> -#define MLX5_GTP_FLAGS_MASK	0x07
> -
>  /**
>   * Validate VLAN item.
>   *
> @@ -1724,6 +1712,18 @@ struct field_modify_info modify_tcp[] = {
>  	return 0;
>  }
>  
> +/*
> + * GTP flags are contained in 1 byte of the format:
> + * -------------------------------------------
> + * | bit   | 0 - 2   | 3  | 4   | 5 | 6 | 7  |
> + * |-----------------------------------------|
> + * | value | Version | PT | Res | E | S | PN |
> + * -------------------------------------------
> + *
> + * Matching is supported only for GTP flags E, S, PN.
> + */
> +#define MLX5_GTP_FLAGS_MASK	0x07
> +
>  /**
>   * Validate GTP item.
>   *
>
Raslan Darawsheh June 16, 2020, 1:40 p.m. UTC | #3 
Hi,

> -----Original Message-----
> From: Ferruh Yigit <ferruh.yigit@intel.com>
> Sent: Tuesday, June 16, 2020 1:28 PM
> To: Dekel Peled <dekelp@mellanox.com>; Matan Azrad
> <matan@mellanox.com>; Slava Ovsiienko <viacheslavo@mellanox.com>;
> Raslan Darawsheh <rasland@mellanox.com>
> Cc: dev@dpdk.org
> Subject: Re: [dpdk-dev] [PATCH] net/mlx5: move GTP mask define to correct
> location
> 
> On 6/10/2020 2:25 PM, Dekel Peled wrote:
> > Recent patch [1] added definition of mask MLX5_GTP_FLAGS_MASK, just
> > above function flow_dv_validate_item_gtp(), where it is used.
> >
> > Patch was applied together with other patches which modified the same
> > file, so the mask was located further away from the function it is
> > used in.
> >
> > This patch moves the mask definition to the proper location.
> >
> > Signed-off-by: Dekel Peled <dekelp@mellanox.com>
> > Acked-by: Matan Azrad <matan@mellanox.com>
> >
> > [1] Commit 563ac307a46b ("net/mlx5: support match on GTP flags")
> 
> 
> Better to add this as 'Fixes', instead of reference, so this way it helps for
> the backporting etc..
> 
>     Fixes: b88341ca35fc ("net/mlx5: convert flow dev handle to indexed")
>     Cc: stable@dpdk.org

I'll change it in next-net-mlx accordingly,

Kindest regards,
Raslan Darawsheh
Matan Azrad June 16, 2020, 4:06 p.m. UTC | #4 
Hi

Ferruh, Raslan

This patch is not a fix, we don't need to backport it.
I don't think we need fixes and cc stable here.

Matan

From: Raslan Darawsheh
> Hi,
> 
> > -----Original Message-----
> > From: Ferruh Yigit <ferruh.yigit@intel.com>
> > Sent: Tuesday, June 16, 2020 1:28 PM
> > To: Dekel Peled <dekelp@mellanox.com>; Matan Azrad
> > <matan@mellanox.com>; Slava Ovsiienko <viacheslavo@mellanox.com>;
> > Raslan Darawsheh <rasland@mellanox.com>
> > Cc: dev@dpdk.org
> > Subject: Re: [dpdk-dev] [PATCH] net/mlx5: move GTP mask define to
> > correct location
> >
> > On 6/10/2020 2:25 PM, Dekel Peled wrote:
> > > Recent patch [1] added definition of mask MLX5_GTP_FLAGS_MASK, just
> > > above function flow_dv_validate_item_gtp(), where it is used.
> > >
> > > Patch was applied together with other patches which modified the
> > > same file, so the mask was located further away from the function it
> > > is used in.
> > >
> > > This patch moves the mask definition to the proper location.
> > >
> > > Signed-off-by: Dekel Peled <dekelp@mellanox.com>
> > > Acked-by: Matan Azrad <matan@mellanox.com>
> > >
> > > [1] Commit 563ac307a46b ("net/mlx5: support match on GTP flags")
> >
> >
> > Better to add this as 'Fixes', instead of reference, so this way it
> > helps for the backporting etc..
> >
> >     Fixes: b88341ca35fc ("net/mlx5: convert flow dev handle to indexed")
> >     Cc: stable@dpdk.org
> 
> I'll change it in next-net-mlx accordingly,
> 
> Kindest regards,
> Raslan Darawsheh
Ferruh Yigit June 16, 2020, 4:18 p.m. UTC | #5 
On 6/16/2020 5:06 PM, Matan Azrad wrote:
> Hi
> 
> Ferruh, Raslan
> 
> This patch is not a fix, we don't need to backport it.

Why not backport it?

> I don't think we need fixes and cc stable here.
> 
> Matan
> 
> From: Raslan Darawsheh
>> Hi,
>>
>>> -----Original Message-----
>>> From: Ferruh Yigit <ferruh.yigit@intel.com>
>>> Sent: Tuesday, June 16, 2020 1:28 PM
>>> To: Dekel Peled <dekelp@mellanox.com>; Matan Azrad
>>> <matan@mellanox.com>; Slava Ovsiienko <viacheslavo@mellanox.com>;
>>> Raslan Darawsheh <rasland@mellanox.com>
>>> Cc: dev@dpdk.org
>>> Subject: Re: [dpdk-dev] [PATCH] net/mlx5: move GTP mask define to
>>> correct location
>>>
>>> On 6/10/2020 2:25 PM, Dekel Peled wrote:
>>>> Recent patch [1] added definition of mask MLX5_GTP_FLAGS_MASK, just
>>>> above function flow_dv_validate_item_gtp(), where it is used.
>>>>
>>>> Patch was applied together with other patches which modified the
>>>> same file, so the mask was located further away from the function it
>>>> is used in.
>>>>
>>>> This patch moves the mask definition to the proper location.
>>>>
>>>> Signed-off-by: Dekel Peled <dekelp@mellanox.com>
>>>> Acked-by: Matan Azrad <matan@mellanox.com>
>>>>
>>>> [1] Commit 563ac307a46b ("net/mlx5: support match on GTP flags")
>>>
>>>
>>> Better to add this as 'Fixes', instead of reference, so this way it
>>> helps for the backporting etc..
>>>
>>>     Fixes: b88341ca35fc ("net/mlx5: convert flow dev handle to indexed")
>>>     Cc: stable@dpdk.org
>>
>> I'll change it in next-net-mlx accordingly,
>>
>> Kindest regards,
>> Raslan Darawsheh
Matan Azrad June 16, 2020, 4:23 p.m. UTC | #6 
From: Ferruh Yigit
> On 6/16/2020 5:06 PM, Matan Azrad wrote:
> > Hi
> >
> > Ferruh, Raslan
> >
> > This patch is not a fix, we don't need to backport it.
> 
> Why not backport it?

There is no a bug fix.
The behavior will not be changed.

It is just for comfort.


 
> > I don't think we need fixes and cc stable here.
> >
> > Matan
> >
> > From: Raslan Darawsheh
> >> Hi,
> >>
> >>> -----Original Message-----
> >>> From: Ferruh Yigit <ferruh.yigit@intel.com>
> >>> Sent: Tuesday, June 16, 2020 1:28 PM
> >>> To: Dekel Peled <dekelp@mellanox.com>; Matan Azrad
> >>> <matan@mellanox.com>; Slava Ovsiienko
> <viacheslavo@mellanox.com>;
> >>> Raslan Darawsheh <rasland@mellanox.com>
> >>> Cc: dev@dpdk.org
> >>> Subject: Re: [dpdk-dev] [PATCH] net/mlx5: move GTP mask define to
> >>> correct location
> >>>
> >>> On 6/10/2020 2:25 PM, Dekel Peled wrote:
> >>>> Recent patch [1] added definition of mask MLX5_GTP_FLAGS_MASK,
> just
> >>>> above function flow_dv_validate_item_gtp(), where it is used.
> >>>>
> >>>> Patch was applied together with other patches which modified the
> >>>> same file, so the mask was located further away from the function
> >>>> it is used in.
> >>>>
> >>>> This patch moves the mask definition to the proper location.
> >>>>
> >>>> Signed-off-by: Dekel Peled <dekelp@mellanox.com>
> >>>> Acked-by: Matan Azrad <matan@mellanox.com>
> >>>>
> >>>> [1] Commit 563ac307a46b ("net/mlx5: support match on GTP flags")
> >>>
> >>>
> >>> Better to add this as 'Fixes', instead of reference, so this way it
> >>> helps for the backporting etc..
> >>>
> >>>     Fixes: b88341ca35fc ("net/mlx5: convert flow dev handle to indexed")
> >>>     Cc: stable@dpdk.org
> >>
> >> I'll change it in next-net-mlx accordingly,
> >>
> >> Kindest regards,
> >> Raslan Darawsheh
Ferruh Yigit June 16, 2020, 4:53 p.m. UTC | #7 
On 6/16/2020 5:23 PM, Matan Azrad wrote:
> 
> 
> From: Ferruh Yigit
>> On 6/16/2020 5:06 PM, Matan Azrad wrote:
>>> Hi
>>>
>>> Ferruh, Raslan
>>>
>>> This patch is not a fix, we don't need to backport it.
>>
>> Why not backport it?
> 
> There is no a bug fix.
> The behavior will not be changed.
> 
> It is just for comfort.

It is not fix in the functionality, yes. But since it is merged into master, why
not backport it, backporting reduces possible conflicts in related code later.

Also if this increases the readability of the code, why not stable trees benefit
from it too?

> 
> 
>  
>>> I don't think we need fixes and cc stable here.
>>>
>>> Matan
>>>
>>> From: Raslan Darawsheh
>>>> Hi,
>>>>
>>>>> -----Original Message-----
>>>>> From: Ferruh Yigit <ferruh.yigit@intel.com>
>>>>> Sent: Tuesday, June 16, 2020 1:28 PM
>>>>> To: Dekel Peled <dekelp@mellanox.com>; Matan Azrad
>>>>> <matan@mellanox.com>; Slava Ovsiienko
>> <viacheslavo@mellanox.com>;
>>>>> Raslan Darawsheh <rasland@mellanox.com>
>>>>> Cc: dev@dpdk.org
>>>>> Subject: Re: [dpdk-dev] [PATCH] net/mlx5: move GTP mask define to
>>>>> correct location
>>>>>
>>>>> On 6/10/2020 2:25 PM, Dekel Peled wrote:
>>>>>> Recent patch [1] added definition of mask MLX5_GTP_FLAGS_MASK,
>> just
>>>>>> above function flow_dv_validate_item_gtp(), where it is used.
>>>>>>
>>>>>> Patch was applied together with other patches which modified the
>>>>>> same file, so the mask was located further away from the function
>>>>>> it is used in.
>>>>>>
>>>>>> This patch moves the mask definition to the proper location.
>>>>>>
>>>>>> Signed-off-by: Dekel Peled <dekelp@mellanox.com>
>>>>>> Acked-by: Matan Azrad <matan@mellanox.com>
>>>>>>
>>>>>> [1] Commit 563ac307a46b ("net/mlx5: support match on GTP flags")
>>>>>
>>>>>
>>>>> Better to add this as 'Fixes', instead of reference, so this way it
>>>>> helps for the backporting etc..
>>>>>
>>>>>     Fixes: b88341ca35fc ("net/mlx5: convert flow dev handle to indexed")
>>>>>     Cc: stable@dpdk.org
>>>>
>>>> I'll change it in next-net-mlx accordingly,
>>>>
>>>> Kindest regards,
>>>> Raslan Darawsheh
>
Matan Azrad June 17, 2020, 11:43 a.m. UTC | #8 
From: Ferruh Yigit:
> On 6/16/2020 5:23 PM, Matan Azrad wrote:
> >
> >
> > From: Ferruh Yigit
> >> On 6/16/2020 5:06 PM, Matan Azrad wrote:
> >>> Hi
> >>>
> >>> Ferruh, Raslan
> >>>
> >>> This patch is not a fix, we don't need to backport it.
> >>
> >> Why not backport it?
> >
> > There is no a bug fix.
> > The behavior will not be changed.
> >
> > It is just for comfort.
> 
> It is not fix in the functionality, yes. But since it is merged into master, why
> not backport it, backporting reduces possible conflicts in related code later.

We can say it for any patch in master.
 
> Also if this increases the readability of the code, why not stable trees benefit
> from it too?

It is not too important in some cases, therefore doesn't worth the potential effort of backporting.

I think this is grey case, maybe one thing we can let the maintainer to decide...

I will not insist...

> >>> I don't think we need fixes and cc stable here.
> >>>
> >>> Matan
> >>>
> >>> From: Raslan Darawsheh
> >>>> Hi,
> >>>>
> >>>>> -----Original Message-----
> >>>>> From: Ferruh Yigit <ferruh.yigit@intel.com>
> >>>>> Sent: Tuesday, June 16, 2020 1:28 PM
> >>>>> To: Dekel Peled <dekelp@mellanox.com>; Matan Azrad
> >>>>> <matan@mellanox.com>; Slava Ovsiienko
> >> <viacheslavo@mellanox.com>;
> >>>>> Raslan Darawsheh <rasland@mellanox.com>
> >>>>> Cc: dev@dpdk.org
> >>>>> Subject: Re: [dpdk-dev] [PATCH] net/mlx5: move GTP mask define to
> >>>>> correct location
> >>>>>
> >>>>> On 6/10/2020 2:25 PM, Dekel Peled wrote:
> >>>>>> Recent patch [1] added definition of mask
> MLX5_GTP_FLAGS_MASK,
> >> just
> >>>>>> above function flow_dv_validate_item_gtp(), where it is used.
> >>>>>>
> >>>>>> Patch was applied together with other patches which modified the
> >>>>>> same file, so the mask was located further away from the function
> >>>>>> it is used in.
> >>>>>>
> >>>>>> This patch moves the mask definition to the proper location.
> >>>>>>
> >>>>>> Signed-off-by: Dekel Peled <dekelp@mellanox.com>
> >>>>>> Acked-by: Matan Azrad <matan@mellanox.com>
> >>>>>>
> >>>>>> [1] Commit 563ac307a46b ("net/mlx5: support match on GTP flags")
> >>>>>
> >>>>>
> >>>>> Better to add this as 'Fixes', instead of reference, so this way
> >>>>> it helps for the backporting etc..
> >>>>>
> >>>>>     Fixes: b88341ca35fc ("net/mlx5: convert flow dev handle to
> indexed")
> >>>>>     Cc: stable@dpdk.org
> >>>>
> >>>> I'll change it in next-net-mlx accordingly,
> >>>>
> >>>> Kindest regards,
> >>>> Raslan Darawsheh
> >
Kevin Traynor June 17, 2020, 12:59 p.m. UTC | #9 
On 17/06/2020 12:43, Matan Azrad wrote:
> 
> 
> From: Ferruh Yigit:
>> On 6/16/2020 5:23 PM, Matan Azrad wrote:
>>>
>>>
>>> From: Ferruh Yigit
>>>> On 6/16/2020 5:06 PM, Matan Azrad wrote:
>>>>> Hi
>>>>>
>>>>> Ferruh, Raslan
>>>>>
>>>>> This patch is not a fix, we don't need to backport it.
>>>>
>>>> Why not backport it?
>>>
>>> There is no a bug fix.
>>> The behavior will not be changed.
>>>
>>> It is just for comfort.
>>
>> It is not fix in the functionality, yes. But since it is merged into master, why
>> not backport it, backporting reduces possible conflicts in related code later.
> 
> We can say it for any patch in master.
>  
>> Also if this increases the readability of the code, why not stable trees benefit
>> from it too?
> 
> It is not too important in some cases, therefore doesn't worth the potential effort of backporting.
> 
> I think this is grey case, maybe one thing we can let the maintainer to decide...
> 
> I will not insist...
> 

In this case it is changing a "non-fix" commit in v20.05. So, in reality
it's not relevant to existing maintained stable branches with or without
the tag.

Wrt letting stable maintainer decide, in general stable maintainer won't
look at patches without the tags, so better to tag if there's a doubt.

>>>>> I don't think we need fixes and cc stable here.
>>>>>
>>>>> Matan
>>>>>
>>>>> From: Raslan Darawsheh
>>>>>> Hi,
>>>>>>
>>>>>>> -----Original Message-----
>>>>>>> From: Ferruh Yigit <ferruh.yigit@intel.com>
>>>>>>> Sent: Tuesday, June 16, 2020 1:28 PM
>>>>>>> To: Dekel Peled <dekelp@mellanox.com>; Matan Azrad
>>>>>>> <matan@mellanox.com>; Slava Ovsiienko
>>>> <viacheslavo@mellanox.com>;
>>>>>>> Raslan Darawsheh <rasland@mellanox.com>
>>>>>>> Cc: dev@dpdk.org
>>>>>>> Subject: Re: [dpdk-dev] [PATCH] net/mlx5: move GTP mask define to
>>>>>>> correct location
>>>>>>>
>>>>>>> On 6/10/2020 2:25 PM, Dekel Peled wrote:
>>>>>>>> Recent patch [1] added definition of mask
>> MLX5_GTP_FLAGS_MASK,
>>>> just
>>>>>>>> above function flow_dv_validate_item_gtp(), where it is used.
>>>>>>>>
>>>>>>>> Patch was applied together with other patches which modified the
>>>>>>>> same file, so the mask was located further away from the function
>>>>>>>> it is used in.
>>>>>>>>
>>>>>>>> This patch moves the mask definition to the proper location.
>>>>>>>>
>>>>>>>> Signed-off-by: Dekel Peled <dekelp@mellanox.com>
>>>>>>>> Acked-by: Matan Azrad <matan@mellanox.com>
>>>>>>>>
>>>>>>>> [1] Commit 563ac307a46b ("net/mlx5: support match on GTP flags")
>>>>>>>
>>>>>>>
>>>>>>> Better to add this as 'Fixes', instead of reference, so this way
>>>>>>> it helps for the backporting etc..
>>>>>>>
>>>>>>>     Fixes: b88341ca35fc ("net/mlx5: convert flow dev handle to
>> indexed")
>>>>>>>     Cc: stable@dpdk.org
>>>>>>
>>>>>> I'll change it in next-net-mlx accordingly,
>>>>>>
>>>>>> Kindest regards,
>>>>>> Raslan Darawsheh
>>>
>
diff mbox series

Patch

diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index 81f5bd4..d645d2d 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -1639,18 +1639,6 @@  struct field_modify_info modify_tcp[] = {
 	return 0;
 }
 
-/*
- * GTP flags are contained in 1 byte of the format:
- * -------------------------------------------
- * | bit   | 0 - 2   | 3  | 4   | 5 | 6 | 7  |
- * |-----------------------------------------|
- * | value | Version | PT | Res | E | S | PN |
- * -------------------------------------------
- *
- * Matching is supported only for GTP flags E, S, PN.
- */
-#define MLX5_GTP_FLAGS_MASK	0x07
-
 /**
  * Validate VLAN item.
  *
@@ -1724,6 +1712,18 @@  struct field_modify_info modify_tcp[] = {
 	return 0;
 }
 
+/*
+ * GTP flags are contained in 1 byte of the format:
+ * -------------------------------------------
+ * | bit   | 0 - 2   | 3  | 4   | 5 | 6 | 7  |
+ * |-----------------------------------------|
+ * | value | Version | PT | Res | E | S | PN |
+ * -------------------------------------------
+ *
+ * Matching is supported only for GTP flags E, S, PN.
+ */
+#define MLX5_GTP_FLAGS_MASK	0x07
+
 /**
  * Validate GTP item.
  *