[dpdk-stable] patch 'net/e1000: fix Tx offload capability typos' 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/23/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 02f25b4214d362f19b265066c71c2b1d2204f834 Mon Sep 17 00:00:00 2001
From: Yaroslav Brustinov <ybrustin at cisco.com>
Date: Wed, 8 Aug 2018 12:45:21 +0300
Subject: [PATCH] net/e1000: fix Tx offload capability typos

[ upstream commit daa3b0833f086c520696433e056b3c97a570370a ]

Fix rx/tx typos in igb_get_tx_port_offloads_capa and
igb_get_tx_queue_offloads_capa.

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

Signed-off-by: Yaroslav Brustinov <ybrustin at cisco.com>
Acked-by: Qi Zhang <qi.z.zhang at intel.com>
---
 drivers/net/e1000/igb_rxtx.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/net/e1000/igb_rxtx.c b/drivers/net/e1000/igb_rxtx.c
index b955068a8..8aefd976a 100644
--- a/drivers/net/e1000/igb_rxtx.c
+++ b/drivers/net/e1000/igb_rxtx.c
@@ -1453,8 +1453,8 @@ uint64_t
 igb_get_tx_port_offloads_capa(struct rte_eth_dev *dev)
 {
-	uint64_t rx_offload_capa;
+	uint64_t tx_offload_capa;
 
 	RTE_SET_USED(dev);
-	rx_offload_capa = DEV_TX_OFFLOAD_VLAN_INSERT |
+	tx_offload_capa = DEV_TX_OFFLOAD_VLAN_INSERT |
 			  DEV_TX_OFFLOAD_IPV4_CKSUM  |
 			  DEV_TX_OFFLOAD_UDP_CKSUM   |
@@ -1464,5 +1464,5 @@ igb_get_tx_port_offloads_capa(struct rte_eth_dev *dev)
 			  DEV_TX_OFFLOAD_MULTI_SEGS;
 
-	return rx_offload_capa;
+	return tx_offload_capa;
 }
 
@@ -1470,9 +1470,9 @@ uint64_t
 igb_get_tx_queue_offloads_capa(struct rte_eth_dev *dev)
 {
-	uint64_t rx_queue_offload_capa;
+	uint64_t tx_queue_offload_capa;
 
-	rx_queue_offload_capa = igb_get_tx_port_offloads_capa(dev);
+	tx_queue_offload_capa = igb_get_tx_port_offloads_capa(dev);
 
-	return rx_queue_offload_capa;
+	return tx_queue_offload_capa;
 }
 
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-11-20 17:53:07.974567986 +0000
+++ 0021-net-e1000-fix-Tx-offload-capability-typos.patch	2018-11-20 17:53:07.000000000 +0000
@@ -1,13 +1,14 @@
-From daa3b0833f086c520696433e056b3c97a570370a Mon Sep 17 00:00:00 2001
+From 02f25b4214d362f19b265066c71c2b1d2204f834 Mon Sep 17 00:00:00 2001
 From: Yaroslav Brustinov <ybrustin at cisco.com>
 Date: Wed, 8 Aug 2018 12:45:21 +0300
 Subject: [PATCH] net/e1000: fix Tx offload capability typos
 
+[ upstream commit daa3b0833f086c520696433e056b3c97a570370a ]
+
 Fix rx/tx typos in igb_get_tx_port_offloads_capa and
 igb_get_tx_queue_offloads_capa.
 
 Fixes: e5c05e6590ea ("net/e1000: convert to new Tx offloads API")
-Cc: stable at dpdk.org
 
 Signed-off-by: Yaroslav Brustinov <ybrustin at cisco.com>
 Acked-by: Qi Zhang <qi.z.zhang at intel.com>