summaryrefslogtreecommitdiffstats
path: root/include/scsi
diff options
context:
space:
mode:
authorJames Bottomley <JBottomley@Parallels.com>2014-08-06 10:26:55 -0700
committerJames Bottomley <JBottomley@Parallels.com>2014-08-06 10:26:55 -0700
commitae87e8b212eda02503418657530a266ecb4a7180 (patch)
tree5b91ae2da111567460f0f933a23cc45d2eedc535 /include/scsi
parent653f0c8bade3afa975b9223d59323bc09db09cb1 (diff)
parentbfb5087924921f147d4c5d731cbc8c3a069bed0b (diff)
downloadlinux-ae87e8b212eda02503418657530a266ecb4a7180.tar.bz2
Merge remote-tracking branch 'scsi-queue/drivers-for-3.17' into for-next
Diffstat (limited to 'include/scsi')
-rw-r--r--include/scsi/iscsi_if.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/scsi/iscsi_if.h b/include/scsi/iscsi_if.h
index fd0421c6d40a..95ed9424a11a 100644
--- a/include/scsi/iscsi_if.h
+++ b/include/scsi/iscsi_if.h
@@ -527,6 +527,7 @@ enum iscsi_err {
ISCSI_ERR_XMIT_FAILED = ISCSI_ERR_BASE + 19,
ISCSI_ERR_TCP_CONN_CLOSE = ISCSI_ERR_BASE + 20,
ISCSI_ERR_SCSI_EH_SESSION_RST = ISCSI_ERR_BASE + 21,
+ ISCSI_ERR_NOP_TIMEDOUT = ISCSI_ERR_BASE + 22,
};
/*