Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...

[karo-tx-linux.git] / drivers / scsi / qla4xxx / ql4_fw.h

diff --git a/drivers/scsi/qla4xxx/ql4_fw.h b/drivers/scsi/qla4xxx/ql4_fw.h
index 209853ce0bbc63a5ca0a1a2a5601d2bdf68baa87..699575efc9ba89f9f027384b1aeaa124f5aa2136 100644 (file)
--- a/drivers/scsi/qla4xxx/ql4_fw.h
+++ b/drivers/scsi/qla4xxx/ql4_fw.h
@@ -1415,6 +1415,9 @@ struct ql_iscsi_stats {
 #define QLA83XX_DBG_OCM_WNDREG_ARRAY_LEN       16
 #define QLA83XX_SS_OCM_WNDREG_INDEX            3
 #define QLA83XX_SS_PCI_INDEX                   0
+#define QLA8022_TEMPLATE_CAP_OFFSET            172
+#define QLA83XX_TEMPLATE_CAP_OFFSET            268
+#define QLA80XX_TEMPLATE_RESERVED_BITS         16
 
 struct qla4_8xxx_minidump_template_hdr {
        uint32_t entry_type;
@@ -1434,6 +1437,7 @@ struct qla4_8xxx_minidump_template_hdr {
        uint32_t saved_state_array[QLA8XXX_DBG_STATE_ARRAY_LEN];
        uint32_t capture_size_array[QLA8XXX_DBG_CAP_SIZE_ARRAY_LEN];
        uint32_t ocm_window_reg[QLA83XX_DBG_OCM_WNDREG_ARRAY_LEN];
+       uint32_t capabilities[QLA80XX_TEMPLATE_RESERVED_BITS];
 };
 
 #endif /*  _QLA4X_FW_H */