[dpdk-stable] patch 'net/i40e: revert fix offload not supported mask' has been queued to stable release 18.11.1

Kevin Traynor ktraynor at redhat.com
Fri Dec 14 19:24:29 CET 2018


Hi,

FYI, your patch has been queued to stable release 18.11.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 12/18/18. 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.

Thanks.

Kevin Traynor

---
>From ffad584edb1c8fb65e79ae44814f8460c4f2f8d5 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 e1152ff0e..ab74a488f 100644
--- a/drivers/net/i40e/i40e_rxtx.c
+++ b/drivers/net/i40e/i40e_rxtx.c
@@ -70,5 +70,5 @@
 
 #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
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-12-14 18:23:19.001980563 +0000
+++ 0027-net-i40e-revert-fix-offload-not-supported-mask.patch	2018-12-14 18:23:18.000000000 +0000
@@ -1,8 +1,10 @@
-From e51da4bbaf3584e16cbd0ea0b1b85343b777134f Mon Sep 17 00:00:00 2001
+From ffad584edb1c8fb65e79ae44814f8460c4f2f8d5 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>


More information about the stable mailing list