diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-23 16:44:00 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-23 16:44:00 -0400 |
| commit | 4a5daceca1d96e949fc35f2f600de816862e8e74 (patch) | |
| tree | a2ea20b569632d59abad0f351e17824440805582 /include | |
| parent | 3eb9c8be0cc56619571b675a688001f2ddb25c90 (diff) | |
| parent | 2b69a8a2b6e5f5d26a038a6494a88a1a776ac88f (diff) | |
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] mpt2sas: fix driver version inconsistency
[SCSI] 3w-xxxx: scsi_dma_unmap fix
[SCSI] 3w-9xxx: scsi_dma_unmap fix
[SCSI] ses: fix problems caused by empty SES provided name
[SCSI] fc-transport: Close state transition-window during rport deletion.
[SCSI] initialize max_target_blocked in scsi_alloc_target
[SCSI] fnic: Add new Cisco PCI-Express FCoE HBA
Diffstat (limited to 'include')
| -rw-r--r-- | include/scsi/scsi_transport_fc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h index c9184f756cad..68a8d873bbd9 100644 --- a/include/scsi/scsi_transport_fc.h +++ b/include/scsi/scsi_transport_fc.h | |||
| @@ -680,7 +680,7 @@ fc_remote_port_chkready(struct fc_rport *rport) | |||
| 680 | if (rport->roles & FC_PORT_ROLE_FCP_TARGET) | 680 | if (rport->roles & FC_PORT_ROLE_FCP_TARGET) |
| 681 | result = 0; | 681 | result = 0; |
| 682 | else if (rport->flags & FC_RPORT_DEVLOSS_PENDING) | 682 | else if (rport->flags & FC_RPORT_DEVLOSS_PENDING) |
| 683 | result = DID_TRANSPORT_DISRUPTED << 16; | 683 | result = DID_IMM_RETRY << 16; |
| 684 | else | 684 | else |
| 685 | result = DID_NO_CONNECT << 16; | 685 | result = DID_NO_CONNECT << 16; |
| 686 | break; | 686 | break; |
| @@ -688,7 +688,7 @@ fc_remote_port_chkready(struct fc_rport *rport) | |||
| 688 | if (rport->flags & FC_RPORT_FAST_FAIL_TIMEDOUT) | 688 | if (rport->flags & FC_RPORT_FAST_FAIL_TIMEDOUT) |
| 689 | result = DID_TRANSPORT_FAILFAST << 16; | 689 | result = DID_TRANSPORT_FAILFAST << 16; |
| 690 | else | 690 | else |
| 691 | result = DID_TRANSPORT_DISRUPTED << 16; | 691 | result = DID_IMM_RETRY << 16; |
| 692 | break; | 692 | break; |
| 693 | default: | 693 | default: |
| 694 | result = DID_NO_CONNECT << 16; | 694 | result = DID_NO_CONNECT << 16; |