summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorJames Bottomley <James.Bottomley@HansenPartnership.com>2009-05-21 02:20:44 +0400
committerJames Bottomley <James.Bottomley@HansenPartnership.com>2009-05-21 02:20:44 +0400
commit45d7c46d54dae008f66db58e6bd31d9b31833043 (patch)
tree0e85cf3a39eadc84d3fb2b49d8697ed3a100ba9c /include
parent279e677faa775ad16e75c32e1bf4a37f8158bc61 (diff)
parent2b69a8a2b6e5f5d26a038a6494a88a1a776ac88f (diff)
downloadlinux-45d7c46d54dae008f66db58e6bd31d9b31833043.tar.xz
Merge branch 'scsi-fixes' into merge-base
Diffstat (limited to 'include')
-rw-r--r--include/scsi/scsi_transport_fc.h4
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)
if (rport->roles & FC_PORT_ROLE_FCP_TARGET)
result = 0;
else if (rport->flags & FC_RPORT_DEVLOSS_PENDING)
- result = DID_TRANSPORT_DISRUPTED << 16;
+ result = DID_IMM_RETRY << 16;
else
result = DID_NO_CONNECT << 16;
break;
@@ -688,7 +688,7 @@ fc_remote_port_chkready(struct fc_rport *rport)
if (rport->flags & FC_RPORT_FAST_FAIL_TIMEDOUT)
result = DID_TRANSPORT_FAILFAST << 16;
else
- result = DID_TRANSPORT_DISRUPTED << 16;
+ result = DID_IMM_RETRY << 16;
break;
default:
result = DID_NO_CONNECT << 16;