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 3D17DA0518 for ; Fri, 24 Jul 2020 14:02:47 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 332F01C010; Fri, 24 Jul 2020 14:02:47 +0200 (CEST) Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by dpdk.org (Postfix) with ESMTP id 4CFE51C010 for ; Fri, 24 Jul 2020 14:02:46 +0200 (CEST) Received: by mail-wm1-f66.google.com with SMTP id t142so1669922wmt.4 for ; Fri, 24 Jul 2020 05:02:46 -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=mY1lPd8szkoxkRmwkApm1e49MDU49lGWDqf9mBwBwGg=; b=F0kwNsVEhJ3MGwBWao1htEddjCBjlTou1WzQ3iETmEYJDXuC5cG9JvcLGlAcIMIVwT 9jFBKOubBI27ijzw7UJ+OUsDA24+kfCpDMUiAKeC8vgcz5lebaEoh/MxMsG00griyBWW F2HzLYEid4JdidUaTXnta/UWB7rp4iQy/TIsAfVzjzVT/dQzd1Ce4iXdPbYLvLwKnBSu 6gL8Na5y2wemFFvwud7MCIfHPLYrVNLEGYbntjYAM99xUX6ah1OOi5mOKm+jALM5rTLE DcHTFO+DiSswNpWc/jLoOVj93bEE3kTKgztC6xk0GklKVdspJ66r4//H9JjDRSbAa6NB 33ag== 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=mY1lPd8szkoxkRmwkApm1e49MDU49lGWDqf9mBwBwGg=; b=pxXPRi74tu0XM8/JX3iVi8bYFPkNxsUs22s164j1QVlzNqMvsSxjnp7IreCTN7t1tT GdDKBR5aNg6sKuSx5GaU9nxKriAYVHDICjCxr8yf6xcdKL4pOJERkqbQj1C3fXzo1GEK EJHDWV239N5u34dMp0jGzmN/blp6sGjcSnyrNNxOAYGlwqVMQ/xjUnrVYv5jQaE5L5ds jUmKhP3hrsQ1ow4DYS7pl01rp198nG3S853TU7imQBGz3dfSP5ZNMi32K6mn/S+at32o aH+RaVN5BOrcgIXffdL+JuaMNgsHk/v3fSKyFLF2ZaQvI+gxuAWUcetq6qosUQWec5pA wkRQ== X-Gm-Message-State: AOAM530QafMM0Ea7CSSo+bGGHBgp9s2/vghL7Q9/pLUTt1zWFiTISUFQ v9oDpKE2wXPeslVZUE1SgJE0DcLn3EYyMg== X-Google-Smtp-Source: ABdhPJycOdsd2TcuMJnAKyMDgP01YIpUUrsFHGlz7cW1TvaS+X2PUU5DBH8GSwraBSzKMAJL588qOA== X-Received: by 2002:a1c:9cd4:: with SMTP id f203mr8890485wme.155.1595592166063; Fri, 24 Jul 2020 05:02:46 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id v1sm1064867wro.83.2020.07.24.05.02.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 05:02:44 -0700 (PDT) From: luca.boccassi@gmail.com To: Qi Zhang Cc: Kiran Patil , Paul M Stillwell Jr , Qiming Yang , dpdk stable Date: Fri, 24 Jul 2020 12:57:53 +0100 Message-Id: <20200724120030.1863487-35-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/base: fix return value' 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 91525a17efb3b86a0c153bf9246f4e2a0214add3 Mon Sep 17 00:00:00 2001 From: Qi Zhang Date: Mon, 15 Jun 2020 10:04:57 +0800 Subject: [PATCH] net/ice/base: fix return value [ upstream commit 4f13a6735fd60587c9c6ae93414b6df01c833214 ] Function ice_rem_adv_rule_id return incorrect error code (ICE_ERR_PARAM) whereas it should have returned ICE_ERR_DOES_NOT_EXIST return code if filter list is empty or unable to find "rule" in list Fixes: f89aa3affa9e ("net/ice/base: support removing advanced rule") Signed-off-by: Kiran Patil Signed-off-by: Paul M Stillwell Jr Signed-off-by: Qi Zhang Acked-by: Qiming Yang --- drivers/net/ice/base/ice_switch.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ice/base/ice_switch.c b/drivers/net/ice/base/ice_switch.c index 34d0a164e..72b04f84f 100644 --- a/drivers/net/ice/base/ice_switch.c +++ b/drivers/net/ice/base/ice_switch.c @@ -6487,7 +6487,8 @@ ice_rem_adv_rule_by_id(struct ice_hw *hw, list_itr->lkups_cnt, &rinfo); } } - return ICE_ERR_PARAM; + /* either list is empty or unable to find rule */ + return ICE_ERR_DOES_NOT_EXIST; } /** -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-07-24 12:53:49.960154745 +0100 +++ 0035-net-ice-base-fix-return-value.patch 2020-07-24 12:53:48.239005565 +0100 @@ -1,14 +1,15 @@ -From 4f13a6735fd60587c9c6ae93414b6df01c833214 Mon Sep 17 00:00:00 2001 +From 91525a17efb3b86a0c153bf9246f4e2a0214add3 Mon Sep 17 00:00:00 2001 From: Qi Zhang Date: Mon, 15 Jun 2020 10:04:57 +0800 Subject: [PATCH] net/ice/base: fix return value +[ upstream commit 4f13a6735fd60587c9c6ae93414b6df01c833214 ] + Function ice_rem_adv_rule_id return incorrect error code (ICE_ERR_PARAM) whereas it should have returned ICE_ERR_DOES_NOT_EXIST return code if filter list is empty or unable to find "rule" in list Fixes: f89aa3affa9e ("net/ice/base: support removing advanced rule") -Cc: stable@dpdk.org Signed-off-by: Kiran Patil Signed-off-by: Paul M Stillwell Jr @@ -19,10 +20,10 @@ 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ice/base/ice_switch.c b/drivers/net/ice/base/ice_switch.c -index 01dcace55..5c53b9ec3 100644 +index 34d0a164e..72b04f84f 100644 --- a/drivers/net/ice/base/ice_switch.c +++ b/drivers/net/ice/base/ice_switch.c -@@ -7661,7 +7661,8 @@ ice_rem_adv_rule_by_id(struct ice_hw *hw, +@@ -6487,7 +6487,8 @@ ice_rem_adv_rule_by_id(struct ice_hw *hw, list_itr->lkups_cnt, &rinfo); } }