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 637C6A034C for ; Fri, 25 Feb 2022 18:17:02 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5D50441152; Fri, 25 Feb 2022 18:17:02 +0100 (CET) Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by mails.dpdk.org (Postfix) with ESMTP id 6500C410FD for ; Fri, 25 Feb 2022 18:17:01 +0100 (CET) Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id BFC653F1F3 for ; Fri, 25 Feb 2022 17:17:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1645809420; bh=bymKTMa/ukP8Fj91jeykLc9JCFyvhfIFDH0BffOpt1s=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=SFRYeX7pbvlLMrWTT8GG6S+xjfs9LZHVQftVWXT9R4oIue/KlaHLmGj/Y+YHXnijG KcXBLSPHJKKlfQX44Hamq1IDSWRbBx42uXZyxMIGZxSzxzHoT0NhpfdxF5yJfTC9+m N9GXt7RxszpftHDKPTLMkXqVyZC9XJUuB/WyBS3aagDccbF6Gje7ODWtoWBCVmPHNF 0BUGU1NckzUfglgLtw8fSpSqCNMTwTsT+gR+PJqHE+GxORxCRn7AdfO/NOzc9OPaNN scWJTZtCkSnigezK/XwUNFgytWkhsGpDyPRknf7USQhR3UwhX6m9BwFADistY+lt2k VKu3eUP8QfNgg== Received: by mail-wm1-f69.google.com with SMTP id r8-20020a05600c35c800b0038118108e71so1594774wmq.7 for ; Fri, 25 Feb 2022 09:17:00 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bymKTMa/ukP8Fj91jeykLc9JCFyvhfIFDH0BffOpt1s=; b=p0f9N80bTduhCbRe6u+G4SlIbBKeGWIMJfzc591sP3/2ZvNw/fZcr9qbT6GOKYuY0g o27oSpr72uwZZtySyE7btuOsZkpjO27+9WarWEtIOTN7WO/AAr2prHZsKj+qo+7+B1/0 sieK5yWe2xYci/F6xhxVRa8/otaT87JpHMaos4Sl9f0TSvMZdiN0mPY/xs3GkNn34+V0 kEfBCZbLWZP3zQjoSAenhYFJHMGwfWJU8FFCSVd8+goMbZ83S19zVd8ZOrkOhKEaZwlh bBolxWHXtflV247bx6AkRgUhLjhkDzlZ2Ly12GRIplNA84/nEQ4tSSt6krOljdiykV9G jlMg== X-Gm-Message-State: AOAM530fJ2lOfjXoz7vzW1j/LPii0CfsOyi4IqsmCT+pUe3oH+Dqvh7g trfH2UT/aJxvkUGlQ/mE2ckkIpqMhOeYpiacrm9rX8zOW80wurNgiD6HkfAqvGh0XHZXNInk36I QNxzoqXVgqQtQV6b1Uaky9ahp X-Received: by 2002:a7b:cd93:0:b0:381:141f:496b with SMTP id y19-20020a7bcd93000000b00381141f496bmr3519180wmj.171.1645809420133; Fri, 25 Feb 2022 09:17:00 -0800 (PST) X-Google-Smtp-Source: ABdhPJxbDmGnLcc4GcOiDnAtqlYfyMEX2FUBolHqWRSOi1xg0x13hcPz8vXYv8cC6BsbtLhX4XV2Gg== X-Received: by 2002:a7b:cd93:0:b0:381:141f:496b with SMTP id y19-20020a7bcd93000000b00381141f496bmr3519163wmj.171.1645809419907; Fri, 25 Feb 2022 09:16:59 -0800 (PST) Received: from Keschdeichel.fritz.box (068-133-067-156.ip-addr.inexio.net. [156.67.133.68]) by smtp.gmail.com with ESMTPSA id bj8-20020a0560001e0800b001edbf1b462asm2745162wrb.77.2022.02.25.09.16.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Feb 2022 09:16:59 -0800 (PST) From: christian.ehrhardt@canonical.com To: Huisong Li Cc: Min Hu , dpdk stable Subject: patch 'net/hns3: fix using enum as boolean' has been queued to stable release 19.11.12 Date: Fri, 25 Feb 2022 18:15:18 +0100 Message-Id: <20220225171550.3499040-25-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.35.0 In-Reply-To: <20220225171550.3499040-1-christian.ehrhardt@canonical.com> References: <20220225171550.3499040-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Hi, FYI, your patch has been queued to stable release 19.11.12 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/27/22. 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/ed0cc8521391bb800c2faad1812f48f45a362cb2 Thanks. Christian Ehrhardt --- >From ed0cc8521391bb800c2faad1812f48f45a362cb2 Mon Sep 17 00:00:00 2001 From: Huisong Li Date: Sat, 22 Jan 2022 09:51:29 +0800 Subject: [PATCH] net/hns3: fix using enum as boolean [ upstream commit 67d0b17947d6936147f4cbfff6ff938884f14776 ] The enum type variables cannot be used as bool variables. This patch fixes for "with->func" in hns3_action_rss_same(). Fixes: eb158fc756a5 ("net/hns3: fix config when creating RSS rule after flush") Signed-off-by: Huisong Li Acked-by: Min Hu (Connor) --- drivers/net/hns3/hns3_flow.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/hns3/hns3_flow.c b/drivers/net/hns3/hns3_flow.c index ad6f18ec68..ce6f37880a 100644 --- a/drivers/net/hns3/hns3_flow.c +++ b/drivers/net/hns3/hns3_flow.c @@ -1202,7 +1202,8 @@ hns3_action_rss_same(const struct rte_flow_action_rss *comp, if (comp->func == RTE_ETH_HASH_FUNCTION_MAX) func_is_same = false; else - func_is_same = (with->func ? (comp->func == with->func) : true); + func_is_same = (with->func != RTE_ETH_HASH_FUNCTION_DEFAULT) ? + (comp->func == with->func) : true; return (func_is_same && comp->types == (with->types & HNS3_ETH_RSS_SUPPORT) && -- 2.35.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-25 16:58:45.243862596 +0100 +++ 0025-net-hns3-fix-using-enum-as-boolean.patch 2022-02-25 16:58:44.232990405 +0100 @@ -1 +1 @@ -From 67d0b17947d6936147f4cbfff6ff938884f14776 Mon Sep 17 00:00:00 2001 +From ed0cc8521391bb800c2faad1812f48f45a362cb2 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 67d0b17947d6936147f4cbfff6ff938884f14776 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 5f2b279546..00084872ad 100644 +index ad6f18ec68..ce6f37880a 100644 @@ -22 +23 @@ -@@ -1251,7 +1251,8 @@ hns3_action_rss_same(const struct rte_flow_action_rss *comp, +@@ -1202,7 +1202,8 @@ hns3_action_rss_same(const struct rte_flow_action_rss *comp, @@ -26 +27 @@ -- func_is_same = with->func ? (comp->func == with->func) : true; +- func_is_same = (with->func ? (comp->func == with->func) : true);