From ec367bff87b3be51b8ee4c12f2f3ed6b459c2238 Mon Sep 17 00:00:00 2001
From: Stanislaw Gruszka <stf_xl@wp.pl>
Date: Fri, 28 Mar 2008 13:00:26 +0000
Subject: [PATCH] Synchronize with Feral CVS repository: - remove the poorly
 thought out isp_in_intr goop

git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@315 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 qla_isp/common/isp.c    | 10 +---------
 qla_isp/common/ispvar.h |  4 ++--
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/qla_isp/common/isp.c b/qla_isp/common/isp.c
index 98a4ead02..6a1649951 100644
--- a/qla_isp/common/isp.c
+++ b/qla_isp/common/isp.c
@@ -1,4 +1,4 @@
-/* $Id: isp.c,v 1.202 2008/03/15 18:17:14 mjacob Exp $ */
+/* $Id: isp.c,v 1.203 2008/03/16 00:34:49 mjacob Exp $ */
 /*-
  *  Copyright (c) 1997-2008 by Matthew Jacob
  *  All rights reserved.
@@ -5068,11 +5068,6 @@ isp_intr(ispsoftc_t *isp, uint32_t isr, uint16_t sema, uint16_t mbox)
 	uint32_t iptr, optr, junk;
 	int i, nlooked = 0, ndone = 0;
 
-	if (isp->isp_in_intr) {
-		isp_prt(isp, ISP_LOGERR, "recursive isp_intr!");
-		return;
-	}
-	isp->isp_in_intr = 1;
 again:
 	optr = isp->isp_residx;
 	/*
@@ -5095,7 +5090,6 @@ again:
 				}
 				if (isp->isp_mbxwrk0) {
 					if (isp_mbox_continue(isp) == 0) {
-						isp->isp_in_intr = 0;
 						return;
 					}
 				}
@@ -5105,7 +5099,6 @@ again:
 				    "mailbox cmd (0x%x) with no waiters", mbox);
 			}
 		} else if (isp_parse_async(isp, mbox) < 0) {
-			isp->isp_in_intr = 0;
 			return;
 		}
 		if ((IS_FC(isp) && mbox != ASYNC_RIO_RESP) ||
@@ -5629,7 +5622,6 @@ out:
 			isp_done(xs);
 		}
 	}
-	isp->isp_in_intr = 0;
 }
 
 /*
diff --git a/qla_isp/common/ispvar.h b/qla_isp/common/ispvar.h
index 03ee01f2c..24e1282fe 100644
--- a/qla_isp/common/ispvar.h
+++ b/qla_isp/common/ispvar.h
@@ -1,4 +1,4 @@
-/* $Id: ispvar.h,v 1.95 2008/03/15 18:17:15 mjacob Exp $ */
+/* $Id: ispvar.h,v 1.96 2008/03/16 00:34:49 mjacob Exp $ */
 /*-
  *  Copyright (c) 1997-2008 by Matthew Jacob
  *  All rights reserved.
@@ -559,7 +559,7 @@ struct ispsoftc {
 	volatile uint32_t	:	8,
 				:	2,
 		isp_dead	:	1,
-		isp_in_intr	:	1,
+				:	1,
 		isp_mboxbsy	:	1,	/* mailbox command active */
 		isp_state	:	3,
 		isp_nactive	:	16;	/* how many commands active */