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

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.7

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/20/20. 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/defe8584b3505f2346ce60f67a08f7ae0789c454

Thanks.

Kevin.

---
>From defe8584b3505f2346ce60f67a08f7ae0789c454 Mon Sep 17 00:00:00 2001
From: Apeksha Gupta <apeksha.gupta at nxp.com>
Date: Thu, 16 Jan 2020 13:26:38 +0530
Subject: [PATCH] net/dpaa: fix Rx offload flags on jumbo MTU set

[ upstream commit 40c79ea091e37efc836597cac2fa98be08feb72a ]

The JUMBO frame handling in dpaa_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: Apeksha Gupta <apeksha.gupta at nxp.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>
---
 drivers/net/dpaa/dpaa_ethdev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c
index 5fbf152fa9..f41a01e113 100644
--- a/drivers/net/dpaa/dpaa_ethdev.c
+++ b/drivers/net/dpaa/dpaa_ethdev.c
@@ -173,5 +173,5 @@ dpaa_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.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-02-14 17:02:37.333623755 +0000
+++ 0005-net-dpaa-fix-Rx-offload-flags-on-jumbo-MTU-set.patch	2020-02-14 17:02:36.921408564 +0000
@@ -1 +1 @@
-From 40c79ea091e37efc836597cac2fa98be08feb72a Mon Sep 17 00:00:00 2001
+From defe8584b3505f2346ce60f67a08f7ae0789c454 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 40c79ea091e37efc836597cac2fa98be08feb72a ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org
@@ -21 +22 @@
-index 26805f17b7..fce9ce2feb 100644
+index 5fbf152fa9..f41a01e113 100644
@@ -24 +25 @@
-@@ -175,5 +175,5 @@ dpaa_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
+@@ -173,5 +173,5 @@ dpaa_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)