[dpdk-stable] patch 'net/iavf: fix scattered Rx enabling' has been queued to stable release 19.11.6

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.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 10/30/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 7b4464ccbcb451f3c66e9bbcbc3da766e60cdd94 Mon Sep 17 00:00:00 2001
From: Steve Yang <stevex.yang at intel.com>
Date: Fri, 4 Sep 2020 07:29:02 +0000
Subject: [PATCH] net/iavf: fix scattered Rx enabling

[ upstream commit 0f14a4127ea6e6e079caaccc98c98dc4b0b20e1d ]

No need to add additional vlan tag size for max packet size,
the queue's Rx Max Frame Size (rxq->max_pkt_len) already
includes the vlan header size in iavf.

Fixes: 69dd4c3d0898 ("net/avf: enable queue and device")

Signed-off-by: Steve Yang <stevex.yang at intel.com>
Acked-by: Beilei Xing <beilei.xing at intel.com>
---
 drivers/net/iavf/iavf_ethdev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c
index 8ddd4aad9a..1556c146ea 100644
--- a/drivers/net/iavf/iavf_ethdev.c
+++ b/drivers/net/iavf/iavf_ethdev.c
@@ -263,7 +263,7 @@ iavf_init_rxq(struct rte_eth_dev *dev, struct iavf_rx_queue *rxq)
 
 	rxq->max_pkt_len = max_pkt_len;
 	if ((dev_data->dev_conf.rxmode.offloads & DEV_RX_OFFLOAD_SCATTER) ||
-	    (rxq->max_pkt_len + 2 * IAVF_VLAN_TAG_SIZE) > buf_size) {
+	    rxq->max_pkt_len > buf_size) {
 		dev_data->scattered_rx = 1;
 	}
 	IAVF_PCI_REG_WRITE(rxq->qrx_tail, rxq->nb_rx_desc - 1);
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-10-28 10:35:12.416870174 +0000
+++ 0020-net-iavf-fix-scattered-Rx-enabling.patch	2020-10-28 10:35:11.440829082 +0000
@@ -1,14 +1,15 @@
-From 0f14a4127ea6e6e079caaccc98c98dc4b0b20e1d Mon Sep 17 00:00:00 2001
+From 7b4464ccbcb451f3c66e9bbcbc3da766e60cdd94 Mon Sep 17 00:00:00 2001
 From: Steve Yang <stevex.yang at intel.com>
 Date: Fri, 4 Sep 2020 07:29:02 +0000
 Subject: [PATCH] net/iavf: fix scattered Rx enabling
 
+[ upstream commit 0f14a4127ea6e6e079caaccc98c98dc4b0b20e1d ]
+
 No need to add additional vlan tag size for max packet size,
 the queue's Rx Max Frame Size (rxq->max_pkt_len) already
 includes the vlan header size in iavf.
 
 Fixes: 69dd4c3d0898 ("net/avf: enable queue and device")
-Cc: stable at dpdk.org
 
 Signed-off-by: Steve Yang <stevex.yang at intel.com>
 Acked-by: Beilei Xing <beilei.xing at intel.com>
@@ -17,10 +18,10 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c
-index 28ca3fa8f7..ec4b1a1487 100644
+index 8ddd4aad9a..1556c146ea 100644
 --- a/drivers/net/iavf/iavf_ethdev.c
 +++ b/drivers/net/iavf/iavf_ethdev.c
-@@ -286,7 +286,7 @@ iavf_init_rxq(struct rte_eth_dev *dev, struct iavf_rx_queue *rxq)
+@@ -263,7 +263,7 @@ iavf_init_rxq(struct rte_eth_dev *dev, struct iavf_rx_queue *rxq)
  
  	rxq->max_pkt_len = max_pkt_len;
  	if ((dev_data->dev_conf.rxmode.offloads & DEV_RX_OFFLOAD_SCATTER) ||