diff options
| author | James Bottomley <JBottomley@Parallels.com> | 2014-01-22 09:57:27 -0800 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2014-01-22 09:57:27 -0800 |
| commit | 4b1a9a5e40210cb4a0687806d3b631f7db4b9b0e (patch) | |
| tree | 4f33f3af2e1ff163c6f4a1022d1d6b6be7b11547 /drivers/scsi/hpsa.h | |
| parent | dcaf9aed995c2b2a49fb86bbbcfa2f92c797ab5d (diff) | |
| parent | 3ce438df106826edde7ad724f3819716a3f0cf56 (diff) | |
| download | linux-4b1a9a5e40210cb4a0687806d3b631f7db4b9b0e.tar.gz | |
Merge branch 'misc' into for-linus
Diffstat (limited to 'drivers/scsi/hpsa.h')
| -rw-r--r-- | drivers/scsi/hpsa.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/scsi/hpsa.h b/drivers/scsi/hpsa.h index bc85e7244f40..01c328349c83 100644 --- a/drivers/scsi/hpsa.h +++ b/drivers/scsi/hpsa.h @@ -114,6 +114,11 @@ struct ctlr_info { struct TransTable_struct *transtable; unsigned long transMethod; + /* cap concurrent passthrus at some reasonable maximum */ +#define HPSA_MAX_CONCURRENT_PASSTHRUS (20) + spinlock_t passthru_count_lock; /* protects passthru_count */ + int passthru_count; + /* * Performant mode completion buffers */ @@ -130,7 +135,9 @@ struct ctlr_info { u32 heartbeat_sample_interval; atomic_t firmware_flash_in_progress; u32 lockup_detected; - struct list_head lockup_list; + struct delayed_work monitor_ctlr_work; + int remove_in_progress; + u32 fifo_recently_full; /* Address of h->q[x] is passed to intr handler to know which queue */ u8 q[MAX_REPLY_QUEUES]; u32 TMFSupportFlags; /* cache what task mgmt funcs are supported. */ |