diff options
| author | James Bottomley <JBottomley@Parallels.com> | 2014-08-06 13:26:55 -0400 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2014-08-06 13:26:55 -0400 |
| commit | ae87e8b212eda02503418657530a266ecb4a7180 (patch) | |
| tree | 5b91ae2da111567460f0f933a23cc45d2eedc535 /include | |
| parent | 653f0c8bade3afa975b9223d59323bc09db09cb1 (diff) | |
| parent | bfb5087924921f147d4c5d731cbc8c3a069bed0b (diff) | |
Merge remote-tracking branch 'scsi-queue/drivers-for-3.17' into for-next
Diffstat (limited to 'include')
| -rw-r--r-- | include/scsi/iscsi_if.h | 1 |
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 { | |||
| 527 | ISCSI_ERR_XMIT_FAILED = ISCSI_ERR_BASE + 19, | 527 | ISCSI_ERR_XMIT_FAILED = ISCSI_ERR_BASE + 19, |
| 528 | ISCSI_ERR_TCP_CONN_CLOSE = ISCSI_ERR_BASE + 20, | 528 | ISCSI_ERR_TCP_CONN_CLOSE = ISCSI_ERR_BASE + 20, |
| 529 | ISCSI_ERR_SCSI_EH_SESSION_RST = ISCSI_ERR_BASE + 21, | 529 | ISCSI_ERR_SCSI_EH_SESSION_RST = ISCSI_ERR_BASE + 21, |
| 530 | ISCSI_ERR_NOP_TIMEDOUT = ISCSI_ERR_BASE + 22, | ||
| 530 | }; | 531 | }; |
| 531 | 532 | ||
| 532 | /* | 533 | /* |