patch 'net/nfp: do not set IPv6 flag in transport mode' has been queued to stable release 23.11.3

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 23.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/30/24. 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=23.11-staging

This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=0b75611d8ab73a141d4141de7ba56b927eb05414

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 0b75611d8ab73a141d4141de7ba56b927eb05414 Mon Sep 17 00:00:00 2001
From: Shihong Wang <shihong.wang at corigine.com>
Date: Mon, 14 Oct 2024 10:43:56 +0800
Subject: [PATCH] net/nfp: do not set IPv6 flag in transport mode
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 4f64ebdd41ce8bb60dba95589a5cc684fb9cb89c ]

The transport only encapsulates the security protocol header,
does not pay attention to the IP protocol type, and need not
to set the IPv6 flag.

Fixes: 3d21da66c06b ("net/nfp: create security session")

Signed-off-by: Shihong Wang <shihong.wang at corigine.com>
Reviewed-by: Long Wu <long.wu at corigine.com>
Reviewed-by: Peng Zhang <peng.zhang at corigine.com>
Reviewed-by: Chaoyong He <chaoyong.he at corigine.com>
---
 drivers/net/nfp/nfp_ipsec.c | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/drivers/net/nfp/nfp_ipsec.c b/drivers/net/nfp/nfp_ipsec.c
index b10cda570b..56f3777226 100644
--- a/drivers/net/nfp/nfp_ipsec.c
+++ b/drivers/net/nfp/nfp_ipsec.c
@@ -1053,20 +1053,9 @@ nfp_ipsec_msg_build(struct rte_eth_dev *eth_dev,

 		break;
 	case RTE_SECURITY_IPSEC_SA_MODE_TRANSPORT:
-		type = conf->ipsec.tunnel.type;
 		cfg->ctrl_word.mode = NFP_IPSEC_MODE_TRANSPORT;
-		if (type == RTE_SECURITY_IPSEC_TUNNEL_IPV4) {
-			memset(&cfg->src_ip, 0, sizeof(cfg->src_ip));
-			memset(&cfg->dst_ip, 0, sizeof(cfg->dst_ip));
-			cfg->ipv6 = 0;
-		} else if (type == RTE_SECURITY_IPSEC_TUNNEL_IPV6) {
-			memset(&cfg->src_ip, 0, sizeof(cfg->src_ip));
-			memset(&cfg->dst_ip, 0, sizeof(cfg->dst_ip));
-			cfg->ipv6 = 1;
-		} else {
-			PMD_DRV_LOG(ERR, "Unsupported address family!");
-			return -EINVAL;
-		}
+		memset(&cfg->src_ip, 0, sizeof(cfg->src_ip));
+		memset(&cfg->dst_ip, 0, sizeof(cfg->dst_ip));

 		break;
 	default:
--
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-11-11 14:23:10.506232932 +0800
+++ 0116-net-nfp-do-not-set-IPv6-flag-in-transport-mode.patch	2024-11-11 14:23:05.352192835 +0800
@@ -1 +1 @@
-From 4f64ebdd41ce8bb60dba95589a5cc684fb9cb89c Mon Sep 17 00:00:00 2001
+From 0b75611d8ab73a141d4141de7ba56b927eb05414 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 4f64ebdd41ce8bb60dba95589a5cc684fb9cb89c ]
@@ -11 +13,0 @@
-Cc: stable at dpdk.org
@@ -22 +24 @@
-index 647bc2bb6d..89116af1b2 100644
+index b10cda570b..56f3777226 100644
@@ -25 +27 @@
-@@ -1056,20 +1056,9 @@ nfp_ipsec_msg_build(struct rte_eth_dev *eth_dev,
+@@ -1053,20 +1053,9 @@ nfp_ipsec_msg_build(struct rte_eth_dev *eth_dev,