mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-21 20:51:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Synchronize with Feral CVS repository:

Browse Source 
- 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
This commit is contained in:
Stanislaw Gruszka
2008-03-28 13:00:26 +00:00
parent d2303505f5
commit ec367bff87
2 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
qla_isp/common/isp.c
View File

@@ -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;
}
/*

4
qla_isp/common/ispvar.h
View File

@@ -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 */