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

[Yongseok Koh <yskoh@mellanox.com>]

Hi,

FYI, your patch has been queued to LTS release 17.11.5

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/01/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. 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 b915b36d1b9b7a313f906ccabda24a00c96318eb Mon Sep 17 00:00:00 2001
From: Xiaolong Ye <xiaolong.ye@intel.com>
Date: Fri, 26 Oct 2018 14:33:14 +0800
Subject: [PATCH] net/i40e: fix offload not supported mask

[ upstream commit 09a62d75691fb935c7767d51b750df5910825985 ]

Just as the name I40E_TX_OFFLOAD_NOTSUP_MASK indicates, it should be the
mask of unsupported features (either not in PKT_TX_OFFLOAD_MASK or in
I40E_TX_OFFLOAD_MASK), however, xor will not get desired result here,
assume bit 0 of PKT_TX_OFFLOAD_MASK and I40E_TX_OFFLOAD_MAKS are 0 which
means corresponding feature is not supported in both sides, then we get
value of bit 0 of I40E_TX_OFFLOAD_NOTSUP_MASK which is 0 via xor, it
implies that it is supported which doesn't meet our expectation.

Correct it by a NOT-AND operation.

Fixes: 3f33e643e5c6 ("net/i40e: add Tx preparation")

Signed-off-by: Xiaolong Ye <xiaolong.ye@intel.com>
Acked-by: Qi Zhang <qi.z.zhang@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 ce6a30507..fb35d1221 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:
---
--- -	2018-11-29 15:01:49.215221295 -0800
+++ 0091-net-i40e-fix-offload-not-supported-mask.patch	2018-11-29 15:01:45.244959000 -0800
@@ -1,8 +1,10 @@
-From 09a62d75691fb935c7767d51b750df5910825985 Mon Sep 17 00:00:00 2001
+From b915b36d1b9b7a313f906ccabda24a00c96318eb Mon Sep 17 00:00:00 2001
 From: Xiaolong Ye <xiaolong.ye@intel.com>
 Date: Fri, 26 Oct 2018 14:33:14 +0800
 Subject: [PATCH] net/i40e: fix offload not supported mask
 
+[ upstream commit 09a62d75691fb935c7767d51b750df5910825985 ]
+
 Just as the name I40E_TX_OFFLOAD_NOTSUP_MASK indicates, it should be the
 mask of unsupported features (either not in PKT_TX_OFFLOAD_MASK or in
 I40E_TX_OFFLOAD_MASK), however, xor will not get desired result here,
@@ -14,7 +16,6 @@
 Correct it by a NOT-AND operation.
 
 Fixes: 3f33e643e5c6 ("net/i40e: add Tx preparation")
-Cc: stable@dpdk.org
 
 Signed-off-by: Xiaolong Ye <xiaolong.ye@intel.com>
 Acked-by: Qi Zhang <qi.z.zhang@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 8bfa25178..e76412207 100644
+index ce6a30507..fb35d1221 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