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 6C454A046B 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 5CCFD1BE8E; 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 705331BEA2 for ; Mon, 24 Jun 2019 17:26:46 +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 E46BB309266D; Mon, 24 Jun 2019 15:26:45 +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 DD75019C69; Mon, 24 Jun 2019 15:26:44 +0000 (UTC) From: Kevin Traynor To: Andrew Rybchenko Cc: Ferruh Yigit , dpdk stable Date: Mon, 24 Jun 2019 16:24:54 +0100 Message-Id: <20190624152525.19349-30-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.43]); Mon, 24 Jun 2019 15:26:45 +0000 (UTC) Subject: [dpdk-stable] patch 'net/i40e: 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/015246a32ab4a94773cc3923ab1db314ee923b71 Thanks. Kevin Traynor --- >From 015246a32ab4a94773cc3923ab1db314ee923b71 Mon Sep 17 00:00:00 2001 From: Andrew Rybchenko Date: Wed, 5 Jun 2019 09:15:59 +0100 Subject: [PATCH] net/i40e: fix Tx prepare to set positive rte_errno [ upstream commit 39be55654e2dbbeb8f175c19d235ada6dfa82cc7 ] Fixes: 3f33e643e5c6 ("net/i40e: add Tx preparation") Fixes: bfeed0262b0c ("net/i40e: check illegal packets") Signed-off-by: Andrew Rybchenko Reviewed-by: Ferruh Yigit --- drivers/net/i40e/i40e_rxtx.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c index 4640a9c66..679357bf8 100644 --- a/drivers/net/i40e/i40e_rxtx.c +++ b/drivers/net/i40e/i40e_rxtx.c @@ -1447,5 +1447,5 @@ i40e_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, if (m->nb_segs > I40E_TX_MAX_MTU_SEG || m->pkt_len > I40E_FRAME_SIZE_MAX) { - rte_errno = -EINVAL; + rte_errno = EINVAL; return i; } @@ -1457,10 +1457,10 @@ i40e_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, * malicious */ - rte_errno = -EINVAL; + rte_errno = EINVAL; return i; } if (ol_flags & I40E_TX_OFFLOAD_NOTSUP_MASK) { - rte_errno = -ENOTSUP; + rte_errno = ENOTSUP; return i; } @@ -1468,5 +1468,5 @@ i40e_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, /* check the size of packet */ if (m->pkt_len < I40E_TX_MIN_PKT_LEN) { - rte_errno = -EINVAL; + rte_errno = EINVAL; return i; } @@ -1475,5 +1475,5 @@ i40e_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; } @@ -1481,5 +1481,5 @@ i40e_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.642098677 +0100 +++ 0030-net-i40e-fix-Tx-prepare-to-set-positive-rte_errno.patch 2019-06-24 16:18:55.047430846 +0100 @@ -1 +1 @@ -From 39be55654e2dbbeb8f175c19d235ada6dfa82cc7 Mon Sep 17 00:00:00 2001 +From 015246a32ab4a94773cc3923ab1db314ee923b71 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 39be55654e2dbbeb8f175c19d235ada6dfa82cc7 ] + @@ -8 +9,0 @@ -Cc: stable@dpdk.org @@ -17 +18 @@ -index cd3d41f92..85c44f522 100644 +index 4640a9c66..679357bf8 100644