[dpdk-stable] patch 'net/enic: fix filter log message' has been queued to stable release 19.11.7

[Christian Ehrhardt]

Hi,

FYI, your patch has been queued to stable release 19.11.7

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/10/21. 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/cpaelzer/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/d0ddc85f5db5e57a2102e68051819a6bf03d2bf2

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From d0ddc85f5db5e57a2102e68051819a6bf03d2bf2 Mon Sep 17 00:00:00 2001
From: Hyong Youb Kim <hyonkim at cisco.com>
Date: Thu, 4 Feb 2021 17:35:03 -0800
Subject: [PATCH] net/enic: fix filter log message

[ upstream commit 89ce72c6ffb4337273bb292dc419511f1d619879 ]

A debug message for filter API is using a wrong flag. Use the correct
one.

Fixes: 936a9b9975e7 ("net/enic: flow API debug")

Reported-by: Hanoch Haim <hhaim at cisco.com>
Signed-off-by: Hyong Youb Kim <hyonkim at cisco.com>
Reviewed-by: John Daley <johndale at cisco.com>
---
 drivers/net/enic/enic_flow.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/enic/enic_flow.c b/drivers/net/enic/enic_flow.c
index d8ba35e055..a845dd4b41 100644
--- a/drivers/net/enic/enic_flow.c
+++ b/drivers/net/enic/enic_flow.c
@@ -1389,7 +1389,7 @@ enic_dump_filter(const struct filter_v2 *filt)
 
 		if (gp->mask_flags & FILTER_GENERIC_1_IPV6)
 			sprintf(ip6, "%s ",
-				(gp->val_flags & FILTER_GENERIC_1_IPV4)
+				(gp->val_flags & FILTER_GENERIC_1_IPV6)
 				 ? "ip6(y)" : "ip6(n)");
 		else
 			sprintf(ip6, "%s ", "ip6(x)");
-- 
2.30.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-02-08 12:04:30.104098910 +0100
+++ 0015-net-enic-fix-filter-log-message.patch	2021-02-08 12:04:29.555496794 +0100
@@ -1 +1 @@
-From 89ce72c6ffb4337273bb292dc419511f1d619879 Mon Sep 17 00:00:00 2001
+From d0ddc85f5db5e57a2102e68051819a6bf03d2bf2 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 89ce72c6ffb4337273bb292dc419511f1d619879 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -20 +21 @@
-index 7eb06f889e..cdfdc904a6 100644
+index d8ba35e055..a845dd4b41 100644
@@ -23 +24 @@
-@@ -1392,7 +1392,7 @@ enic_dump_filter(const struct filter_v2 *filt)
+@@ -1389,7 +1389,7 @@ enic_dump_filter(const struct filter_v2 *filt)