From: Ron Mercer <ron.mercer@qlogic.com>
Date: Mon, 1 Oct 2007 18:43:23 +0000 (-0700)
Subject: qla3xxx: bugfix: Fix VLAN rx completion handling.
X-Git-Tag: v2.6.23~38^2~2
X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;ds=sidebyside;h=50626297b1beb0a29c0f174be39f36485533216c;p=linux-2.6-omap-h63xx.git

qla3xxx: bugfix: Fix VLAN rx completion handling.

Fix 4032 chip undocumented "feature" where bit-8 is set
if the inbound completion is for a VLAN.

Signed-off-by: Ron Mercer <ron.mercer@qlogic.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
---

diff --git a/drivers/net/qla3xxx.c b/drivers/net/qla3xxx.c
index c3fe1c7c301..ea151315050 100755
--- a/drivers/net/qla3xxx.c
+++ b/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: