[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20110426211239.CA2CE3E1887@tassilo.jf.intel.com>
Date: Tue, 26 Apr 2011 14:12:39 -0700 (PDT)
From: Andi Kleen <andi@...stfloor.org>
To: andrew.vasquez@...gic.com, giridhar.malavali@...gic.com,
James.Bottomley@...e.de, Madhu.Iyengar@...gic.com,
ak@...ux.intel.com, linux-kernel@...r.kernel.org,
stable@...nel.org, tim.bird@...sony.com
Subject: [PATCH] [2/106] qla2xxx: Make the FC port capability mutual exclusive.
2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Andrew Vasquez <andrew.vasquez@...gic.com>
[ upstream commit b0cd579cde8ee0c7ed52239531ba09bcbc5b54c2 ]
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 <giridhar.malavali@...gic.com>
Signed-off-by: James Bottomley <James.Bottomley@...e.de>
Acked-by: Madhuranath Iyengar <Madhu.Iyengar@...gic.com>
Signed-off-by: Andi Kleen <ak@...ux.intel.com>
Index: linux-2.6.35.y/drivers/scsi/qla2xxx/qla_isr.c
===================================================================
--- linux-2.6.35.y.orig/drivers/scsi/qla2xxx/qla_isr.c
+++ linux-2.6.35.y/drivers/scsi/qla2xxx/qla_isr.c
@@ -1119,9 +1119,9 @@ qla24xx_logio_entry(scsi_qla_host_t *vha
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])
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists