[dpdk-stable] patch 'net/bnxt: check VLANs from pool map only for VMDq' has been queued to stable release 17.08.1

[Yuanhan Liu]

Hi,

FYI, your patch has been queued to stable release 17.08.1

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/24/17. So please
shout if anyone has objections.

Thanks.

	--yliu

---
>From ad9f7d9ceadeefecb8dd64471fc3ff0e2387fa3e Mon Sep 17 00:00:00 2001
From: Ajit Khaparde <ajit.khaparde at broadcom.com>
Date: Tue, 24 Oct 2017 16:19:53 -0500
Subject: [PATCH] net/bnxt: check VLANs from pool map only for VMDq

[ upstream commit bb102e136816d85901fceeaf2aaf7138cb581e87 ]

Fixes: 75cd6fb1d901 ("net/bnxt: fix the association of a MACVLAN per VNIC")

Signed-off-by: Ajit Khaparde <ajit.khaparde at broadcom.com>
---
 drivers/net/bnxt/bnxt_hwrm.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c
index 896405c..27885c0 100644
--- a/drivers/net/bnxt/bnxt_hwrm.c
+++ b/drivers/net/bnxt/bnxt_hwrm.c
@@ -367,7 +367,8 @@ int bnxt_hwrm_set_filter(struct bnxt *bp,
 	uint16_t j = dst_id - 1;
 
 	//TODO: Is there a better way to add VLANs to each VNIC in case of VMDQ
-	if (conf->pool_map[j].pools & (1UL << j)) {
+	if ((dev_conf->rxmode.mq_mode & ETH_MQ_RX_VMDQ_FLAG) &&
+	    conf->pool_map[j].pools & (1UL << j)) {
 		RTE_LOG(DEBUG, PMD,
 			"Add vlan %u to vmdq pool %u\n",
 			conf->pool_map[j].vlan_id, j);
-- 
2.7.4