[dpdk-stable] patch 'net/bnxt: fix adding MAC address' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

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

Thanks.

Kevin Traynor

---
>From 22db13c0f1e6c1489e4329144ca77c859dd843ba Mon Sep 17 00:00:00 2001
From: Kalesh AP <kalesh-anakkur.purayil at broadcom.com>
Date: Thu, 18 Jul 2019 09:05:57 +0530
Subject: [PATCH] net/bnxt: fix adding MAC address

[ upstream commit d8b3bc78d804467ebf75e04beede0d941af91195 ]

HWRM command to add MAC address can fail. Driver should check
the return value of HWRM command and do the house keeping properly.

Fixes: 778b759ba10e ("net/bnxt: add MAC address")

Signed-off-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_ethdev.c | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index e701b7b16..f0b799764 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -782,4 +782,5 @@ static int bnxt_mac_addr_add_op(struct rte_eth_dev *eth_dev,
 	struct bnxt_vnic_info *vnic = &bp->vnic_info[pool];
 	struct bnxt_filter_info *filter;
+	int rc = 0;
 
 	if (BNXT_VF(bp) & !BNXT_VF_IS_TRUSTED(bp)) {
@@ -805,8 +806,18 @@ static int bnxt_mac_addr_add_op(struct rte_eth_dev *eth_dev,
 		return -ENODEV;
 	}
-	STAILQ_INSERT_TAIL(&vnic->filter, filter, next);
+
 	filter->mac_index = index;
 	memcpy(filter->l2_addr, mac_addr, ETHER_ADDR_LEN);
-	return bnxt_hwrm_set_l2_filter(bp, vnic->fw_vnic_id, filter);
+
+	rc = bnxt_hwrm_set_l2_filter(bp, vnic->fw_vnic_id, filter);
+	if (!rc) {
+		STAILQ_INSERT_TAIL(&vnic->filter, filter, next);
+	} else {
+		filter->mac_index = INVALID_MAC_INDEX;
+		memset(&filter->l2_addr, 0, ETHER_ADDR_LEN);
+		bnxt_free_filter(bp, filter);
+	}
+
+	return rc;
 }
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-28 14:32:34.083369671 +0100
+++ 0039-net-bnxt-fix-adding-MAC-address.patch	2019-08-28 14:32:31.686956357 +0100
@@ -1 +1 @@
-From d8b3bc78d804467ebf75e04beede0d941af91195 Mon Sep 17 00:00:00 2001
+From 22db13c0f1e6c1489e4329144ca77c859dd843ba Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit d8b3bc78d804467ebf75e04beede0d941af91195 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -20 +21 @@
-index 306d62772..15048de3f 100644
+index e701b7b16..f0b799764 100644
@@ -23 +24 @@
-@@ -916,4 +916,5 @@ static int bnxt_mac_addr_add_op(struct rte_eth_dev *eth_dev,
+@@ -782,4 +782,5 @@ static int bnxt_mac_addr_add_op(struct rte_eth_dev *eth_dev,
@@ -29 +30 @@
-@@ -939,8 +940,18 @@ static int bnxt_mac_addr_add_op(struct rte_eth_dev *eth_dev,
+@@ -805,8 +806,18 @@ static int bnxt_mac_addr_add_op(struct rte_eth_dev *eth_dev,
@@ -35 +36 @@
- 	memcpy(filter->l2_addr, mac_addr, RTE_ETHER_ADDR_LEN);
+ 	memcpy(filter->l2_addr, mac_addr, ETHER_ADDR_LEN);
@@ -43 +44 @@
-+		memset(&filter->l2_addr, 0, RTE_ETHER_ADDR_LEN);
++		memset(&filter->l2_addr, 0, ETHER_ADDR_LEN);