From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 8CDA7A0518 for ; Fri, 24 Jul 2020 14:00:38 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7D6231C010; Fri, 24 Jul 2020 14:00:38 +0200 (CEST) Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by dpdk.org (Postfix) with ESMTP id 56EC71C010 for ; Fri, 24 Jul 2020 14:00:37 +0200 (CEST) Received: by mail-wr1-f65.google.com with SMTP id r2so2980992wrs.8 for ; Fri, 24 Jul 2020 05:00:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MvX572YM12HDVsKlpIDlHxGoYSehoag222heCkw2gVU=; b=iFqb5qQS5631GZWWnEK24ruWKSRFJLT/m4BB5YreRqoeFJvDtagwaQlfhMC/XuFN3Q Q0R+VSMOjiAjeRzIgmTrZO+BJ811txnJc0XtwaQW1IXm8SsTiRGyTCGmGRDPNunHAwt4 jVOg9b/RtG0PNIagj3SLRvJC8vOpTZrKrPH75sWwiaQQaTwf1I4YGIIifJSttX/mMuI4 ZuAgr3uMSPz8lXnU1RTXIVRCJEa0eycklTQwXe0NGbViOBEUzxZmSgWCF38Fk3/i0R5V xPtvcefW4zQrtcW/hOrt+U0tHlIZF+2JSIwrxQrX7aH30tOIpvkzTSD02UYeaQwAN2xo 04cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MvX572YM12HDVsKlpIDlHxGoYSehoag222heCkw2gVU=; b=idO/z2GdunOpIY6d5zzMRFSmWmYNjoftJ6nDqFnLQ0Ol4L8EklMH4keCgEUk0KCSWM BQKmlk6eBG0zu5PFOLqeqO7/UB7VE7LoQ5G5NF5TgNAwdzVeqLkpDshp2k8Q2eKrMU0S Zo+wLPCXZQ2sjl5akvxDAHd9l46Qpj/4QkHSJ75XhPyBF8hCT9PuBKzknGJkHgOuQ+u5 eDdazKlqaG/0Hy9iAH1Im7M221uYDEWT4LXh71fDhHqy37wafpIseTaQp9julrViEhUW ecx3xTVWpW+wXOESA+evS3gBmQoTTXbjZnUB9VAR1rlnZHPwJIxAFk/+DULiNXoZE9eV qlOw== X-Gm-Message-State: AOAM5334gZ+TJQX7ZIdCPIViYxL5pOg+qTKYfEGcYDobzH6G1rxpvBrs ROv4sF8k83T6wGi9qb5ja/w= X-Google-Smtp-Source: ABdhPJyhxxfbRMShqj3ouH493/xjQ9nRiVkxzhqxVGmz8ztFJ4c5pmUFonFOX3Ga2Sa4M6G6BO+cDQ== X-Received: by 2002:a05:6000:18a:: with SMTP id p10mr7701861wrx.33.1595592037029; Fri, 24 Jul 2020 05:00:37 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id n12sm373921wrg.77.2020.07.24.05.00.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 05:00:36 -0700 (PDT) From: luca.boccassi@gmail.com To: Wei Zhao Cc: Qimai Xiao , Qi Zhang , dpdk stable Date: Fri, 24 Jul 2020 12:57:20 +0100 Message-Id: <20200724120030.1863487-2-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200724120030.1863487-1-luca.boccassi@gmail.com> References: <20200724120030.1863487-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/ice: fix switch action number check' has been queued to stable release 19.11.4 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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.4 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/26/20. 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. Thanks. Luca Boccassi --- >From 47be9745de536a89775543f98112b600f9653d95 Mon Sep 17 00:00:00 2001 From: Wei Zhao Date: Thu, 21 May 2020 15:34:11 +0800 Subject: [PATCH] net/ice: fix switch action number check [ upstream commit 59d3870c7facace93db794a37e136d4a9f6ef0a3 ] The action number for switch filter should be 1, any other such as 0 or more than 1 is invalid. Fixes: 3428c6b6ec1f ("net/ice: add action number check for switch") Signed-off-by: Wei Zhao Tested-by: Qimai Xiao Acked-by: Qi Zhang --- drivers/net/ice/ice_switch_filter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ice/ice_switch_filter.c b/drivers/net/ice/ice_switch_filter.c index 6c2473163..b00ac2abe 100644 --- a/drivers/net/ice/ice_switch_filter.c +++ b/drivers/net/ice/ice_switch_filter.c @@ -1028,7 +1028,7 @@ ice_switch_check_action(const struct rte_flow_action *actions, } } - if (actions_num > 1) { + if (actions_num != 1) { rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ACTION, actions, -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-07-24 12:53:48.667982112 +0100 +++ 0002-net-ice-fix-switch-action-number-check.patch 2020-07-24 12:53:48.131003553 +0100 @@ -1,13 +1,14 @@ -From 59d3870c7facace93db794a37e136d4a9f6ef0a3 Mon Sep 17 00:00:00 2001 +From 47be9745de536a89775543f98112b600f9653d95 Mon Sep 17 00:00:00 2001 From: Wei Zhao Date: Thu, 21 May 2020 15:34:11 +0800 Subject: [PATCH] net/ice: fix switch action number check +[ upstream commit 59d3870c7facace93db794a37e136d4a9f6ef0a3 ] + The action number for switch filter should be 1, any other such as 0 or more than 1 is invalid. Fixes: 3428c6b6ec1f ("net/ice: add action number check for switch") -Cc: stable@dpdk.org Signed-off-by: Wei Zhao Tested-by: Qimai Xiao @@ -17,10 +18,10 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ice/ice_switch_filter.c b/drivers/net/ice/ice_switch_filter.c -index dd3f4847a..20e8187d3 100644 +index 6c2473163..b00ac2abe 100644 --- a/drivers/net/ice/ice_switch_filter.c +++ b/drivers/net/ice/ice_switch_filter.c -@@ -1388,7 +1388,7 @@ ice_switch_check_action(const struct rte_flow_action *actions, +@@ -1028,7 +1028,7 @@ ice_switch_check_action(const struct rte_flow_action *actions, } }