patch 'net/ice: fix VLAN mode parser' has been queued to stable release 21.11.5

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.5

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 07/25/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://github.com/kevintraynor/dpdk-stable

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/d127ef307794fd89bf40bbfce84c244c6b27fc68

Thanks.

Kevin

---
>From d127ef307794fd89bf40bbfce84c244c6b27fc68 Mon Sep 17 00:00:00 2001
From: Qiming Yang <qiming.yang at intel.com>
Date: Sun, 25 Jun 2023 08:23:08 +0000
Subject: [PATCH] net/ice: fix VLAN mode parser

[ upstream commit ac1926f641812d4033e320157d0c458f8fbee372 ]

Parser will not be created if raw packet filter is not support.
This patch add NULL pointer check for parser structure when VLAN
mode configure.

Fixes: 6e753d777ffc ("net/ice: initialize parser for double VLAN")

Signed-off-by: Qiming Yang <qiming.yang at intel.com>
Acked-by: Qi Zhang <qi.z.zhang at intel.com>
---
 drivers/net/ice/ice_generic_flow.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ice/ice_generic_flow.c b/drivers/net/ice/ice_generic_flow.c
index 705c3bee4c..4bd0dce0ac 100644
--- a/drivers/net/ice/ice_generic_flow.c
+++ b/drivers/net/ice/ice_generic_flow.c
@@ -1830,8 +1830,10 @@ ice_flow_init(struct ice_adapter *ad)
 		PMD_INIT_LOG(WARNING, "Failed to initialize DDP parser, raw packet filter will not be supported");
 
-	if (ice_is_dvm_ena(&ad->hw))
-		ice_parser_dvm_set(ad->psr, true);
-	else
-		ice_parser_dvm_set(ad->psr, false);
+	if (ad->psr) {
+		if (ice_is_dvm_ena(&ad->hw))
+			ice_parser_dvm_set(ad->psr, true);
+		else
+			ice_parser_dvm_set(ad->psr, false);
+	}
 
 	RTE_TAILQ_FOREACH_SAFE(engine, &engine_list, node, temp) {
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-07-20 16:18:10.348294215 +0100
+++ 0128-net-ice-fix-VLAN-mode-parser.patch	2023-07-20 16:17:55.186752652 +0100
@@ -1 +1 @@
-From ac1926f641812d4033e320157d0c458f8fbee372 Mon Sep 17 00:00:00 2001
+From d127ef307794fd89bf40bbfce84c244c6b27fc68 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit ac1926f641812d4033e320157d0c458f8fbee372 ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -20 +21 @@
-index ed3075d555..91bf1d6fcb 100644
+index 705c3bee4c..4bd0dce0ac 100644
@@ -23 +24 @@
-@@ -1837,8 +1837,10 @@ ice_flow_init(struct ice_adapter *ad)
+@@ -1830,8 +1830,10 @@ ice_flow_init(struct ice_adapter *ad)