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

Synchronize with Feral CVS repository:

Browse Source 
If we're in role=NONE, then make sure that isp_init code sets state to
INITSTATE anyway.


git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@275 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Stanislaw Gruszka
2008-02-12 10:44:49 +00:00
parent a13eae04d2
commit 4bea275344
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
qla_isp/common/isp.c
View File

@@ -1,4 +1,4 @@
/* $Id: isp.c,v 1.192 2008/01/08 22:14:29 mjacob Exp $ */
/* $Id: isp.c,v 1.194 2008/01/09 18:57:21 mjacob Exp $ */
/*-
* Copyright (c) 1997-2007 by Matthew Jacob
* All rights reserved.
@@ -1544,6 +1544,7 @@ isp_fibre_init(ispsoftc_t *isp)
*/
fcp = FCPARAM(isp, 0);
if (fcp->role == ISP_ROLE_NONE) {
isp->isp_state = ISP_INITSTATE;
return;
}
@@ -1824,12 +1825,13 @@ isp_fibre_init_2400(ispsoftc_t *isp)
}
if (chan == isp->isp_nchan) {
isp_prt(isp, ISP_LOGDEBUG0, "all channels with role 'none'");
isp->isp_state = ISP_INITSTATE;
return;
}
if (ISP_CAP_MULTI_ID(isp) == 0 && isp->isp_nchan > 1) {
isp_prt(isp, ISP_LOGWARN,
"non-MULTIID firmware loaded, only can enable 1 of %d channels",
"non-MULTIID f/w loaded, only can enable 1 of %d channels",
isp->isp_nchan);
nchan = 1;
} else {

3
qla_isp/linux/isp_linux.h
View File

@@ -1,4 +1,4 @@
/* $Id: isp_linux.h,v 1.146 2007/12/11 22:19:07 mjacob Exp $ */
/* $Id: isp_linux.h,v 1.149 2008/01/09 05:41:45 mjacob Exp $ */
/*
* Copyright (c) 1997-2007 by Matthew Jacob
* All rights reserved.
@@ -294,7 +294,6 @@ struct isposinfo {
u16 wqcnt;
u16 wqhiwater;
u16 hiwater;
int role;
struct timer_list timer;
struct timer_list mbtimer;
struct semaphore mbox_sem;