patch 'net/nfp: fix set TTL flow action' has been queued to stable release 22.11.2

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 22.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 04/11/23. 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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging

This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/log/?h=22.11-staging/commit/336d6c1c41f5a31c7d703496125e4e72b345f5d1

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 336d6c1c41f5a31c7d703496125e4e72b345f5d1 Mon Sep 17 00:00:00 2001
From: Chaoyong He <chaoyong.he at corigine.com>
Date: Tue, 21 Feb 2023 18:35:12 +0800
Subject: [PATCH] net/nfp: fix set TTL flow action
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 7b661f403fabbc7ac55785403cace34f8f6cf21d ]

The former logic of set TTL flow action don't consider the mask
filed of control message passed to the firmware.
This caused the firmware skip the set action logic, and the offloaded
packets don't have the right TTL as expected.

Fixes: ac12e126c482 ("net/nfp: support TTL flow action")

Signed-off-by: Chaoyong He <chaoyong.he at corigine.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund at corigine.com>
---
 drivers/net/nfp/nfp_flow.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c
index dedc2d2dc4..660a777e6d 100644
--- a/drivers/net/nfp/nfp_flow.c
+++ b/drivers/net/nfp/nfp_flow.c
@@ -2241,6 +2241,7 @@ nfp_flow_action_set_ttl(char *act_data,
 
 	ttl_conf = (const struct rte_flow_action_set_ttl *)action->conf;
 	ttl_tos->ipv4_ttl = ttl_conf->ttl_value;
+	ttl_tos->ipv4_ttl_mask = 0xff;
 	ttl_tos->reserved = 0;
 }
 
@@ -2264,6 +2265,7 @@ nfp_flow_action_set_hl(char *act_data,
 
 	ttl_conf = (const struct rte_flow_action_set_ttl *)action->conf;
 	tc_hl->ipv6_hop_limit = ttl_conf->ttl_value;
+	tc_hl->ipv6_hop_limit_mask = 0xff;
 	tc_hl->reserved = 0;
 }
 
-- 
2.25.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-04-09 21:45:39.891022400 +0800
+++ 0043-net-nfp-fix-set-TTL-flow-action.patch	2023-04-09 21:45:38.629042200 +0800
@@ -1 +1 @@
-From 7b661f403fabbc7ac55785403cace34f8f6cf21d Mon Sep 17 00:00:00 2001
+From 336d6c1c41f5a31c7d703496125e4e72b345f5d1 Mon Sep 17 00:00:00 2001
@@ -7,0 +8,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 7b661f403fabbc7ac55785403cace34f8f6cf21d ]
@@ -15 +17,0 @@
-Cc: stable at dpdk.org
@@ -24 +26 @@
-index 5be4c4f18a..77f249e2b9 100644
+index dedc2d2dc4..660a777e6d 100644
@@ -27 +29 @@
-@@ -2252,6 +2252,7 @@ nfp_flow_action_set_ttl(char *act_data,
+@@ -2241,6 +2241,7 @@ nfp_flow_action_set_ttl(char *act_data,
@@ -35 +37 @@
-@@ -2275,6 +2276,7 @@ nfp_flow_action_set_hl(char *act_data,
+@@ -2264,6 +2265,7 @@ nfp_flow_action_set_hl(char *act_data,