[dpdk-stable] patch 'net/i40e: revert fix offload not supported mask' has been queued to LTS release 17.11.6
Yongseok Koh
yskoh at mellanox.com
Fri Mar 8 18:46:47 CET 2019
Hi,
FYI, your patch has been queued to LTS release 17.11.6
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objection by 03/13/19. So please
shout if anyone has objection.
Also note that after the patch there's a diff of the upstream commit vs the patch applied
to the branch. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.
Thanks.
Yongseok
---
>From 59696fb0848c7fa27056e4d0f6693a2ab9143f7c Mon Sep 17 00:00:00 2001
From: Didier Pallard <didier.pallard at 6wind.com>
Date: Tue, 11 Dec 2018 18:25:01 +0100
Subject: [PATCH] net/i40e: revert fix offload not supported mask
[ upstream commit e51da4bbaf3584e16cbd0ea0b1b85343b777134f ]
This reverts
commit 09a62d75691f ("net/i40e: fix offload not supported mask")
Contrary to what is said in above patch commit log,
I40E_TX_OFFLOAD_NOTSUP_MASK is the mask of Tx offload bits that are part
of PKT_TX_OFFLOAD_MASK but not included in I40E_TX_OFFLOAD_MASK.
Above patch erroneously includes all PKT_RX_OFFLOAD_ bits in the
I40E_TX_OFFLOAD_NOTSUP_MASK, this is not what is expected.
Restore the initial xor that gives the expected result.
Fixes: 09a62d75691f ("net/i40e: fix offload not supported mask")
Signed-off-by: Didier Pallard <didier.pallard at 6wind.com>
Acked-by: Qi Zhang <qi.z.zhang at intel.com>
---
drivers/net/i40e/i40e_rxtx.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c
index fb35d1221..ce6a30507 100644
--- a/drivers/net/i40e/i40e_rxtx.c
+++ b/drivers/net/i40e/i40e_rxtx.c
@@ -101,7 +101,7 @@
I40E_TX_IEEE1588_TMST)
#define I40E_TX_OFFLOAD_NOTSUP_MASK \
- ~(PKT_TX_OFFLOAD_MASK & I40E_TX_OFFLOAD_MASK)
+ (PKT_TX_OFFLOAD_MASK ^ I40E_TX_OFFLOAD_MASK)
static uint16_t i40e_xmit_pkts_simple(void *tx_queue,
struct rte_mbuf **tx_pkts,
--
2.11.0
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2019-03-08 09:46:40.846687038 -0800
+++ 0009-net-i40e-revert-fix-offload-not-supported-mask.patch 2019-03-08 09:46:39.992397000 -0800
@@ -1,8 +1,10 @@
-From e51da4bbaf3584e16cbd0ea0b1b85343b777134f Mon Sep 17 00:00:00 2001
+From 59696fb0848c7fa27056e4d0f6693a2ab9143f7c Mon Sep 17 00:00:00 2001
From: Didier Pallard <didier.pallard at 6wind.com>
Date: Tue, 11 Dec 2018 18:25:01 +0100
Subject: [PATCH] net/i40e: revert fix offload not supported mask
+[ upstream commit e51da4bbaf3584e16cbd0ea0b1b85343b777134f ]
+
This reverts
commit 09a62d75691f ("net/i40e: fix offload not supported mask")
@@ -14,7 +16,6 @@
Restore the initial xor that gives the expected result.
Fixes: 09a62d75691f ("net/i40e: fix offload not supported mask")
-Cc: stable at dpdk.org
Signed-off-by: Didier Pallard <didier.pallard at 6wind.com>
Acked-by: Qi Zhang <qi.z.zhang at intel.com>
@@ -23,18 +24,18 @@
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c
-index e1152ff0e..ab74a488f 100644
+index fb35d1221..ce6a30507 100644
--- a/drivers/net/i40e/i40e_rxtx.c
+++ b/drivers/net/i40e/i40e_rxtx.c
-@@ -69,7 +69,7 @@
+@@ -101,7 +101,7 @@
I40E_TX_IEEE1588_TMST)
#define I40E_TX_OFFLOAD_NOTSUP_MASK \
- ~(PKT_TX_OFFLOAD_MASK & I40E_TX_OFFLOAD_MASK)
+ (PKT_TX_OFFLOAD_MASK ^ I40E_TX_OFFLOAD_MASK)
- static inline void
- i40e_rxd_to_vlan_tci(struct rte_mbuf *mb, volatile union i40e_rx_desc *rxdp)
+ static uint16_t i40e_xmit_pkts_simple(void *tx_queue,
+ struct rte_mbuf **tx_pkts,
--
2.11.0
More information about the stable
mailing list