diff options
Diffstat (limited to 'drivers/scsi/ipr.h')
-rw-r--r-- | drivers/scsi/ipr.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/scsi/ipr.h b/drivers/scsi/ipr.h index f93f8637c5a1..6d257e0dd6a5 100644 --- a/drivers/scsi/ipr.h +++ b/drivers/scsi/ipr.h | |||
@@ -208,7 +208,7 @@ | |||
208 | #define IPR_CANCEL_ALL_TIMEOUT (ipr_fastfail ? 10 * HZ : 30 * HZ) | 208 | #define IPR_CANCEL_ALL_TIMEOUT (ipr_fastfail ? 10 * HZ : 30 * HZ) |
209 | #define IPR_ABORT_TASK_TIMEOUT (ipr_fastfail ? 10 * HZ : 30 * HZ) | 209 | #define IPR_ABORT_TASK_TIMEOUT (ipr_fastfail ? 10 * HZ : 30 * HZ) |
210 | #define IPR_INTERNAL_TIMEOUT (ipr_fastfail ? 10 * HZ : 30 * HZ) | 210 | #define IPR_INTERNAL_TIMEOUT (ipr_fastfail ? 10 * HZ : 30 * HZ) |
211 | #define IPR_WRITE_BUFFER_TIMEOUT (10 * 60 * HZ) | 211 | #define IPR_WRITE_BUFFER_TIMEOUT (30 * 60 * HZ) |
212 | #define IPR_SET_SUP_DEVICE_TIMEOUT (2 * 60 * HZ) | 212 | #define IPR_SET_SUP_DEVICE_TIMEOUT (2 * 60 * HZ) |
213 | #define IPR_REQUEST_SENSE_TIMEOUT (10 * HZ) | 213 | #define IPR_REQUEST_SENSE_TIMEOUT (10 * HZ) |
214 | #define IPR_OPERATIONAL_TIMEOUT (5 * 60) | 214 | #define IPR_OPERATIONAL_TIMEOUT (5 * 60) |
@@ -1360,6 +1360,7 @@ enum ipr_sdt_state { | |||
1360 | INACTIVE, | 1360 | INACTIVE, |
1361 | WAIT_FOR_DUMP, | 1361 | WAIT_FOR_DUMP, |
1362 | GET_DUMP, | 1362 | GET_DUMP, |
1363 | READ_DUMP, | ||
1363 | ABORT_DUMP, | 1364 | ABORT_DUMP, |
1364 | DUMP_OBTAINED | 1365 | DUMP_OBTAINED |
1365 | }; | 1366 | }; |
@@ -1384,6 +1385,7 @@ struct ipr_ioa_cfg { | |||
1384 | u8 needs_warm_reset:1; | 1385 | u8 needs_warm_reset:1; |
1385 | u8 msi_received:1; | 1386 | u8 msi_received:1; |
1386 | u8 sis64:1; | 1387 | u8 sis64:1; |
1388 | u8 dump_timeout:1; | ||
1387 | 1389 | ||
1388 | u8 revid; | 1390 | u8 revid; |
1389 | 1391 | ||