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

Synchronize with Feral CVS repository:

Browse Source 
- Allow ISP_FC_GETDINFO callers to get target mode entries.
- Remove stray '`' from define and PPC is now working again.
- Fix a typo which had us loading 2322 f/w into a 2300. Oops.


git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@278 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Stanislaw Gruszka
2008-02-12 10:50:57 +00:00
parent ba3e4ca72f
commit 2a806d5bb5
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
qla_isp/linux/isp_cb_ops.c
View File

@@ -1,4 +1,4 @@
/* $Id: isp_cb_ops.c,v 1.84 2008/01/08 18:31:21 mjacob Exp $ */
/* $Id: isp_cb_ops.c,v 1.85 2008/01/14 18:39:10 mjacob Exp $ */
/*
* Copyright (c) 1997-2007 by Matthew Jacob
* All rights reserved.
@@ -627,7 +627,7 @@ isp_ioctl(struct inode *ip, struct file *fp, unsigned int c, unsigned long arg)
}
ISP_LOCK_SOFTC(isp);
lp = &FCPARAM(isp, ifc->chan)->portdb[ifc->loopid];
if (lp->state == FC_PORTDB_STATE_VALID) {
if (lp->state == FC_PORTDB_STATE_VALID || lp->target_mode) {
ifc->role = lp->roles;
ifc->loopid = lp->handle;
ifc->portid = lp->portid;

4
qla_isp/linux/isp_linux.h
View File

@@ -1,4 +1,4 @@
/* $Id: isp_linux.h,v 1.150 2008/01/13 21:18:01 mjacob Exp $ */
/* $Id: isp_linux.h,v 1.151 2008/01/14 17:28:09 mjacob Exp $ */
/*
* Copyright (c) 1997-2007 by Matthew Jacob
* All rights reserved.
@@ -447,7 +447,7 @@ struct isposinfo {
#define MAXISPREQUEST(isp) ((IS_FC(isp) || IS_ULTRA2(isp))? 1024 : 256)
#if defined(__powerpc__)
#define`MEMORYBARRIER(isp, type, offset, size) __asm__ __volatile__("eieio" ::: "memory")
#define MEMORYBARRIER(isp, type, offset, size) __asm__ __volatile__("eieio" ::: "memory")
#else
# ifdef mb
# define MEMORYBARRIER(isp, type, offset, size) mb()

6
qla_isp/linux/isp_pci.c
View File

@@ -1,4 +1,4 @@
/* $Id: isp_pci.c,v 1.152 2008/01/13 21:18:01 mjacob Exp $ */
/* $Id: isp_pci.c,v 1.153 2008/01/14 00:25:53 mjacob Exp $ */
/*
* Copyright (c) 1997-2007 by Matthew Jacob
* All rights reserved.
@@ -737,9 +737,9 @@ isplinux_pci_init_one(struct Scsi_Host *host)
isp->isp_type = ISP_HA_FC_2322;
fwname = "ql2322_fw.bin";
}
if (pdev->device == PCI_DEVICE_ID_QLOGIC_ISP6312) {
if (pdev->device == PCI_DEVICE_ID_QLOGIC_ISP6322) {
isp->isp_mdvec = &mdvec_2300;
isp->isp_type = ISP_HA_FC_2312;
isp->isp_type = ISP_HA_FC_2322;
fwname = "ql2322_fw.bin";
}
#endif