[dpdk-stable] patch 'net/bnxt: fix boolean operator usage' 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 11/11/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.

Queued patches are on a temporary branch at:
https://github.com/bluca/dpdk-stable

This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/25bce6cab35c1db26eac436dee5e6c145468fd5f

Thanks.

Luca Boccassi

---
>From 25bce6cab35c1db26eac436dee5e6c145468fd5f Mon Sep 17 00:00:00 2001
From: Lance Richardson <lance.richardson at broadcom.com>
Date: Thu, 22 Oct 2020 14:45:10 -0400
Subject: [PATCH] net/bnxt: fix boolean operator usage

[ upstream commit 47b70761670dc8b5bb8399df280476d9767b11df ]

Use boolean AND operator instead of bitwise operator.

Coverity issue: 323488
Fixes: b42c15c83e88 ("net/bnxt: support trusted VF")

Signed-off-by: Lance Richardson <lance.richardson at broadcom.com>
Reviewed-by: Ajit Khaparde <ajit.khaparde 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 65527a0637..6b69172990 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -1088,7 +1088,7 @@ static int bnxt_mac_addr_add_op(struct rte_eth_dev *eth_dev,
 	if (rc)
 		return rc;
 
-	if (BNXT_VF(bp) & !BNXT_VF_IS_TRUSTED(bp)) {
+	if (BNXT_VF(bp) && !BNXT_VF_IS_TRUSTED(bp)) {
 		PMD_DRV_LOG(ERR, "Cannot add MAC address to a VF interface\n");
 		return -ENOTSUP;
 	}
-- 
2.27.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-09 18:40:13.242912988 +0000
+++ 0053-net-bnxt-fix-boolean-operator-usage.patch	2020-11-09 18:40:11.183312091 +0000
@@ -1 +1 @@
-From 47b70761670dc8b5bb8399df280476d9767b11df Mon Sep 17 00:00:00 2001
+From 25bce6cab35c1db26eac436dee5e6c145468fd5f Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 47b70761670dc8b5bb8399df280476d9767b11df ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -19 +20 @@
-index 8025e33e9a..6757d36825 100644
+index 65527a0637..6b69172990 100644
@@ -22 +23 @@
-@@ -1550,7 +1550,7 @@ static int bnxt_mac_addr_add_op(struct rte_eth_dev *eth_dev,
+@@ -1088,7 +1088,7 @@ static int bnxt_mac_addr_add_op(struct rte_eth_dev *eth_dev,