From a357faa40f0771927b851058a43588e7d4cdef00 Mon Sep 17 00:00:00 2001
From: Ron Mercer <ron.mercer@qlogic.com>
Date: Mon, 1 Oct 2007 11:43:23 -0700
Subject: [PATCH] --- yaml --- r: 65258 b: refs/heads/master c:
 50626297b1beb0a29c0f174be39f36485533216c h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/net/qla3xxx.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 32ae75e949db..c1a4b12f1c7a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b323e0e49fe9331ee3a7a336af879d6e303b16b3
+refs/heads/master: 50626297b1beb0a29c0f174be39f36485533216c
diff --git a/trunk/drivers/net/qla3xxx.c b/trunk/drivers/net/qla3xxx.c
index c3fe1c7c301c..ea151315050c 100755
--- a/trunk/drivers/net/qla3xxx.c
+++ b/trunk/drivers/net/qla3xxx.c
@@ -2249,6 +2249,12 @@ static int ql_tx_rx_clean(struct ql3_adapter *qdev,
 
 		net_rsp = qdev->rsp_current;
 		rmb();
+		/*
+		 * Fix 4032 chipe undocumented "feature" where bit-8 is set if the
+		 * inbound completion is for a VLAN.
+		 */
+		if (qdev->device_id == QL3032_DEVICE_ID)
+			net_rsp->opcode &= 0x7f;
 		switch (net_rsp->opcode) {
 
 		case OPCODE_OB_MAC_IOCB_FN0: