[dpdk-stable] patch 'net/e1000: fix missing Tx multi-segs capability' 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 fd6ec96af73718b8f5f0bf6df7e98048cb072dd5 Mon Sep 17 00:00:00 2001
From: Didier Pallard <didier.pallard at 6wind.com>
Date: Wed, 19 Sep 2018 17:04:06 +0200
Subject: [PATCH] net/e1000: fix missing Tx multi-segs capability

[ upstream commit a6607ae14c15158f082a8a620007b573d40aed11 ]

In former API, ETH_TXQ_FLAGS_NOMULTSEGS was merely a hint indicating
that application will never send multisegmented packets, allowing
pmd to choose different tx methods accordingly.
In new API, DEV_TX_OFFLOAD_MULTI_SEGS became an offload capability
that is advertised by pmds, some of them do not advertise it and
expect to never receive fragmented packets (octeontx, axgbe)
So an ethdev that supports multisegmented packets should properly
advertise it.

Fixes: e5c05e6590ea ("net/e1000: convert to new Tx offloads API")

Signed-off-by: Didier Pallard <didier.pallard at 6wind.com>
Acked-by: Konstantin Ananyev <konstantin.ananyev at intel.com>
---
 drivers/net/e1000/em_rxtx.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/net/e1000/em_rxtx.c b/drivers/net/e1000/em_rxtx.c
index 7d2ac4eb7..5860e93d5 100644
--- a/drivers/net/e1000/em_rxtx.c
+++ b/drivers/net/e1000/em_rxtx.c
@@ -1161,4 +1161,5 @@ em_get_tx_port_offloads_capa(struct rte_eth_dev *dev)
 	RTE_SET_USED(dev);
 	tx_offload_capa =
+		DEV_TX_OFFLOAD_MULTI_SEGS  |
 		DEV_TX_OFFLOAD_VLAN_INSERT |
 		DEV_TX_OFFLOAD_IPV4_CKSUM  |
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-11-21 15:59:14.137580855 +0000
+++ 0020-net-e1000-fix-missing-Tx-multi-segs-capability.patch	2018-11-21 15:59:13.000000000 +0000
@@ -1,8 +1,10 @@
-From a6607ae14c15158f082a8a620007b573d40aed11 Mon Sep 17 00:00:00 2001
+From fd6ec96af73718b8f5f0bf6df7e98048cb072dd5 Mon Sep 17 00:00:00 2001
 From: Didier Pallard <didier.pallard at 6wind.com>
 Date: Wed, 19 Sep 2018 17:04:06 +0200
 Subject: [PATCH] net/e1000: fix missing Tx multi-segs capability
 
+[ upstream commit a6607ae14c15158f082a8a620007b573d40aed11 ]
+
 In former API, ETH_TXQ_FLAGS_NOMULTSEGS was merely a hint indicating
 that application will never send multisegmented packets, allowing
 pmd to choose different tx methods accordingly.
@@ -13,7 +15,6 @@
 advertise it.
 
 Fixes: e5c05e6590ea ("net/e1000: convert to new Tx offloads API")
-Cc: stable at dpdk.org
 
 Signed-off-by: Didier Pallard <didier.pallard at 6wind.com>
 Acked-by: Konstantin Ananyev <konstantin.ananyev at intel.com>
@@ -22,7 +23,7 @@
  1 file changed, 1 insertion(+)
 
 diff --git a/drivers/net/e1000/em_rxtx.c b/drivers/net/e1000/em_rxtx.c
-index 1103a1839..087e68304 100644
+index 7d2ac4eb7..5860e93d5 100644
 --- a/drivers/net/e1000/em_rxtx.c
 +++ b/drivers/net/e1000/em_rxtx.c
 @@ -1161,4 +1161,5 @@ em_get_tx_port_offloads_capa(struct rte_eth_dev *dev)