Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[net-next-2.6.git] / drivers / scsi / bfa / bfa_fcs.c

diff --git a/drivers/scsi/bfa/bfa_fcs.c b/drivers/scsi/bfa/bfa_fcs.c
index 153cb2a3ffe32afb2b8f10eae95fed70e63ccf7c..d1a99209bf5f9fbd7260b470ececa3a25b733829 100644 (file)
--- a/drivers/scsi/bfa/bfa_fcs.c
+++ b/drivers/scsi/bfa/bfa_fcs.c
@@ -99,14 +99,22 @@ bfa_fcs_attach(struct bfa_fcs_s *fcs, struct bfa_s *bfa, struct bfad_s *bfad,
 void
 bfa_fcs_init(struct bfa_fcs_s *fcs)
 {
-       int             i;
+       int i, npbc_vports;
        struct bfa_fcs_mod_s  *mod;
+       struct bfi_pbc_vport_s pbc_vports[BFI_PBC_MAX_VPORTS];
 
        for (i = 0; i < ARRAY_SIZE(fcs_modules); i++) {
                mod = &fcs_modules[i];
                if (mod->modinit)
                        mod->modinit(fcs);
        }
+       /* Initialize pbc vports */
+       if (!fcs->min_cfg) {
+               npbc_vports =
+                       bfa_iocfc_get_pbc_vports(fcs->bfa, pbc_vports);
+               for (i = 0; i < npbc_vports; i++)
+                       bfa_fcb_pbc_vport_create(fcs->bfa->bfad, pbc_vports[i]);
+       }
 }
 
 /**