patch 'net/nfp: remove unneeded logic for VLAN layer' has been queued to stable release 23.11.2

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 23.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 08/14/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=ea7085704a60700fc259763e1414beffa8ee3cfc

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From ea7085704a60700fc259763e1414beffa8ee3cfc Mon Sep 17 00:00:00 2001
From: Peng Zhang <peng.zhang at corigine.com>
Date: Mon, 24 Jun 2024 09:57:20 +0800
Subject: [PATCH] net/nfp: remove unneeded logic for VLAN layer
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit c3cf736fb9f77ffb1ce841c5fca26522e2d5fd9e ]

The logic in NFDk datapath can make sure there only one layer VLAN,
so remove the unneeded logic here and make it clean and easy to
understand.

Fixes: 7c82b8626af8 ("net/nfp: support VLAN insert with NFDk")

Signed-off-by: Peng Zhang <peng.zhang at corigine.com>
Reviewed-by: Chaoyong He <chaoyong.he at corigine.com>
Reviewed-by: Long Wu <long.wu at corigine.com>
---
 drivers/net/nfp/nfdk/nfp_nfdk_dp.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c
index 6a9e7ec042..772c847b9d 100644
--- a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c
+++ b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c
@@ -178,7 +178,6 @@ nfp_net_nfdk_set_meta_data(struct rte_mbuf *pkt,
 	uint32_t cap_extend;
 	struct nfp_net_hw *hw;
 	uint32_t header_offset;
-	uint8_t vlan_layer = 0;
 	uint8_t ipsec_layer = 0;
 	struct nfp_net_meta_raw meta_data;
 
@@ -223,13 +222,8 @@ nfp_net_nfdk_set_meta_data(struct rte_mbuf *pkt,
 			meta += NFP_NET_META_FIELD_SIZE) {
 		switch (meta_type & NFP_NET_META_FIELD_MASK) {
 		case NFP_NET_META_VLAN:
-			if (vlan_layer > 0) {
-				PMD_DRV_LOG(ERR, "At most 1 layers of vlan is supported");
-				return -EINVAL;
-			}
 
 			nfp_net_set_meta_vlan(&meta_data, pkt, layer);
-			vlan_layer++;
 			break;
 		case NFP_NET_META_IPSEC:
 			if (ipsec_layer > 2) {
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-08-12 20:44:05.743014142 +0800
+++ 0101-net-nfp-remove-unneeded-logic-for-VLAN-layer.patch	2024-08-12 20:44:02.385069351 +0800
@@ -1 +1 @@
-From c3cf736fb9f77ffb1ce841c5fca26522e2d5fd9e Mon Sep 17 00:00:00 2001
+From ea7085704a60700fc259763e1414beffa8ee3cfc Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit c3cf736fb9f77ffb1ce841c5fca26522e2d5fd9e ]
@@ -11 +13,0 @@
-Cc: stable at dpdk.org
@@ -21 +23 @@
-index 3ba97e23a9..8b8c191b82 100644
+index 6a9e7ec042..772c847b9d 100644
@@ -24,2 +26,2 @@
-@@ -180,7 +180,6 @@ nfp_net_nfdk_set_meta_data(struct rte_mbuf *pkt,
- 	uint32_t meta_type;
+@@ -178,7 +178,6 @@ nfp_net_nfdk_set_meta_data(struct rte_mbuf *pkt,
+ 	uint32_t cap_extend;
@@ -32 +34 @@
-@@ -223,12 +222,7 @@ nfp_net_nfdk_set_meta_data(struct rte_mbuf *pkt,
+@@ -223,13 +222,8 @@ nfp_net_nfdk_set_meta_data(struct rte_mbuf *pkt,
@@ -40 +42,2 @@
- 			nfp_net_meta_set_vlan(&meta_data, pkt, layer);
+ 
+ 			nfp_net_set_meta_vlan(&meta_data, pkt, layer);