[dpdk-stable] patch 'net/i40e: fix Tx prepare to set positive rte_errno' has been queued to LTS release 18.11.3
Kevin Traynor
ktraynor at redhat.com
Mon Jun 24 17:24:54 CEST 2019
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 <arybchenko at solarflare.com>
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 <arybchenko at solarflare.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>
---
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 at dpdk.org
@@ -17 +18 @@
-index cd3d41f92..85c44f522 100644
+index 4640a9c66..679357bf8 100644
More information about the stable
mailing list