[dpdk-stable] patch 'net/bnxt: fix LRO configuration' 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 0322383d4d264aa6f14e2d43772f5457bcee559d Mon Sep 17 00:00:00 2001
From: Venkat Duvvuru <venkatkumar.duvvuru at broadcom.com>
Date: Fri, 28 Aug 2020 10:31:08 +0530
Subject: [PATCH] net/bnxt: fix LRO configuration

[ upstream commit 349355141cfe5823cd60d75e5e2f8b2acf3f8b17 ]

The maximum number of TCP segments that can be aggregated & the
maximum number of aggregations the VNIC supports are configured
incorrectly during LRO configuration.

This patch fixes these values.

Fixes: b150a7e7ee66 ("net/bnxt: support LRO on Thor adapters")

Signed-off-by: Venkat Duvvuru <venkatkumar.duvvuru at broadcom.com>
Reviewed-by: Kalesh AP <kalesh-anakkur.purayil at broadcom.com>
Reviewed-by: Somnath Kotur <somnath.kotur at broadcom.com>
Reviewed-by: Ajit Khaparde <ajit.khaparde at broadcom.com>
---
 drivers/net/bnxt/bnxt_hwrm.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c
index f78563e944..ddcb81f29c 100644
--- a/drivers/net/bnxt/bnxt_hwrm.c
+++ b/drivers/net/bnxt/bnxt_hwrm.c
@@ -2127,8 +2127,8 @@ int bnxt_hwrm_vnic_tpa_cfg(struct bnxt *bp,
 				HWRM_VNIC_TPA_CFG_INPUT_FLAGS_GRO |
 				HWRM_VNIC_TPA_CFG_INPUT_FLAGS_AGG_WITH_ECN |
 			HWRM_VNIC_TPA_CFG_INPUT_FLAGS_AGG_WITH_SAME_GRE_SEQ);
-		req.max_agg_segs = rte_cpu_to_le_16(BNXT_TPA_MAX_AGGS(bp));
-		req.max_aggs = rte_cpu_to_le_16(BNXT_TPA_MAX_SEGS(bp));
+		req.max_aggs = rte_cpu_to_le_16(BNXT_TPA_MAX_AGGS(bp));
+		req.max_agg_segs = rte_cpu_to_le_16(BNXT_TPA_MAX_SEGS(bp));
 		req.min_agg_len = rte_cpu_to_le_32(512);
 	}
 	req.vnic_id = rte_cpu_to_le_16(vnic->fw_vnic_id);
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-10-28 10:35:12.166086957 +0000
+++ 0012-net-bnxt-fix-LRO-configuration.patch	2020-10-28 10:35:11.416828728 +0000
@@ -1,8 +1,10 @@
-From 349355141cfe5823cd60d75e5e2f8b2acf3f8b17 Mon Sep 17 00:00:00 2001
+From 0322383d4d264aa6f14e2d43772f5457bcee559d Mon Sep 17 00:00:00 2001
 From: Venkat Duvvuru <venkatkumar.duvvuru at broadcom.com>
 Date: Fri, 28 Aug 2020 10:31:08 +0530
 Subject: [PATCH] net/bnxt: fix LRO configuration
 
+[ upstream commit 349355141cfe5823cd60d75e5e2f8b2acf3f8b17 ]
+
 The maximum number of TCP segments that can be aggregated & the
 maximum number of aggregations the VNIC supports are configured
 incorrectly during LRO configuration.
@@ -10,7 +12,6 @@
 This patch fixes these values.
 
 Fixes: b150a7e7ee66 ("net/bnxt: support LRO on Thor adapters")
-Cc: stable at dpdk.org
 
 Signed-off-by: Venkat Duvvuru <venkatkumar.duvvuru at broadcom.com>
 Reviewed-by: Kalesh AP <kalesh-anakkur.purayil at broadcom.com>
@@ -21,10 +22,10 @@
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c
-index c1af814040..f326f842b6 100644
+index f78563e944..ddcb81f29c 100644
 --- a/drivers/net/bnxt/bnxt_hwrm.c
 +++ b/drivers/net/bnxt/bnxt_hwrm.c
-@@ -2264,8 +2264,8 @@ int bnxt_hwrm_vnic_tpa_cfg(struct bnxt *bp,
+@@ -2127,8 +2127,8 @@ int bnxt_hwrm_vnic_tpa_cfg(struct bnxt *bp,
  				HWRM_VNIC_TPA_CFG_INPUT_FLAGS_GRO |
  				HWRM_VNIC_TPA_CFG_INPUT_FLAGS_AGG_WITH_ECN |
  			HWRM_VNIC_TPA_CFG_INPUT_FLAGS_AGG_WITH_SAME_GRE_SEQ);