From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 2D27CA046B for ; Mon, 24 Jun 2019 17:26:44 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 257A51BE8E; Mon, 24 Jun 2019 17:26:44 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 780671BCD4 for ; Mon, 24 Jun 2019 17:26:42 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A16A47E424; Mon, 24 Jun 2019 15:26:41 +0000 (UTC) Received: from rh.redhat.com (ovpn-116-250.ams2.redhat.com [10.36.116.250]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8DBFC19C69; Mon, 24 Jun 2019 15:26:39 +0000 (UTC) From: Kevin Traynor To: Andrew Rybchenko Cc: Ferruh Yigit , dpdk stable Date: Mon, 24 Jun 2019 16:24:51 +0100 Message-Id: <20190624152525.19349-27-ktraynor@redhat.com> In-Reply-To: <20190624152525.19349-1-ktraynor@redhat.com> References: <20190624152525.19349-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Mon, 24 Jun 2019 15:26:41 +0000 (UTC) Subject: [dpdk-stable] patch 'net/e1000: fix Tx prepare to set positive rte_errno' has been queued to LTS release 18.11.3 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 LTS release 18.11.3 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/27/19. 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/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/842b47e8812bd7f4ecbc982916979db318258214 Thanks. Kevin Traynor --- >From 842b47e8812bd7f4ecbc982916979db318258214 Mon Sep 17 00:00:00 2001 From: Andrew Rybchenko Date: Wed, 5 Jun 2019 09:15:56 +0100 Subject: [PATCH] net/e1000: fix Tx prepare to set positive rte_errno [ upstream commit ecafec261e9921d963a68ec40b652a9df6626f60 ] Fixes: 2b76648872c9 ("net/e1000: add Tx preparation") Signed-off-by: Andrew Rybchenko Reviewed-by: Ferruh Yigit --- drivers/net/e1000/em_rxtx.c | 6 +++--- drivers/net/e1000/igb_rxtx.c | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/net/e1000/em_rxtx.c b/drivers/net/e1000/em_rxtx.c index 005e1ea96..0057dd01b 100644 --- a/drivers/net/e1000/em_rxtx.c +++ b/drivers/net/e1000/em_rxtx.c @@ -617,5 +617,5 @@ eth_em_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, if (m->ol_flags & E1000_TX_OFFLOAD_NOTSUP_MASK) { - rte_errno = -ENOTSUP; + rte_errno = ENOTSUP; return i; } @@ -624,5 +624,5 @@ eth_em_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, ret = rte_validate_tx_offload(m); if (ret != 0) { - rte_errno = ret; + rte_errno = -ret; return i; } @@ -630,5 +630,5 @@ eth_em_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, ret = rte_net_intel_cksum_prepare(m); if (ret != 0) { - rte_errno = ret; + rte_errno = -ret; return i; } diff --git a/drivers/net/e1000/igb_rxtx.c b/drivers/net/e1000/igb_rxtx.c index ab0a80e15..28fff6ab4 100644 --- a/drivers/net/e1000/igb_rxtx.c +++ b/drivers/net/e1000/igb_rxtx.c @@ -630,10 +630,10 @@ eth_igb_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, (m->l2_len + m->l3_len + m->l4_len > IGB_TSO_MAX_HDRLEN)) { - rte_errno = -EINVAL; + rte_errno = EINVAL; return i; } if (m->ol_flags & IGB_TX_OFFLOAD_NOTSUP_MASK) { - rte_errno = -ENOTSUP; + rte_errno = ENOTSUP; return i; } @@ -642,5 +642,5 @@ eth_igb_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, ret = rte_validate_tx_offload(m); if (ret != 0) { - rte_errno = ret; + rte_errno = -ret; return i; } @@ -648,5 +648,5 @@ eth_igb_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, ret = rte_net_intel_cksum_prepare(m); if (ret != 0) { - rte_errno = ret; + rte_errno = -ret; return i; } -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-06-24 16:18:56.496015630 +0100 +++ 0027-net-e1000-fix-Tx-prepare-to-set-positive-rte_errno.patch 2019-06-24 16:18:55.043430940 +0100 @@ -1 +1 @@ -From ecafec261e9921d963a68ec40b652a9df6626f60 Mon Sep 17 00:00:00 2001 +From 842b47e8812bd7f4ecbc982916979db318258214 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit ecafec261e9921d963a68ec40b652a9df6626f60 ] + @@ -7 +8,0 @@ -Cc: stable@dpdk.org @@ -17 +18 @@ -index 482d88459..708f832b0 100644 +index 005e1ea96..0057dd01b 100644 @@ -42 +43 @@ -index 871b5f3b9..c5606de5d 100644 +index ab0a80e15..28fff6ab4 100644 @@ -45 +46 @@ -@@ -633,10 +633,10 @@ eth_igb_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, +@@ -630,10 +630,10 @@ eth_igb_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, @@ -58 +59 @@ -@@ -645,5 +645,5 @@ eth_igb_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, +@@ -642,5 +642,5 @@ eth_igb_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, @@ -65 +66 @@ -@@ -651,5 +651,5 @@ eth_igb_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, +@@ -648,5 +648,5 @@ eth_igb_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts,