Merge branch 'pm-sleep'

[linux-2.6-microblaze.git] / drivers / scsi / lpfc / lpfc_mbox.c

diff --git a/drivers/scsi/lpfc/lpfc_mbox.c b/drivers/scsi/lpfc/lpfc_mbox.c
index 84bc373..6c754ee 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_mbox.c
+++ b/drivers/scsi/lpfc/lpfc_mbox.c
@@ -513,8 +513,9 @@ lpfc_init_link(struct lpfc_hba * phba,
                break;
        }
 
-       if ((phba->pcidev->device == PCI_DEVICE_ID_LANCER_G6_FC ||
-            phba->pcidev->device == PCI_DEVICE_ID_LANCER_G7_FC) &&
+       /* Topology handling for ASIC_GEN_NUM 0xC and later */
+       if ((phba->sli4_hba.pc_sli4_params.sli_family == LPFC_SLI_INTF_FAMILY_G6 ||
+            phba->sli4_hba.pc_sli4_params.if_type == LPFC_SLI_INTF_IF_TYPE_6) &&
            !(phba->sli4_hba.pc_sli4_params.pls) &&
            mb->un.varInitLnk.link_flags & FLAGS_TOPOLOGY_MODE_LOOP) {
                mb->un.varInitLnk.link_flags = FLAGS_TOPOLOGY_MODE_PT_PT;