From 6e187ca1fa1abbebea4a53ddd85ab2b39510e092 Mon Sep 17 00:00:00 2001 From: Giridhar Malavali Date: Fri, 28 May 2010 15:08:20 -0700 Subject: [PATCH] --- yaml --- r: 204079 b: refs/heads/master c: 3a6478df74c271cb3be5895b39fddf75e9cef89c h: refs/heads/master i: 204077: 5fb3093b7d72dfe02db056d08e51253859ee1ebc 204075: ee63bb9937445fd339917d4425a34a0d096adb69 204071: 0a5ac3b411d124dedbbe24852f152c09c3d13cf5 204063: a16ad9edbe7c2e32157f1f0594272ea37f53443f v: v3 --- [refs] | 2 +- trunk/drivers/scsi/qla2xxx/qla_init.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 9ddb2a3a55ee..cdf2bc4fc6ad 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6ac5260850841eb4055811a68ff47d658ebe9a59 +refs/heads/master: 3a6478df74c271cb3be5895b39fddf75e9cef89c diff --git a/trunk/drivers/scsi/qla2xxx/qla_init.c b/trunk/drivers/scsi/qla2xxx/qla_init.c index cc7352545081..9d969b596b14 100644 --- a/trunk/drivers/scsi/qla2xxx/qla_init.c +++ b/trunk/drivers/scsi/qla2xxx/qla_init.c @@ -2651,7 +2651,8 @@ qla2x00_configure_loop(scsi_qla_host_t *vha) set_bit(LOCAL_LOOP_UPDATE, &vha->dpc_flags); if (test_bit(RSCN_UPDATE, &save_flags)) { set_bit(RSCN_UPDATE, &vha->dpc_flags); - vha->flags.rscn_queue_overflow = 1; + if (!IS_ALOGIO_CAPABLE(ha)) + vha->flags.rscn_queue_overflow = 1; } } @@ -3209,8 +3210,9 @@ qla2x00_find_all_fabric_devs(scsi_qla_host_t *vha, if (qla2x00_is_reserved_id(vha, loop_id)) continue; - if (atomic_read(&vha->loop_down_timer) || - LOOP_TRANSITION(vha)) { + if (ha->current_topology == ISP_CFG_FL && + (atomic_read(&vha->loop_down_timer) || + LOOP_TRANSITION(vha))) { atomic_set(&vha->loop_down_timer, 0); set_bit(LOOP_RESYNC_NEEDED, &vha->dpc_flags); set_bit(LOCAL_LOOP_UPDATE, &vha->dpc_flags);