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 04F6BA3 for ; Fri, 8 Mar 2019 18:49:52 +0100 (CET) Received: from Internal Mail-Server by MTLPINE1 (envelope-from yskoh@mellanox.com) with ESMTPS (AES256-SHA encrypted); 8 Mar 2019 19:49:47 +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 x28HloBQ002625; Fri, 8 Mar 2019 19:49:46 +0200 From: Yongseok Koh To: Michal Krawczyk Cc: dpdk stable Date: Fri, 8 Mar 2019 09:47:48 -0800 Message-Id: <20190308174749.30771-70-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 'net/ena: fix errno to 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:53 -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 7a2c83b90e78482f4c155bdf4bcc812735c33a5e Mon Sep 17 00:00:00 2001 From: Michal Krawczyk Date: Fri, 25 Jan 2019 09:10:26 +0100 Subject: [PATCH] net/ena: fix errno to positive value [ upstream commit baeed5f404dd1b049118cfec26a2fd3203671572 ] The rte_errno shouldn't have assigned negative error codes, so it has to be fixed. Fixes: b3fc5a1ae10d ("net/ena: add Tx preparation") Signed-off-by: Michal Krawczyk --- drivers/net/ena/ena_ethdev.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c index b347910cc..d8d643235 100644 --- a/drivers/net/ena/ena_ethdev.c +++ b/drivers/net/ena/ena_ethdev.c @@ -1640,14 +1640,14 @@ eth_ena_prep_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, if ((ol_flags & ENA_TX_OFFLOAD_NOTSUP_MASK) != 0 || (ol_flags & PKT_TX_L4_MASK) == PKT_TX_SCTP_CKSUM) { - rte_errno = -ENOTSUP; + rte_errno = ENOTSUP; return i; } #ifdef RTE_LIBRTE_ETHDEV_DEBUG ret = rte_validate_tx_offload(m); if (ret != 0) { - rte_errno = ret; + rte_errno = -ret; return i; } #endif @@ -1660,7 +1660,7 @@ eth_ena_prep_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, ret = rte_net_intel_cksum_flags_prepare(m, ol_flags & ~PKT_TX_TCP_SEG); if (ret != 0) { - rte_errno = ret; + rte_errno = -ret; return i; } } -- 2.11.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-03-08 09:46:43.600905867 -0800 +++ 0070-net-ena-fix-errno-to-positive-value.patch 2019-03-08 09:46:40.394408000 -0800 @@ -1,13 +1,14 @@ -From baeed5f404dd1b049118cfec26a2fd3203671572 Mon Sep 17 00:00:00 2001 +From 7a2c83b90e78482f4c155bdf4bcc812735c33a5e Mon Sep 17 00:00:00 2001 From: Michal Krawczyk Date: Fri, 25 Jan 2019 09:10:26 +0100 Subject: [PATCH] net/ena: fix errno to positive value +[ upstream commit baeed5f404dd1b049118cfec26a2fd3203671572 ] + The rte_errno shouldn't have assigned negative error codes, so it has to be fixed. Fixes: b3fc5a1ae10d ("net/ena: add Tx preparation") -Cc: stable@dpdk.org Signed-off-by: Michal Krawczyk --- @@ -15,10 +16,10 @@ 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c -index 747390bb7..8bb05caa2 100644 +index b347910cc..d8d643235 100644 --- a/drivers/net/ena/ena_ethdev.c +++ b/drivers/net/ena/ena_ethdev.c -@@ -2178,14 +2178,14 @@ eth_ena_prep_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, +@@ -1640,14 +1640,14 @@ eth_ena_prep_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, if ((ol_flags & ENA_TX_OFFLOAD_NOTSUP_MASK) != 0 || (ol_flags & PKT_TX_L4_MASK) == PKT_TX_SCTP_CKSUM) { @@ -35,7 +36,7 @@ return i; } #endif -@@ -2198,7 +2198,7 @@ eth_ena_prep_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, +@@ -1660,7 +1660,7 @@ eth_ena_prep_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, ret = rte_net_intel_cksum_flags_prepare(m, ol_flags & ~PKT_TX_TCP_SEG); if (ret != 0) {