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

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 20.11.1

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/11/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/bluca/dpdk-stable

This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/253c91a3342cd5608e05d28d5ffc2ff03b4728f9

Thanks.

Luca Boccassi

---
>From 253c91a3342cd5608e05d28d5ffc2ff03b4728f9 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 453c11a3b3..92b1c9eda6 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.29.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-02-09 10:34:59.003046719 +0000
+++ 0027-net-enic-fix-filter-log-message.patch	2021-02-09 10:34:57.942584623 +0000
@@ -1 +1 @@
-From 89ce72c6ffb4337273bb292dc419511f1d619879 Mon Sep 17 00:00:00 2001
+From 253c91a3342cd5608e05d28d5ffc2ff03b4728f9 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 453c11a3b3..92b1c9eda6 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)