From: Ron Mercer <ron.mercer@qlogic.com>
Date: Wed, 11 Mar 2009 11:55:41 +0000 (+0000)
Subject: qlge: bugfix: Tell hw to strip vlan header.
X-Git-Tag: v4.13~24417^2~11
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=a7a655f22c75f48e0afe8b86be03ecd70bd68b07;p=mirror_ubuntu-bionic-kernel.git

qlge: bugfix: Tell hw to strip vlan header.

Signed-off-by: Ron Mercer <ron.mercer@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c
index 87787b1ecab2..54d54ea03d49 100644
--- a/drivers/net/qlge/qlge_main.c
+++ b/drivers/net/qlge/qlge_main.c
@@ -2984,9 +2984,9 @@ static int ql_adapter_initialize(struct ql_adapter *qdev)
 	mask = value << 16;
 	ql_write32(qdev, SYS, mask | value);
 
-	/* Set the default queue. */
-	value = NIC_RCV_CFG_DFQ;
-	mask = NIC_RCV_CFG_DFQ_MASK;
+	/* Set the default queue, and VLAN behavior. */
+	value = NIC_RCV_CFG_DFQ | NIC_RCV_CFG_RV;
+	mask = NIC_RCV_CFG_DFQ_MASK | (NIC_RCV_CFG_RV << 16);
 	ql_write32(qdev, NIC_RCV_CFG, (mask | value));
 
 	/* Set the MPI interrupt to enabled. */