[dpdk-stable] patch 'net/ixgbe: fix Rx LRO capability offload for x550' 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 12/18/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 9ed35b6dda00c193248dd337d1c34defe4f4fd9b Mon Sep 17 00:00:00 2001
From: Wei Zhao <wei.zhao1 at intel.com>
Date: Fri, 30 Nov 2018 15:50:30 +0800
Subject: [PATCH] net/ixgbe: fix Rx LRO capability offload for x550

[ upstream commit b8ffdcc0ba163a173e969b2d8bce5d41132a561d ]

X550 does support LRO offload.

Fixes: 8eecb3295aed ("ixgbe: add LRO support")

Signed-off-by: Wei Zhao <wei.zhao1 at intel.com>
Reviewed-by: Qi Zhang <qi.z.zhang at intel.com>
---
 drivers/net/ixgbe/ixgbe_rxtx.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ixgbe/ixgbe_rxtx.c b/drivers/net/ixgbe/ixgbe_rxtx.c
index 4bfd2a422..1ea7ae59f 100644
--- a/drivers/net/ixgbe/ixgbe_rxtx.c
+++ b/drivers/net/ixgbe/ixgbe_rxtx.c
@@ -2870,5 +2870,6 @@ ixgbe_get_rx_port_offloads(struct rte_eth_dev *dev)
 	 */
 	if ((hw->mac.type == ixgbe_mac_82599EB ||
-	     hw->mac.type == ixgbe_mac_X540) &&
+	     hw->mac.type == ixgbe_mac_X540 ||
+	     hw->mac.type == ixgbe_mac_X550) &&
 	    !RTE_ETH_DEV_SRIOV(dev).active)
 		offloads |= DEV_RX_OFFLOAD_TCP_LRO;
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-12-14 17:49:47.899995558 +0000
+++ 0007-net-ixgbe-fix-Rx-LRO-capability-offload-for-x550.patch	2018-12-14 17:49:47.000000000 +0000
@@ -1,12 +1,13 @@
-From b8ffdcc0ba163a173e969b2d8bce5d41132a561d Mon Sep 17 00:00:00 2001
+From 9ed35b6dda00c193248dd337d1c34defe4f4fd9b Mon Sep 17 00:00:00 2001
 From: Wei Zhao <wei.zhao1 at intel.com>
 Date: Fri, 30 Nov 2018 15:50:30 +0800
 Subject: [PATCH] net/ixgbe: fix Rx LRO capability offload for x550
 
+[ upstream commit b8ffdcc0ba163a173e969b2d8bce5d41132a561d ]
+
 X550 does support LRO offload.
 
 Fixes: 8eecb3295aed ("ixgbe: add LRO support")
-Cc: stable at dpdk.org
 
 Signed-off-by: Wei Zhao <wei.zhao1 at intel.com>
 Reviewed-by: Qi Zhang <qi.z.zhang at intel.com>
@@ -15,10 +16,10 @@
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/net/ixgbe/ixgbe_rxtx.c b/drivers/net/ixgbe/ixgbe_rxtx.c
-index ddc7efa87..7771d0e6d 100644
+index 4bfd2a422..1ea7ae59f 100644
 --- a/drivers/net/ixgbe/ixgbe_rxtx.c
 +++ b/drivers/net/ixgbe/ixgbe_rxtx.c
-@@ -2868,5 +2868,6 @@ ixgbe_get_rx_port_offloads(struct rte_eth_dev *dev)
+@@ -2870,5 +2870,6 @@ ixgbe_get_rx_port_offloads(struct rte_eth_dev *dev)
  	 */
  	if ((hw->mac.type == ixgbe_mac_82599EB ||
 -	     hw->mac.type == ixgbe_mac_X540) &&