diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-28 19:44:18 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-28 19:44:18 -0400 |
| commit | ec7ae517537ae5c7b0b2cd7f562dfa3e7a05b954 (patch) | |
| tree | e6b0c64a51a7c0aa0efd09d4f7a80872e3b1657a /drivers/scsi/lpfc/lpfc_sli.h | |
| parent | 97d2eb13a019ec09cc1a7ea2d3705c0b117b3c0d (diff) | |
| parent | 590134fa78fbdbe5fea78c7ae0b2c3364bc9572f (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (204 commits)
[SCSI] qla4xxx: export address/port of connection (fix udev disk names)
[SCSI] ipr: Fix BUG on adapter dump timeout
[SCSI] megaraid_sas: Fix instance access in megasas_reset_timer
[SCSI] hpsa: change confusing message to be more clear
[SCSI] iscsi class: fix vlan configuration
[SCSI] qla4xxx: fix data alignment and use nl helpers
[SCSI] iscsi class: fix link local mispelling
[SCSI] iscsi class: Replace iscsi_get_next_target_id with IDA
[SCSI] aacraid: use lower snprintf() limit
[SCSI] lpfc 8.3.27: Change driver version to 8.3.27
[SCSI] lpfc 8.3.27: T10 additions for SLI4
[SCSI] lpfc 8.3.27: Fix queue allocation failure recovery
[SCSI] lpfc 8.3.27: Change algorithm for getting physical port name
[SCSI] lpfc 8.3.27: Changed worst case mailbox timeout
[SCSI] lpfc 8.3.27: Miscellanous logic and interface fixes
[SCSI] megaraid_sas: Changelog and version update
[SCSI] megaraid_sas: Add driver workaround for PERC5/1068 kdump kernel panic
[SCSI] megaraid_sas: Add multiple MSI-X vector/multiple reply queue support
[SCSI] megaraid_sas: Add support for MegaRAID 9360/9380 12GB/s controllers
[SCSI] megaraid_sas: Clear FUSION_IN_RESET before enabling interrupts
...
Diffstat (limited to 'drivers/scsi/lpfc/lpfc_sli.h')
| -rw-r--r-- | drivers/scsi/lpfc/lpfc_sli.h | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/drivers/scsi/lpfc/lpfc_sli.h b/drivers/scsi/lpfc/lpfc_sli.h index a0075b0af14..29c13b63e32 100644 --- a/drivers/scsi/lpfc/lpfc_sli.h +++ b/drivers/scsi/lpfc/lpfc_sli.h | |||
| @@ -293,13 +293,11 @@ struct lpfc_sli { | |||
| 293 | struct lpfc_lnk_stat lnk_stat_offsets; | 293 | struct lpfc_lnk_stat lnk_stat_offsets; |
| 294 | }; | 294 | }; |
| 295 | 295 | ||
| 296 | #define LPFC_MBOX_TMO 30 /* Sec tmo for outstanding mbox | 296 | /* Timeout for normal outstanding mbox command (Seconds) */ |
| 297 | command */ | 297 | #define LPFC_MBOX_TMO 30 |
| 298 | #define LPFC_MBOX_SLI4_CONFIG_TMO 60 /* Sec tmo for outstanding mbox | 298 | /* Timeout for non-flash-based outstanding sli_config mbox command (Seconds) */ |
| 299 | command */ | 299 | #define LPFC_MBOX_SLI4_CONFIG_TMO 60 |
| 300 | #define LPFC_MBOX_TMO_FLASH_CMD 300 /* Sec tmo for outstanding FLASH write | 300 | /* Timeout for flash-based outstanding sli_config mbox command (Seconds) */ |
| 301 | * or erase cmds. This is especially | 301 | #define LPFC_MBOX_SLI4_CONFIG_EXTENDED_TMO 300 |
| 302 | * long because of the potential of | 302 | /* Timeout for other flash-based outstanding mbox command (Seconds) */ |
| 303 | * multiple flash erases that can be | 303 | #define LPFC_MBOX_TMO_FLASH_CMD 300 |
| 304 | * spawned. | ||
| 305 | */ | ||