[dpdk-stable] patch 'app/testpmd: fix Tx offload flags' 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/29/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 6c16bdfdefc7a957d547c64dafa28e577d7ce263 Mon Sep 17 00:00:00 2001
From: Ferruh Yigit <ferruh.yigit at intel.com>
Date: Sun, 28 Oct 2018 02:16:39 +0000
Subject: [PATCH] app/testpmd: fix Tx offload flags

[ upstream commit 2482a004d6dc501cb2438e83e09cb76b8997e81b ]

ol_flags can be wrong if DEV_TX_OFFLOAD_VLAN_INSERT is not set in
tx_offloads

Fixes: 3eecba267cd6 ("app/testpmd: cleanup internal Tx offloads flags field")

Signed-off-by: Ferruh Yigit <ferruh.yigit at intel.com>
Acked-by: Bernard Iremonger <bernard.iremonger at intel.com>
---
 app/test-pmd/flowgen.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/test-pmd/flowgen.c b/app/test-pmd/flowgen.c
index 0531b5d27..3214e3c95 100644
--- a/app/test-pmd/flowgen.c
+++ b/app/test-pmd/flowgen.c
@@ -124,5 +124,5 @@ pkt_burst_flow_gen(struct fwd_stream *fs)
 	struct udp_hdr *udp_hdr;
 	uint16_t vlan_tci, vlan_tci_outer;
-	uint64_t ol_flags;
+	uint64_t ol_flags = 0;
 	uint16_t nb_rx;
 	uint16_t nb_tx;
@@ -156,5 +156,5 @@ pkt_burst_flow_gen(struct fwd_stream *fs)
 	tx_offloads = ports[fs->tx_port].dev_conf.txmode.offloads;
 	if (tx_offloads	& DEV_TX_OFFLOAD_VLAN_INSERT)
-		ol_flags = PKT_TX_VLAN_PKT;
+		ol_flags |= PKT_TX_VLAN_PKT;
 	if (tx_offloads & DEV_TX_OFFLOAD_QINQ_INSERT)
 		ol_flags |= PKT_TX_QINQ_PKT;
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-11-23 10:22:55.307204799 +0000
+++ 0040-app-testpmd-fix-Tx-offload-flags.patch	2018-11-23 10:22:54.000000000 +0000
@@ -1,13 +1,14 @@
-From 2482a004d6dc501cb2438e83e09cb76b8997e81b Mon Sep 17 00:00:00 2001
+From 6c16bdfdefc7a957d547c64dafa28e577d7ce263 Mon Sep 17 00:00:00 2001
 From: Ferruh Yigit <ferruh.yigit at intel.com>
 Date: Sun, 28 Oct 2018 02:16:39 +0000
 Subject: [PATCH] app/testpmd: fix Tx offload flags
 
+[ upstream commit 2482a004d6dc501cb2438e83e09cb76b8997e81b ]
+
 ol_flags can be wrong if DEV_TX_OFFLOAD_VLAN_INSERT is not set in
 tx_offloads
 
 Fixes: 3eecba267cd6 ("app/testpmd: cleanup internal Tx offloads flags field")
-Cc: stable at dpdk.org
 
 Signed-off-by: Ferruh Yigit <ferruh.yigit at intel.com>
 Acked-by: Bernard Iremonger <bernard.iremonger at intel.com>