diff --git a/qla2x00t-32gbit/qla_mbx.c b/qla2x00t-32gbit/qla_mbx.c index 0d7aa6fce..3ebda35dd 100644 --- a/qla2x00t-32gbit/qla_mbx.c +++ b/qla2x00t-32gbit/qla_mbx.c @@ -4364,6 +4364,13 @@ qla24xx_modify_vp_config(scsi_qla_host_t *vha) return QLA_MEMORY_ALLOC_FAILED; } + /* + * vp_config_entry_24xx_ext overlays vp_config_entry_24xx for the + * full 64-byte 24xx layout (the ext variant merely appends fields + * at offset 64+ which this helper never touches), so the IOCB is + * built and inspected through a single struct vp_config_entry_24xx + * pointer regardless of adapter stride. + */ vpmod->entry_type = VP_CONFIG_IOCB_TYPE; vpmod->entry_count = 1; vpmod->command = VCT_COMMAND_MOD_ENABLE_VPS; @@ -4392,7 +4399,6 @@ qla24xx_modify_vp_config(scsi_qla_host_t *vha) le16_to_cpu(vpmod->comp_status)); rval = QLA_FUNCTION_FAILED; } else { - /* EMPTY */ ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10c0, "Done %s.\n", __func__); fc_vport_set_state(vha->fc_vport, FC_VPORT_INITIALIZING); diff --git a/qla2x00t-32gbit/qla_os.c b/qla2x00t-32gbit/qla_os.c index ab77c441c..7782f4e98 100644 --- a/qla2x00t-32gbit/qla_os.c +++ b/qla2x00t-32gbit/qla_os.c @@ -8689,6 +8689,7 @@ qla2x00_module_init(void) BUILD_BUG_ON(sizeof(struct verify_chip_rsp_84xx) != 52); BUILD_BUG_ON(sizeof(struct vf_evfp_entry_24xx) != 56); BUILD_BUG_ON(sizeof(struct vp_config_entry_24xx) != 64); + BUILD_BUG_ON(sizeof(struct vp_config_entry_24xx_ext) != 128); BUILD_BUG_ON(sizeof(struct vp_ctrl_entry_24xx) != 64); BUILD_BUG_ON(sizeof(struct vp_ctrl_entry_24xx_ext) != 128); BUILD_BUG_ON(sizeof(struct vp_rpt_id_entry_24xx) != 64);