From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 445231B429 for ; Fri, 23 Nov 2018 11:29:59 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 828433082AFA; Fri, 23 Nov 2018 10:29:58 +0000 (UTC) Received: from ktraynor.remote.csb (unknown [10.36.118.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 01D9E413C; Fri, 23 Nov 2018 10:29:56 +0000 (UTC) From: Kevin Traynor To: Ferruh Yigit Cc: Thomas Monjalon , dpdk stable Date: Fri, 23 Nov 2018 10:26:43 +0000 Message-Id: <20181123102713.17309-39-ktraynor@redhat.com> In-Reply-To: <20181123102713.17309-1-ktraynor@redhat.com> References: <20181123102713.17309-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Fri, 23 Nov 2018 10:29:58 +0000 (UTC) Subject: [dpdk-stable] patch 'ethdev: fix redundant function pointer check' has been queued to stable release 18.08.1 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: , X-List-Received-Date: Fri, 23 Nov 2018 10:29:59 -0000 Hi, FYI, your patch has been queued to stable release 18.08.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/29/18. 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. If the code is different (ie: not only metadata diffs), due for example to a change in context or macro names, please double check it. Thanks. Kevin Traynor --- >>From 52ed89a09e572a5f694cae107417e23b9404d6a3 Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Sun, 28 Oct 2018 01:46:50 +0000 Subject: [PATCH] ethdev: fix redundant function pointer check [ upstream commit 11745065a5b98957dc834b04a3b175c62ae8a70b ] RTE_FUNC_PTR_OR_ERR_RET() already does the `ethdev_uninit` NULL check. Fixes: e489007a411c ("ethdev: add generic create/destroy ethdev APIs") Signed-off-by: Ferruh Yigit Acked-by: Thomas Monjalon --- lib/librte_ethdev/rte_ethdev.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c index a20498711..07335a1d6 100644 --- a/lib/librte_ethdev/rte_ethdev.c +++ b/lib/librte_ethdev/rte_ethdev.c @@ -3542,9 +3542,8 @@ rte_eth_dev_destroy(struct rte_eth_dev *ethdev, RTE_FUNC_PTR_OR_ERR_RET(*ethdev_uninit, -EINVAL); - if (ethdev_uninit) { - ret = ethdev_uninit(ethdev); - if (ret) - return ret; - } + + ret = ethdev_uninit(ethdev); + if (ret) + return ret; if (rte_eal_process_type() == RTE_PROC_PRIMARY) -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-23 10:22:55.277802387 +0000 +++ 0039-ethdev-fix-redundant-function-pointer-check.patch 2018-11-23 10:22:54.000000000 +0000 @@ -1,12 +1,13 @@ -From 11745065a5b98957dc834b04a3b175c62ae8a70b Mon Sep 17 00:00:00 2001 +From 52ed89a09e572a5f694cae107417e23b9404d6a3 Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Sun, 28 Oct 2018 01:46:50 +0000 Subject: [PATCH] ethdev: fix redundant function pointer check +[ upstream commit 11745065a5b98957dc834b04a3b175c62ae8a70b ] + RTE_FUNC_PTR_OR_ERR_RET() already does the `ethdev_uninit` NULL check. Fixes: e489007a411c ("ethdev: add generic create/destroy ethdev APIs") -Cc: stable@dpdk.org Signed-off-by: Ferruh Yigit Acked-by: Thomas Monjalon @@ -15,10 +16,10 @@ 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c -index 9d3481389..36e5389b3 100644 +index a20498711..07335a1d6 100644 --- a/lib/librte_ethdev/rte_ethdev.c +++ b/lib/librte_ethdev/rte_ethdev.c -@@ -3648,9 +3648,8 @@ rte_eth_dev_destroy(struct rte_eth_dev *ethdev, +@@ -3542,9 +3542,8 @@ rte_eth_dev_destroy(struct rte_eth_dev *ethdev, RTE_FUNC_PTR_OR_ERR_RET(*ethdev_uninit, -EINVAL); - if (ethdev_uninit) { @@ -31,7 +32,7 @@ + if (ret) + return ret; - return rte_eth_dev_release_port(ethdev); + if (rte_eal_process_type() == RTE_PROC_PRIMARY) -- 2.19.0