[dpdk-stable] patch 'net/i40e: update Tx offload mask' has been queued to LTS release 16.11.9

[Luca Boccassi]

Hi,

FYI, your patch has been queued to LTS release 16.11.9

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

Luca Boccassi

---
>From c70507ce48a6a96ff8df2203b088c2c490178b42 Mon Sep 17 00:00:00 2001
From: Beilei Xing <beilei.xing at intel.com>
Date: Tue, 23 Oct 2018 14:14:31 +0800
Subject: [PATCH] net/i40e: update Tx offload mask

[ upstream commit e4845bb4a68513c477dd35fcdcb086681788be7d ]

Tx offload mask is updated in following commit:
commit 1037ed842c37 ("mbuf: fix Tx offload mask").

Currently, the new added offload flags are not supported in PMD
and application will fail to call PMD transmit prepare function.
This patch updates PMD Tx offload mask.

Signed-off-by: Beilei Xing <beilei.xing at intel.com>
Acked-by: Qi Zhang <qi.z.zhang at intel.com>
---
 drivers/net/i40e/i40e_rxtx.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c
index 777ffc215..2c56c1ac2 100644
--- a/drivers/net/i40e/i40e_rxtx.c
+++ b/drivers/net/i40e/i40e_rxtx.c
@@ -74,6 +74,10 @@
 #define I40E_TXD_CMD (I40E_TX_DESC_CMD_EOP | I40E_TX_DESC_CMD_RS)
 
 #define I40E_TX_CKSUM_OFFLOAD_MASK (		 \
+		PKT_TX_OUTER_IPV4 |		 \
+		PKT_TX_OUTER_IPV6 |		 \
+		PKT_TX_IPV4 |			 \
+		PKT_TX_IPV6 |			 \
 		PKT_TX_IP_CKSUM |		 \
 		PKT_TX_L4_MASK |		 \
 		PKT_TX_TCP_SEG |		 \
-- 
2.19.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-10-29 12:48:14.749830564 +0000
+++ 0014-net-i40e-update-Tx-offload-mask.patch	2018-10-29 12:48:14.466417981 +0000
@@ -1,8 +1,10 @@
-From e4845bb4a68513c477dd35fcdcb086681788be7d Mon Sep 17 00:00:00 2001
+From c70507ce48a6a96ff8df2203b088c2c490178b42 Mon Sep 17 00:00:00 2001
 From: Beilei Xing <beilei.xing at intel.com>
 Date: Tue, 23 Oct 2018 14:14:31 +0800
 Subject: [PATCH] net/i40e: update Tx offload mask
 
+[ upstream commit e4845bb4a68513c477dd35fcdcb086681788be7d ]
+
 Tx offload mask is updated in following commit:
 commit 1037ed842c37 ("mbuf: fix Tx offload mask").
 
@@ -10,8 +12,6 @@
 and application will fail to call PMD transmit prepare function.
 This patch updates PMD Tx offload mask.
 
-Cc: stable at dpdk.org
-
 Signed-off-by: Beilei Xing <beilei.xing at intel.com>
 Acked-by: Qi Zhang <qi.z.zhang at intel.com>
 ---
@@ -19,20 +19,20 @@
  1 file changed, 4 insertions(+)
 
 diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c
-index b15dd67ad..8bfa25178 100644
+index 777ffc215..2c56c1ac2 100644
 --- a/drivers/net/i40e/i40e_rxtx.c
 +++ b/drivers/net/i40e/i40e_rxtx.c
-@@ -55,6 +55,10 @@
- 		PKT_TX_OUTER_IP_CKSUM)
+@@ -74,6 +74,10 @@
+ #define I40E_TXD_CMD (I40E_TX_DESC_CMD_EOP | I40E_TX_DESC_CMD_RS)
  
- #define I40E_TX_OFFLOAD_MASK (  \
-+		PKT_TX_OUTER_IPV4 |	\
-+		PKT_TX_OUTER_IPV6 |	\
-+		PKT_TX_IPV4 |		\
-+		PKT_TX_IPV6 |		\
- 		PKT_TX_IP_CKSUM |       \
- 		PKT_TX_L4_MASK |        \
- 		PKT_TX_OUTER_IP_CKSUM | \
+ #define I40E_TX_CKSUM_OFFLOAD_MASK (		 \
++		PKT_TX_OUTER_IPV4 |		 \
++		PKT_TX_OUTER_IPV6 |		 \
++		PKT_TX_IPV4 |			 \
++		PKT_TX_IPV6 |			 \
+ 		PKT_TX_IP_CKSUM |		 \
+ 		PKT_TX_L4_MASK |		 \
+ 		PKT_TX_TCP_SEG |		 \
 -- 
 2.19.1