[dpdk-stable] patch 'net/dpaa2: fix Rx offload flags on jumbo MTU set' has been queued to LTS release 18.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.6

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/17/19. 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. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/624517908e39e36b4ea15b07d6bf4b0906395a19

Thanks.

Kevin.

---
>From 624517908e39e36b4ea15b07d6bf4b0906395a19 Mon Sep 17 00:00:00 2001
From: Sachin Saxena <sachin.saxena at nxp.com>
Date: Mon, 11 Nov 2019 21:38:57 +0530
Subject: [PATCH] net/dpaa2: fix Rx offload flags on jumbo MTU set

[ upstream commit 0d20cda8a935d0df3c6e483422151705200907d0 ]

The JUMBO frame handling in dpaa2_dev_mtu_set api was not correct.
When frame_size is greater than RTE_ETHER_MAX_LEN, the
intention is to add JUMBO flag in rx offload while it was resetting
all other flags other than JUMBO as AND operator was used instead of OR.

Fixes: 0ebce6129bc6 ("net/dpaa2: support new ethdev offload APIs")

Signed-off-by: Sachin Saxena <sachin.saxena at nxp.com>
Reviewed-by: Gagandeep Singh <g.singh at nxp.com>
---
 drivers/net/dpaa2/dpaa2_ethdev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c
index e3266085a..e50467285 100644
--- a/drivers/net/dpaa2/dpaa2_ethdev.c
+++ b/drivers/net/dpaa2/dpaa2_ethdev.c
@@ -1031,5 +1031,5 @@ dpaa2_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
 
 	if (frame_size > ETHER_MAX_LEN)
-		dev->data->dev_conf.rxmode.offloads &=
+		dev->data->dev_conf.rxmode.offloads |=
 						DEV_RX_OFFLOAD_JUMBO_FRAME;
 	else
-- 
2.21.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-12-11 21:24:14.478023350 +0000
+++ 0022-net-dpaa2-fix-Rx-offload-flags-on-jumbo-MTU-set.patch	2019-12-11 21:24:12.622652147 +0000
@@ -1 +1 @@
-From 0d20cda8a935d0df3c6e483422151705200907d0 Mon Sep 17 00:00:00 2001
+From 624517908e39e36b4ea15b07d6bf4b0906395a19 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 0d20cda8a935d0df3c6e483422151705200907d0 ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org
@@ -21 +22 @@
-index eea31f254..2cde55e7c 100644
+index e3266085a..e50467285 100644
@@ -24 +25 @@
-@@ -1290,5 +1290,5 @@ dpaa2_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
+@@ -1031,5 +1031,5 @@ dpaa2_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
@@ -26 +27 @@
- 	if (frame_size > RTE_ETHER_MAX_LEN)
+ 	if (frame_size > ETHER_MAX_LEN)