commit d06737ea2d38bc8e6698ba34934fb91b91f42648
author Jiri Kosina <jkosina@suse.cz> Thu May 20 11:14:20 2010 +0200
committer Jiri Kosina <jkosina@suse.cz> Thu May 20 11:14:20 2010 +0200
tree 2b955fd5c05c3bd065f002ec808df8b3d842f0d6
parent 3a2ef9b1e2c5a50b688836398dd3003cfdf422c0

- patches.drivers/qla2xxx-fix-tgt-init-prli-payload.diff: SLES11
  SP1 GMC kernel not identifying qla2xxx LUNs (bnc#606977).

Conflicts:

	kernel-source.changes
	series.conf

suse-commit: b1d1d2c777cd52f1270bd4f309b3ae49e0dc3d2c

drivers/scsi/qla2xxx/qla_isr.c

diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index 7a587c1..423fc13 100644
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -1115,8 +1115,7 @@
 			fcport->port_type = FCT_TARGET;
 			if (iop[0] & BIT_8)
 				fcport->flags |= FCF_FCP2_DEVICE;
-		}
-		if (iop[0] & BIT_5)
+		} else if (iop[0] & BIT_5)
 			fcport->port_type = FCT_INITIATOR;
 		if (logio->io_parameter[7] || logio->io_parameter[8])
 			fcport->supported_classes |= FC_COS_CLASS2;