From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id DBBFBA0547 for ; Mon, 8 Feb 2021 12:15:03 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 81AE71606E4; Mon, 8 Feb 2021 12:15:03 +0100 (CET) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id 8D12E40147 for ; Mon, 8 Feb 2021 12:15:01 +0100 (CET) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1l94VR-0001Ac-C6; Mon, 08 Feb 2021 11:15:01 +0000 From: Christian Ehrhardt To: Hyong Youb Kim Cc: Hanoch Haim , John Daley , dpdk stable Date: Mon, 8 Feb 2021 12:14:27 +0100 Message-Id: <20210208111429.1875789-15-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210208111429.1875789-1-christian.ehrhardt@canonical.com> References: <20210204112954.2488123-1-christian.ehrhardt@canonical.com> <20210208111429.1875789-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/enic: fix filter log message' has been queued to stable release 19.11.7 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" 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 --- >From d0ddc85f5db5e57a2102e68051819a6bf03d2bf2 Mon Sep 17 00:00:00 2001 From: Hyong Youb Kim 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 Signed-off-by: Hyong Youb Kim Reviewed-by: John Daley --- 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@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)