diff --git a/[refs] b/[refs] index 5b6133c26a1e..53041cbe9cb3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d5459083af5b6e01796797edd12555ab586c6092 +refs/heads/master: bfdaa761d3f9663a4721f572e093dd2894cedaf9 diff --git a/trunk/drivers/scsi/qla2xxx/qla_sup.c b/trunk/drivers/scsi/qla2xxx/qla_sup.c index f32a4b032967..e74552c8c5e1 100644 --- a/trunk/drivers/scsi/qla2xxx/qla_sup.c +++ b/trunk/drivers/scsi/qla2xxx/qla_sup.c @@ -739,11 +739,11 @@ qla2xxx_get_flt_info(scsi_qla_host_t *vha, uint32_t flt_addr) ha->flt_region_gold_fw = start; break; case FLT_REG_FCP_PRIO_0: - if (!(PCI_FUNC(ha->pdev->devfn) & 1)) + if (ha->flags.port0) ha->flt_region_fcp_prio = start; break; case FLT_REG_FCP_PRIO_1: - if (PCI_FUNC(ha->pdev->devfn) & 1) + if (!ha->flags.port0) ha->flt_region_fcp_prio = start; break; }