diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-02 15:52:28 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-02 15:52:28 -0800 |
| commit | 9a689bc4f09f8b89f88e65b1b0a2ea780b4f28de (patch) | |
| tree | d1ab7273b725acb1b28091e7634a4ed2e9ba2f41 /include | |
| parent | 1122b19b8f4da2ee6d6b21780f86bea7957f641e (diff) | |
| parent | dc5c49bff34e5b5a4334560dc7f7dfeae91d8962 (diff) | |
| download | linux-9a689bc4f09f8b89f88e65b1b0a2ea780b4f28de.tar.gz linux-9a689bc4f09f8b89f88e65b1b0a2ea780b4f28de.tar.bz2 linux-9a689bc4f09f8b89f88e65b1b0a2ea780b4f28de.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
[SCSI] stex: switch to block timeout
[SCSI] make scsi_eh_try_stu use block timeout
[SCSI] megaraid_sas: switch to block timeout
[SCSI] ibmvscsi: switch to block timeout
[SCSI] aacraid: switch to block timeout
[SCSI] zfcp: prevent double decrement on host_busy while being busy
[SCSI] zfcp: fix deadlock between wq triggered port scan and ERP
[SCSI] zfcp: eliminate race between validation and locking
[SCSI] zfcp: verify for correct rport state before scanning for SCSI devs
[SCSI] zfcp: returning an ERR_PTR where a NULL value is expected
[SCSI] zfcp: Fix opening of wka ports
[SCSI] zfcp: fix remote port status check
[SCSI] fc_transport: fix old bug on bitflag definitions
[SCSI] Fix hang in starved list processing
Diffstat (limited to 'include')
| -rw-r--r-- | include/scsi/scsi_transport_fc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h index 49d8913c4f86..6e04e6fe79c7 100644 --- a/include/scsi/scsi_transport_fc.h +++ b/include/scsi/scsi_transport_fc.h @@ -357,7 +357,7 @@ struct fc_rport { /* aka fc_starget_attrs */ /* bit field values for struct fc_rport "flags" field: */ #define FC_RPORT_DEVLOSS_PENDING 0x01 #define FC_RPORT_SCAN_PENDING 0x02 -#define FC_RPORT_FAST_FAIL_TIMEDOUT 0x03 +#define FC_RPORT_FAST_FAIL_TIMEDOUT 0x04 #define dev_to_rport(d) \ container_of(d, struct fc_rport, dev) |