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 52856A046B for ; Mon, 24 Jun 2019 17:26:47 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 497AE1BEA2; Mon, 24 Jun 2019 17:26:47 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 0CACC1BEA2 for ; Mon, 24 Jun 2019 17:26:45 +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 81A3F30C31A5; Mon, 24 Jun 2019 15:26:44 +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 7313519C69; Mon, 24 Jun 2019 15:26:43 +0000 (UTC) From: Kevin Traynor To: Andrew Rybchenko Cc: Xiao Wang , dpdk stable Date: Mon, 24 Jun 2019 16:24:53 +0100 Message-Id: <20190624152525.19349-29-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.40]); Mon, 24 Jun 2019 15:26:44 +0000 (UTC) Subject: [dpdk-stable] patch 'net/fm10k: 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/248199ab748879bc594b4083fdd4c47ca010b5ee Thanks. Kevin Traynor --- >From 248199ab748879bc594b4083fdd4c47ca010b5ee Mon Sep 17 00:00:00 2001 From: Andrew Rybchenko Date: Wed, 5 Jun 2019 09:15:58 +0100 Subject: [PATCH] net/fm10k: fix Tx prepare to set positive rte_errno [ upstream commit dafc6dbcb4e688bb38fb23c71c914ee5e0cce56b ] Fixes: 9b134aa39716 ("net/fm10k: add Tx preparation") Signed-off-by: Andrew Rybchenko Acked-by: Xiao Wang --- drivers/net/fm10k/fm10k_rxtx.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/fm10k/fm10k_rxtx.c b/drivers/net/fm10k/fm10k_rxtx.c index fb02e1152..cd5231c9f 100644 --- a/drivers/net/fm10k/fm10k_rxtx.c +++ b/drivers/net/fm10k/fm10k_rxtx.c @@ -672,10 +672,10 @@ fm10k_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, if ((m->ol_flags & PKT_TX_TCP_SEG) && (m->tso_segsz < FM10K_TSO_MINMSS)) { - rte_errno = -EINVAL; + rte_errno = EINVAL; return i; } if (m->ol_flags & FM10K_TX_OFFLOAD_NOTSUP_MASK) { - rte_errno = -ENOTSUP; + rte_errno = ENOTSUP; return i; } @@ -684,5 +684,5 @@ fm10k_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; } @@ -690,5 +690,5 @@ fm10k_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.596016295 +0100 +++ 0029-net-fm10k-fix-Tx-prepare-to-set-positive-rte_errno.patch 2019-06-24 16:18:55.045430893 +0100 @@ -1 +1 @@ -From dafc6dbcb4e688bb38fb23c71c914ee5e0cce56b Mon Sep 17 00:00:00 2001 +From 248199ab748879bc594b4083fdd4c47ca010b5ee Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit dafc6dbcb4e688bb38fb23c71c914ee5e0cce56b ] + @@ -7 +8,0 @@ -Cc: stable@dpdk.org @@ -16 +17 @@ -index cc95f9589..2f4dad0c1 100644 +index fb02e1152..cd5231c9f 100644 @@ -19 +20 @@ -@@ -699,10 +699,10 @@ fm10k_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, +@@ -672,10 +672,10 @@ fm10k_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, @@ -32 +33 @@ -@@ -711,5 +711,5 @@ fm10k_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, +@@ -684,5 +684,5 @@ fm10k_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, @@ -39 +40 @@ -@@ -717,5 +717,5 @@ fm10k_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, +@@ -690,5 +690,5 @@ fm10k_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts,