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

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.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 02/13/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.

Thanks.

Luca Boccassi

---
>From ba0d3f9bae1e243b9573b06c61c4f3793c052a39 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 26805f17b7..fce9ce2feb 100644
--- a/drivers/net/dpaa/dpaa_ethdev.c
+++ b/drivers/net/dpaa/dpaa_ethdev.c
@@ -174,7 +174,7 @@ dpaa_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
 	}
 
 	if (frame_size > RTE_ETHER_MAX_LEN)
-		dev->data->dev_conf.rxmode.offloads &=
+		dev->data->dev_conf.rxmode.offloads |=
 						DEV_RX_OFFLOAD_JUMBO_FRAME;
 	else
 		dev->data->dev_conf.rxmode.offloads &=
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-02-11 11:17:42.273433964 +0000
+++ 0098-net-dpaa-fix-Rx-offload-flags-on-jumbo-MTU-set.patch	2020-02-11 11:17:38.544004040 +0000
@@ -1,15 +1,16 @@
-From 40c79ea091e37efc836597cac2fa98be08feb72a Mon Sep 17 00:00:00 2001
+From ba0d3f9bae1e243b9573b06c61c4f3793c052a39 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")
-Cc: stable at dpdk.org
 
 Signed-off-by: Apeksha Gupta <apeksha.gupta at nxp.com>
 Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>