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 159F8A0C3F for ; Sat, 12 Jun 2021 01:08:06 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0BAB44003F; Sat, 12 Jun 2021 01:08:06 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2045.outbound.protection.outlook.com [40.107.244.45]) by mails.dpdk.org (Postfix) with ESMTP id 79A824003F for ; Sat, 12 Jun 2021 01:08:05 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VAQTsZsf49fVumCbvIDga3cCyEizbc3gdFeqWj17f/luh8qCD3lG2KhDOVljul3nTDeN5CfHHqHSh98uOCekQMvSqe/ranXMUFepWIfntwmmiMqaQpCehvPyGqgvpldk4dmTZJX0onazTKZcDHx6QIZTP6n5bg+kQfK7bkQZfEL2wMibaPCdV2OxJXnhHStpUWNkPjDf3stRwX/Pt4qOgzMYTxZ76+NChv8k3WjjjlulV4qnI8Ek/eNJdqeKx1dGlz3MshCQeUF9KWPhy7ZE7Cn8pqL52UfrZbpuSOgQHThrAPpGoces6KRlN8eOX3TZfvnhEjAll+rn5bkWyAvqkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=gpHG2L2wzD3i0CmqVdpMy5/tfDUbHQLa3LI50LC2RiY=; b=lTWJ1R8XomnPHEpAzAoUJZqjxSv6/hJPla6oWSZltCMERpd/p1oe9xQQ4mFIVSs2iZuIvrxa8jsfiAzyQ1gsOt2LeOM7zbzQ9/FEeJCFhoN1U0NGQJ28/f2VG4drg9w76gds7HfqmbZs82VvMXpv6p1IpHNjGHJRTdUpguuZU3LjJKaBvSGGfjlCnGG2/wDT0KIuse7L9DfmclWLwuFlMnJiupmb0nTtXvEDr0zyiyyA8JQxK3NXevBYWuax5+X3TCNyB2zTZsJWpZYR0zE42pfzgQpUCpHhBXI2vR22StXS+NL3Ca62SAauwrmTVb916l8x8/d8mOSxH9RniezyrQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=gpHG2L2wzD3i0CmqVdpMy5/tfDUbHQLa3LI50LC2RiY=; b=PQiR87no6N1XI+OKhYW5Ldgut3MDIC0JqGg+x6KyaZhIdZxV2DFbZBe0T82fl+UoAgdUtbW63ZFs1ws5J8HLdMQzWlt3uzLLej2PhhrTHgQSShJgBNmQo0bHXRtzntwNehwsylWFomTr/+481K4RncVa8A6OaYl346zoZME2dxX0b3zr5a8x0LV2uWRr9Zm4T5AAPC/nUwdy3EQVwX1H4R1vFxwLJutBMWYJoxhcoaIRi/qND30S3t+2RxjYYhb+u6lCwFY3P74/R4At62n0sqWl9mdWcpKOYkS8l1Ms/VeeZi7YXB7TrbRssw4jVFDOFDi3K4ttys7ZqlCCsfdXeQ== Received: from MW4PR04CA0343.namprd04.prod.outlook.com (2603:10b6:303:8a::18) by DM6PR12MB2890.namprd12.prod.outlook.com (2603:10b6:5:15e::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4195.23; Fri, 11 Jun 2021 23:08:02 +0000 Received: from CO1NAM11FT042.eop-nam11.prod.protection.outlook.com (2603:10b6:303:8a:cafe::cb) by MW4PR04CA0343.outlook.office365.com (2603:10b6:303:8a::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.20 via Frontend Transport; Fri, 11 Jun 2021 23:08:02 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by CO1NAM11FT042.mail.protection.outlook.com (10.13.174.250) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4219.21 via Frontend Transport; Fri, 11 Jun 2021 23:08:00 +0000 Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 11 Jun 2021 23:07:58 +0000 From: Xueming Li To: "Min Hu (Connor)" CC: Luca Boccassi , Haiyue Wang , dpdk stable Date: Sat, 12 Jun 2021 07:02:09 +0800 Message-ID: <20210611230433.8208-35-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210611230433.8208-1-xuemingl@nvidia.com> References: <20210510160258.30982-229-xuemingl@nvidia.com> <20210611230433.8208-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL105.nvidia.com (172.20.187.12) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 155808c6-51af-4c5c-e7aa-08d92d2dc23a X-MS-TrafficTypeDiagnostic: DM6PR12MB2890: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BRGoPWpZC7IFjs2IVzFtjk1PzCEhoEZMIjd0AlgAyODYFDcXA3ZmkuZ1s79vvU5lkt/Jtt4os71yC5wvhuGVQuz/uuS7PFhs1hkqbh1CQTZAvlnkN+RxdzJLT7R99kfIOCg8oJOIGKfFKXKuoU/5nAjca3K42LQ0wHp62K2fB8S+PTs1rykOOvr6v+CZnjKp3NwqxpzVjFdd3rN5fHPZFL+yfupZlRp/hJi0rdZciefS+xnQV5mqW06oNVRAduxIoiy04MhoLHKIwhi+4F0qaEHkjAJ93uNi5zU2j2XHC8BqZRdBNCaEAJRDroLwOGTGTDklVCnkPXnq00Kh29W9e/DYgosbZL0wDA9MZOwZHUYaLjJf9A7S68UjpgQ1BHHX5eAphIkbgLGFppVVklDEBs+BXu2qEFUCAdcUlXAeQb5WFOU8V3SpEysptdgKxjDaWpxDRc62EuYavaABgJVCFnHTiO5l9ubcY/NZ1kxibL0qwAuhbQsZZ9M4bpzk8noycZnIDKPfTCoTRU5BjfzvAuLwhMxXShOS9FAhFExvKUrJRn3Y35JNMj1AjBLKgkWDNQZQgB+unSBmWXvvXI8sWs4u41Gs7N0/BdeePmr1gQ60gKF2xRYh6/lpc0mp/trX4Z5m2lvUh1ABFwvItMpXY+tMJWA5lAUp1rEQsQDvDnuIuKq1QMyzPBQIF6AtO+hLZSKpldWYeokqnVkHWubXyW9qE17BzcbG95NVVubKM9tXJtSTivaio3s5JoIJ5eQ7Y4daQgWnXriyPB+TDdtgtWPqQFFxHDit9SbF/aYoEuzKVo5cieikKERguOufW1VB X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(376002)(346002)(39860400002)(136003)(396003)(36840700001)(46966006)(47076005)(2906002)(5660300002)(1076003)(186003)(36906005)(6666004)(15650500001)(36756003)(316002)(7636003)(86362001)(55016002)(26005)(2616005)(83380400001)(426003)(8676002)(54906003)(53546011)(336012)(16526019)(82310400003)(7696005)(36860700001)(4326008)(356005)(6916009)(478600001)(6286002)(70206006)(70586007)(82740400003)(966005)(8936002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2021 23:08:00.4044 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 155808c6-51af-4c5c-e7aa-08d92d2dc23a X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT042.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB2890 Subject: [dpdk-stable] patch 'net/e1000: fix flow error message object' has been queued to stable release 20.11.2 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 20.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/14/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/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/351bc3464542892813f8be3e284b5ea06ae05624 Thanks. Xueming Li --- >From 351bc3464542892813f8be3e284b5ea06ae05624 Mon Sep 17 00:00:00 2001 From: "Min Hu (Connor)" Date: Tue, 27 Apr 2021 16:51:21 +0800 Subject: [PATCH] net/e1000: fix flow error message object Cc: Luca Boccassi [ upstream commit 6705a69cee1db95a2ddf49e48b215da60f258174 ] This patch fixes parameter misuse when set rte flow action error. Fixes: c0688ef1eded ("net/igb: parse flow API n-tuple filter") Signed-off-by: Min Hu (Connor) Acked-by: Haiyue Wang --- drivers/net/e1000/igb_flow.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/e1000/igb_flow.c b/drivers/net/e1000/igb_flow.c index ccb184df95..55c36ff00f 100644 --- a/drivers/net/e1000/igb_flow.c +++ b/drivers/net/e1000/igb_flow.c @@ -350,7 +350,7 @@ cons_parse_ntuple_filter(const struct rte_flow_attr *attr, memset(filter, 0, sizeof(struct rte_eth_ntuple_filter)); rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ACTION, - item, "Not supported action."); + act, "Not supported action."); return -rte_errno; } filter->queue = -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-06-12 06:53:57.588280900 +0800 +++ 0035-net-e1000-fix-flow-error-message-object.patch 2021-06-12 06:53:56.180000000 +0800 @@ -1 +1 @@ -From 6705a69cee1db95a2ddf49e48b215da60f258174 Mon Sep 17 00:00:00 2001 +From 351bc3464542892813f8be3e284b5ea06ae05624 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit 6705a69cee1db95a2ddf49e48b215da60f258174 ] @@ -9 +11,0 @@ -Cc: stable@dpdk.org @@ -18 +20 @@ -index 33f6b1d6b3..e72376f69c 100644 +index ccb184df95..55c36ff00f 100644