1 files changed, 10 insertions, 6 deletions

diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index 5f6b2960cccb..e86201d3b8c6 100644
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -2163,7 +2163,7 @@ struct ct_fdmi_hba_attr {
                 uint8_t node_name[WWN_SIZE];
                 uint8_t manufacturer[64];
                 uint8_t serial_num[32];
-                uint8_t model[16];
+                uint8_t model[16+1];
                 uint8_t model_desc[80];
                 uint8_t hw_version[32];
                 uint8_t driver_version[32];
@@ -2184,9 +2184,9 @@ struct ct_fdmiv2_hba_attr {
         uint16_t len;
         union {
                 uint8_t node_name[WWN_SIZE];
-                uint8_t manufacturer[32];
+                uint8_t manufacturer[64];
                 uint8_t serial_num[32];
-                uint8_t model[16];
+                uint8_t model[16+1];
                 uint8_t model_desc[80];
                 uint8_t hw_version[16];
                 uint8_t driver_version[32];
@@ -2252,7 +2252,7 @@ struct ct_fdmiv2_port_attr {
                 uint32_t cur_speed;
                 uint32_t max_frame_size;
                 uint8_t os_dev_name[32];
-                uint8_t host_name[32];
+                uint8_t host_name[256];
                 uint8_t node_name[WWN_SIZE];
                 uint8_t port_name[WWN_SIZE];
                 uint8_t port_sym_name[128];
@@ -2283,7 +2283,7 @@ struct ct_fdmi_port_attr {
                 uint32_t cur_speed;
                 uint32_t max_frame_size;
                 uint8_t os_dev_name[32];
-                uint8_t host_name[32];
+                uint8_t host_name[256];
         } a;
 };
 
@@ -3132,7 +3132,8 @@ struct qla_hw_data {
                                 IS_QLA25XX(ha) || IS_QLA81XX(ha) || \
                                 IS_QLA82XX(ha) || IS_QLA83XX(ha) || \
                                 IS_QLA8044(ha) || IS_QLA27XX(ha))
-#define IS_MSIX_NACK_CAPABLE(ha) (IS_QLA81XX(ha) || IS_QLA83XX(ha))
+#define IS_MSIX_NACK_CAPABLE(ha) (IS_QLA81XX(ha) || IS_QLA83XX(ha) || \
+                                IS_QLA27XX(ha))
 #define IS_NOPOLLING_TYPE(ha)   (IS_QLA81XX(ha) && (ha)->flags.msix_enabled)
 #define IS_FAC_REQUIRED(ha)     (IS_QLA81XX(ha) || IS_QLA83XX(ha) || \
                                 IS_QLA27XX(ha))
@@ -3300,6 +3301,8 @@ struct qla_hw_data {
 #define RISC_RDY_AFT_RESET      3
 #define RISC_SRAM_DUMP_CMPL     4
 #define RISC_EXT_MEM_DUMP_CMPL  5
+#define ISP_MBX_RDY             6
+#define ISP_SOFT_RESET_CMPL     7
         int             fw_dump_reading;
         int             prev_minidump_failed;
         dma_addr_t      eft_dma;
@@ -3587,6 +3590,7 @@ typedef struct scsi_qla_host {
 #define VP_BIND_NEEDED          2
 #define VP_DELETE_NEEDED        3
 #define VP_SCR_NEEDED           4       /* State Change Request registration */
+#define VP_CONFIG_OK            5       /* Flag to cfg VP, if FW is ready */
         atomic_t                vp_state;
 #define VP_OFFLINE              0
 #define VP_ACTIVE               1