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 EE95BA046B for ; Mon, 24 Jun 2019 17:26:59 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E58381BE8E; Mon, 24 Jun 2019 17:26:59 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 5AD991BED9 for ; Mon, 24 Jun 2019 17:26:57 +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 C2C64300413C; Mon, 24 Jun 2019 15:26:51 +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 B4EC819936; Mon, 24 Jun 2019 15:26:50 +0000 (UTC) From: Kevin Traynor To: Andrew Rybchenko Cc: Yong Wang , dpdk stable Date: Mon, 24 Jun 2019 16:24:58 +0100 Message-Id: <20190624152525.19349-34-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.46]); Mon, 24 Jun 2019 15:26:56 +0000 (UTC) Subject: [dpdk-stable] patch 'net/vmxnet3: 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/329f64d6836f9963de1c546225e073f1b2b11006 Thanks. Kevin Traynor --- >From 329f64d6836f9963de1c546225e073f1b2b11006 Mon Sep 17 00:00:00 2001 From: Andrew Rybchenko Date: Wed, 5 Jun 2019 09:16:04 +0100 Subject: [PATCH] net/vmxnet3: fix Tx prepare to set positive rte_errno [ upstream commit fcae1808f8ed1358704f5e8ac037329a795f49ab ] Fixes: baf3bbae5556 ("net/vmxnet3: add Tx preparation") Signed-off-by: Andrew Rybchenko Acked-by: Yong Wang --- drivers/net/vmxnet3/vmxnet3_rxtx.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/vmxnet3/vmxnet3_rxtx.c b/drivers/net/vmxnet3/vmxnet3_rxtx.c index d30914a8a..6efa3ac21 100644 --- a/drivers/net/vmxnet3/vmxnet3_rxtx.c +++ b/drivers/net/vmxnet3/vmxnet3_rxtx.c @@ -362,5 +362,5 @@ vmxnet3_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, if ((ol_flags & PKT_TX_TCP_SEG) == 0 && m->nb_segs > VMXNET3_MAX_TXD_PER_PKT) { - rte_errno = -EINVAL; + rte_errno = EINVAL; return i; } @@ -370,5 +370,5 @@ vmxnet3_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, (ol_flags & PKT_TX_L4_MASK) == PKT_TX_SCTP_CKSUM) { - rte_errno = -ENOTSUP; + rte_errno = ENOTSUP; return i; } @@ -377,5 +377,5 @@ vmxnet3_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; } @@ -383,5 +383,5 @@ vmxnet3_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.842474843 +0100 +++ 0034-net-vmxnet3-fix-Tx-prepare-to-set-positive-rte_errno.patch 2019-06-24 16:18:55.057430610 +0100 @@ -1 +1 @@ -From fcae1808f8ed1358704f5e8ac037329a795f49ab Mon Sep 17 00:00:00 2001 +From 329f64d6836f9963de1c546225e073f1b2b11006 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit fcae1808f8ed1358704f5e8ac037329a795f49ab ] + @@ -7 +8,0 @@ -Cc: stable@dpdk.org @@ -16 +17 @@ -index 6644cde44..7794d7421 100644 +index d30914a8a..6efa3ac21 100644