[SCSI] qla2xxx: Do not enable VP in non fabric topology.

After topology change ISP is reset and VPs are re-enabled.
If the topology is not fabric, VPs could falsely get enabled.

Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

diff --git a/drivers/scsi/qla2xxx/qla_mid.c b/drivers/scsi/qla2xxx/qla_mid.c
index 8220e7b9799bb4cc7dd819bd28dc59c11f082a96..d1618b4a5e50ab76de897c6e730c0b08fcb73ab3 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_mid.c
+++ b/drivers/scsi/qla2xxx/qla_mid.c
@@ -136,7 +136,8 @@ qla24xx_enable_vp(scsi_qla_host_t *vha)
 
        /* Check if physical ha port is Up */
        if (atomic_read(&base_vha->loop_state) == LOOP_DOWN  ||
-               atomic_read(&base_vha->loop_state) == LOOP_DEAD) {
+               atomic_read(&base_vha->loop_state) == LOOP_DEAD ||
+               !(ha->current_topology & ISP_CFG_F)) {
                vha->vp_err_state =  VP_ERR_PORTDWN;
                fc_vport_set_state(vha->fc_vport, FC_VPORT_LINKDOWN);
                goto enable_failed;