1 files changed, 10 insertions, 6 deletions

diff --git a/drivers/scsi/qla2xxx/qla_fw.h b/drivers/scsi/qla2xxx/qla_fw.h
index 25364b1aaf12..69a5e31dd93a 100644
--- a/drivers/scsi/qla2xxx/qla_fw.h
+++ b/drivers/scsi/qla2xxx/qla_fw.h
@@ -954,7 +954,15 @@ struct device_reg_24xx {
 
 /* MID Support ***************************************************************/
 
-#define MAX_MID_VPS     125
+#define MIN_MULTI_ID_FABRIC     64      /* Must be power-of-2. */
+#define MAX_MULTI_ID_FABRIC     256     /* ... */
+
+#define for_each_mapped_vp_idx(_ha, _idx)               \
+        for (_idx = find_next_bit((_ha)->vp_idx_map,    \
+                (_ha)->max_npiv_vports + 1, 1);         \
+            _idx <= (_ha)->max_npiv_vports;             \
+            _idx = find_next_bit((_ha)->vp_idx_map,     \
+                (_ha)->max_npiv_vports + 1, _idx + 1))  \
 
 struct mid_conf_entry_24xx {
         uint16_t reserved_1;
@@ -982,7 +990,7 @@ struct mid_init_cb_24xx {
         uint16_t count;
         uint16_t options;
 
-        struct mid_conf_entry_24xx entries[MAX_MID_VPS];
+        struct mid_conf_entry_24xx entries[MAX_MULTI_ID_FABRIC];
 };
 
 
@@ -1002,10 +1010,6 @@ struct mid_db_entry_24xx {
         uint8_t reserved_1;
 };
 
-struct mid_db_24xx {
-        struct mid_db_entry_24xx entries[MAX_MID_VPS];
-};
-
  /*
  * Virtual Fabric ID type definition.
  */