[dpdk-stable] patch 'net/bnxt: fix mismatched type comparison in MAC restore' has been queued to stable release 19.11.9

[Christian Ehrhardt]

Hi,

FYI, your patch has been queued to stable release 19.11.9

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

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/12a80589b8d41ce8a5d8aa59501bf23daacf5ddf

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From 12a80589b8d41ce8a5d8aa59501bf23daacf5ddf Mon Sep 17 00:00:00 2001
From: Ajit Khaparde <ajit.khaparde at broadcom.com>
Date: Fri, 30 Apr 2021 13:14:10 -0700
Subject: [PATCH] net/bnxt: fix mismatched type comparison in MAC restore

[ upstream commit c8e8154390b38f9242249eb1e023df1db976a285 ]

dev_info.max_mac_addrs is of type uint32_t. But the counter i is
of type uint16_t. This mismatch may cause the loop condition may
always be true. Change the loop counter variable to uint32_t.

Fixes: b02f1573cd07 ("net/bnxt: restore MAC filters during reset recovery")

Signed-off-by: Ajit Khaparde <ajit.khaparde at broadcom.com>
Reviewed-by: Kalesh AP <kalesh-anakkur.purayil at broadcom.com>
---
 drivers/net/bnxt/bnxt_ethdev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index 0575d23a19..5e51da21b8 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -4044,7 +4044,7 @@ static int bnxt_restore_mac_filters(struct bnxt *bp)
 	struct rte_ether_addr *addr;
 	uint64_t pool_mask;
 	uint32_t pool = 0;
-	uint16_t i;
+	uint32_t i;
 	int rc;
 
 	if (BNXT_VF(bp) && !BNXT_VF_IS_TRUSTED(bp))
-- 
2.31.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-05-17 17:40:37.053776869 +0200
+++ 0196-net-bnxt-fix-mismatched-type-comparison-in-MAC-resto.patch	2021-05-17 17:40:29.567812595 +0200
@@ -1 +1 @@
-From c8e8154390b38f9242249eb1e023df1db976a285 Mon Sep 17 00:00:00 2001
+From 12a80589b8d41ce8a5d8aa59501bf23daacf5ddf Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit c8e8154390b38f9242249eb1e023df1db976a285 ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -20 +21 @@
-index 9c3e0f9f36..115acda9b3 100644
+index 0575d23a19..5e51da21b8 100644
@@ -23 +24 @@
-@@ -3989,7 +3989,7 @@ static int bnxt_restore_mac_filters(struct bnxt *bp)
+@@ -4044,7 +4044,7 @@ static int bnxt_restore_mac_filters(struct bnxt *bp)