From: Andrew Vasquez Date: Fri, 28 May 2010 22:08:22 +0000 (-0700) Subject: [SCSI] qla2xxx: Make the FC port capability mutual exclusive. X-Git-Tag: firefly_0821_release~9833^2~1305^2~241 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b0cd579cde8ee0c7ed52239531ba09bcbc5b54c2;p=firefly-linux-kernel-4.4.55.git [SCSI] qla2xxx: Make the FC port capability mutual exclusive. In case of both target and initiator capabilities reported by fc port, the fc port port capability is made mutualy exclusive with priority given for target capabilities. Signed-off-by: Giridhar Malavali Signed-off-by: James Bottomley --- diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c index e51fc5f9fcdb..8a608725eb76 100644 --- a/drivers/scsi/qla2xxx/qla_isr.c +++ b/drivers/scsi/qla2xxx/qla_isr.c @@ -1133,9 +1133,9 @@ qla24xx_logio_entry(scsi_qla_host_t *vha, struct req_que *req, 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; if (logio->io_parameter[9] || logio->io_parameter[10])