[dpdk-stable] patch 'net/sfc/base: fix outer IPID field in TSO option descriptors' has been queued to stable release 18.08.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 18.08.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 11/26/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.

Kevin Traynor

---
>From 4ae0929488de6bdd27eb5039c5376fc8b6a74c9b Mon Sep 17 00:00:00 2001
From: Vijay Srivastava <vijays at solarflare.com>
Date: Mon, 10 Sep 2018 10:33:09 +0100
Subject: [PATCH] net/sfc/base: fix outer IPID field in TSO option descriptors

[ upstream commit b5f238171d473e670d5f569a396caacf83eaef3a ]

Fixes: 912e603706c5 ("net/sfc/base: add outer IP ID parameter to TSOv2 descriptor")

Signed-off-by: Vijay Srivastava <vijays at solarflare.com>
Signed-off-by: Andrew Rybchenko <arybchenko at solarflare.com>
---
 drivers/net/sfc/base/ef10_tx.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/sfc/base/ef10_tx.c b/drivers/net/sfc/base/ef10_tx.c
index b92cadcbf..e74d39540 100644
--- a/drivers/net/sfc/base/ef10_tx.c
+++ b/drivers/net/sfc/base/ef10_tx.c
@@ -640,5 +640,5 @@ ef10_tx_qdesc_tso2_create(
 	EFSYS_ASSERT(count >= EFX_TX_FATSOV2_OPT_NDESCS);
 
-	EFX_POPULATE_QWORD_6(edp[0].ed_eq,
+	EFX_POPULATE_QWORD_5(edp[0].ed_eq,
 			    ESF_DZ_TX_DESC_IS_OPT, 1,
 			    ESF_DZ_TX_OPTION_TYPE,
@@ -647,7 +647,6 @@ ef10_tx_qdesc_tso2_create(
 			    ESE_DZ_TX_TSO_OPTION_DESC_FATSO2A,
 			    ESF_DZ_TX_TSO_IP_ID, ipv4_id,
-			    ESF_DZ_TX_TSO_OUTER_IPID, outer_ipv4_id,
 			    ESF_DZ_TX_TSO_TCP_SEQNO, tcp_seq);
-	EFX_POPULATE_QWORD_4(edp[1].ed_eq,
+	EFX_POPULATE_QWORD_5(edp[1].ed_eq,
 			    ESF_DZ_TX_DESC_IS_OPT, 1,
 			    ESF_DZ_TX_OPTION_TYPE,
@@ -655,5 +654,6 @@ ef10_tx_qdesc_tso2_create(
 			    ESF_DZ_TX_TSO_OPTION_TYPE,
 			    ESE_DZ_TX_TSO_OPTION_DESC_FATSO2B,
-			    ESF_DZ_TX_TSO_TCP_MSS, tcp_mss);
+			    ESF_DZ_TX_TSO_TCP_MSS, tcp_mss,
+			    ESF_DZ_TX_TSO_OUTER_IPID, outer_ipv4_id);
 }
 
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-11-21 15:59:13.827281132 +0000
+++ 0008-net-sfc-base-fix-outer-IPID-field-in-TSO-option-desc.patch	2018-11-21 15:59:13.000000000 +0000
@@ -1,10 +1,11 @@
-From b5f238171d473e670d5f569a396caacf83eaef3a Mon Sep 17 00:00:00 2001
+From 4ae0929488de6bdd27eb5039c5376fc8b6a74c9b Mon Sep 17 00:00:00 2001
 From: Vijay Srivastava <vijays at solarflare.com>
 Date: Mon, 10 Sep 2018 10:33:09 +0100
 Subject: [PATCH] net/sfc/base: fix outer IPID field in TSO option descriptors
 
+[ upstream commit b5f238171d473e670d5f569a396caacf83eaef3a ]
+
 Fixes: 912e603706c5 ("net/sfc/base: add outer IP ID parameter to TSOv2 descriptor")
-Cc: stable at dpdk.org
 
 Signed-off-by: Vijay Srivastava <vijays at solarflare.com>
 Signed-off-by: Andrew Rybchenko <arybchenko at solarflare.com>