diff options
| author | James Bottomley <James.Bottomley@HansenPartnership.com> | 2009-05-20 18:20:44 -0400 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2009-05-20 18:20:44 -0400 |
| commit | 45d7c46d54dae008f66db58e6bd31d9b31833043 (patch) | |
| tree | 0e85cf3a39eadc84d3fb2b49d8697ed3a100ba9c /include/scsi/scsi_transport_fc.h | |
| parent | 279e677faa775ad16e75c32e1bf4a37f8158bc61 (diff) | |
| parent | 2b69a8a2b6e5f5d26a038a6494a88a1a776ac88f (diff) | |
Merge branch 'scsi-fixes' into merge-base
Diffstat (limited to 'include/scsi/scsi_transport_fc.h')
| -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; |