From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id CCD072BD5 for ; Fri, 8 Mar 2019 18:49:37 +0100 (CET) Received: from Internal Mail-Server by MTLPINE1 (envelope-from yskoh@mellanox.com) with ESMTPS (AES256-SHA encrypted); 8 Mar 2019 19:49:34 +0200 Received: from scfae-sc-2.mti.labs.mlnx (scfae-sc-2.mti.labs.mlnx [10.101.0.96]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id x28HloBI002625; Fri, 8 Mar 2019 19:49:33 +0200 From: Yongseok Koh To: Andrew Rybchenko Cc: dpdk stable Date: Fri, 8 Mar 2019 09:47:40 -0800 Message-Id: <20190308174749.30771-62-yskoh@mellanox.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190308174749.30771-1-yskoh@mellanox.com> References: <20190308174749.30771-1-yskoh@mellanox.com> Subject: [dpdk-stable] patch 'ethdev: fix errno to have positive value' has been queued to LTS release 17.11.6 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, 08 Mar 2019 17:49:38 -0000 Hi, FYI, your patch has been queued to LTS release 17.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objection by 03/13/19. So please shout if anyone has objection. 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. Yongseok --- >>From 007575c26cf774b719a5c2c816f0c9e7ec61e1cf Mon Sep 17 00:00:00 2001 From: Andrew Rybchenko Date: Mon, 21 Jan 2019 16:18:35 +0000 Subject: [PATCH] ethdev: fix errno to have positive value [ backported from upstream commit 8e0c8dcf3507ae812f1abcd5247617917f131dae ] rte_errno should be set to positive value from errno.h plus few RTE-specific values. Fixes: 4fb7e803eb1a ("ethdev: add Tx preparation") Fixes: 439a90b5f2a7 ("ethdev: reorder inline functions") Signed-off-by: Andrew Rybchenko --- lib/librte_ether/rte_ethdev.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h index f252e4110..2ef53a636 100644 --- a/lib/librte_ether/rte_ethdev.h +++ b/lib/librte_ether/rte_ethdev.h @@ -3244,7 +3244,7 @@ rte_eth_tx_prepare(uint16_t port_id, uint16_t queue_id, #ifdef RTE_LIBRTE_ETHDEV_DEBUG if (!rte_eth_dev_is_valid_port(port_id)) { RTE_PMD_DEBUG_TRACE("Invalid TX port_id=%d\n", port_id); - rte_errno = -EINVAL; + rte_errno = EINVAL; return 0; } #endif @@ -3254,7 +3254,7 @@ rte_eth_tx_prepare(uint16_t port_id, uint16_t queue_id, #ifdef RTE_LIBRTE_ETHDEV_DEBUG if (queue_id >= dev->data->nb_tx_queues) { RTE_PMD_DEBUG_TRACE("Invalid TX queue_id=%d\n", queue_id); - rte_errno = -EINVAL; + rte_errno = EINVAL; return 0; } #endif -- 2.11.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-03-08 09:46:43.237729815 -0800 +++ 0062-ethdev-fix-errno-to-have-positive-value.patch 2019-03-08 09:46:40.327405000 -0800 @@ -1,37 +1,38 @@ -From 8e0c8dcf3507ae812f1abcd5247617917f131dae Mon Sep 17 00:00:00 2001 +From 007575c26cf774b719a5c2c816f0c9e7ec61e1cf Mon Sep 17 00:00:00 2001 From: Andrew Rybchenko Date: Mon, 21 Jan 2019 16:18:35 +0000 Subject: [PATCH] ethdev: fix errno to have positive value +[ backported from upstream commit 8e0c8dcf3507ae812f1abcd5247617917f131dae ] + rte_errno should be set to positive value from errno.h plus few RTE-specific values. Fixes: 4fb7e803eb1a ("ethdev: add Tx preparation") Fixes: 439a90b5f2a7 ("ethdev: reorder inline functions") -Cc: stable@dpdk.org Signed-off-by: Andrew Rybchenko --- - lib/librte_ethdev/rte_ethdev.h | 4 ++-- + lib/librte_ether/rte_ethdev.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/lib/librte_ethdev/rte_ethdev.h b/lib/librte_ethdev/rte_ethdev.h -index 76266ad10..a3c864a13 100644 ---- a/lib/librte_ethdev/rte_ethdev.h -+++ b/lib/librte_ethdev/rte_ethdev.h -@@ -4222,7 +4222,7 @@ rte_eth_tx_prepare(uint16_t port_id, uint16_t queue_id, +diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h +index f252e4110..2ef53a636 100644 +--- a/lib/librte_ether/rte_ethdev.h ++++ b/lib/librte_ether/rte_ethdev.h +@@ -3244,7 +3244,7 @@ rte_eth_tx_prepare(uint16_t port_id, uint16_t queue_id, #ifdef RTE_LIBRTE_ETHDEV_DEBUG if (!rte_eth_dev_is_valid_port(port_id)) { - RTE_ETHDEV_LOG(ERR, "Invalid TX port_id=%u\n", port_id); + RTE_PMD_DEBUG_TRACE("Invalid TX port_id=%d\n", port_id); - rte_errno = -EINVAL; + rte_errno = EINVAL; return 0; } #endif -@@ -4232,7 +4232,7 @@ rte_eth_tx_prepare(uint16_t port_id, uint16_t queue_id, +@@ -3254,7 +3254,7 @@ rte_eth_tx_prepare(uint16_t port_id, uint16_t queue_id, #ifdef RTE_LIBRTE_ETHDEV_DEBUG if (queue_id >= dev->data->nb_tx_queues) { - RTE_ETHDEV_LOG(ERR, "Invalid TX queue_id=%u\n", queue_id); + RTE_PMD_DEBUG_TRACE("Invalid TX queue_id=%d\n", queue_id); - rte_errno = -EINVAL; + rte_errno = EINVAL; return 0;