[SCSI] bfa: statistics and typo fix

[mv-sheeva.git] / drivers / scsi / bfa / bfad_drv.h

diff --git a/drivers/scsi/bfa/bfad_drv.h b/drivers/scsi/bfa/bfad_drv.h
index 107848cd3b6df2f40eaad3643fce95a11e8f54be..8629f64a52871486ec88c51509dc9cf9af0e5d72 100644 (file)
--- a/drivers/scsi/bfa/bfad_drv.h
+++ b/drivers/scsi/bfa/bfad_drv.h
@@ -120,6 +120,8 @@ struct bfad_vport_s {
        struct bfad_port_s     drv_port;
        struct bfa_fcs_vport_s fcs_vport;
        struct completion *comp_del;
+       struct list_head list_entry;
+       struct bfa_port_cfg_s port_cfg;
 };
 
 /*
@@ -139,18 +141,6 @@ struct bfad_cfg_param_s {
        u32        binding_method;
 };
 
-union bfad_tmp_buf {
-       /* From struct bfa_adapter_attr_s */
-       char            manufacturer[BFA_ADAPTER_MFG_NAME_LEN];
-       char            serial_num[BFA_ADAPTER_SERIAL_NUM_LEN];
-       char            model[BFA_ADAPTER_MODEL_NAME_LEN];
-       char            fw_ver[BFA_VERSION_LEN];
-       char            optrom_ver[BFA_VERSION_LEN];
-
-       /* From struct bfa_ioc_pci_attr_s */
-       u8         chip_rev[BFA_IOC_CHIP_REV_LEN];  /*  chip revision */
-};
-
 /*
  * BFAD (PCI function) data structure
  */
@@ -162,7 +152,6 @@ struct bfad_s {
        const char *pci_name;
        struct bfa_pcidev_s hal_pcidev;
        struct bfa_ioc_pci_attr_s pci_attr;
-       unsigned long   pci_bar0_map;
        void __iomem   *pci_bar0_kva;
        struct completion comp;
        struct completion suspend;
@@ -194,8 +183,13 @@ struct bfad_s {
        struct bfa_plog_s      plog_buf;
        int             ref_count;
        bfa_boolean_t   ipfc_enabled;
-       union bfad_tmp_buf tmp_buf;
        struct fc_host_statistics link_stats;
+       struct list_head pbc_pcfg_list;
+};
+
+struct bfad_pcfg_s {
+       struct list_head list_entry;
+       struct bfa_port_cfg_s port_cfg;
 };
 
 /*
@@ -254,7 +248,7 @@ do {                                                \
 
 
 bfa_status_t    bfad_vport_create(struct bfad_s *bfad, u16 vf_id,
-                                 struct bfa_port_cfg_s *port_cfg);
+                         struct bfa_port_cfg_s *port_cfg, struct device *dev);
 bfa_status_t    bfad_vf_create(struct bfad_s *bfad, u16 vf_id,
                               struct bfa_port_cfg_s *port_cfg);
 bfa_status_t    bfad_cfg_pport(struct bfad_s *bfad, enum bfa_port_role role);
@@ -294,5 +288,6 @@ extern struct list_head bfad_list;
 extern int bfa_lun_queue_depth;
 extern int bfad_supported_fc4s;
 extern int bfa_linkup_delay;
+extern struct mutex bfad_mutex;
 
 #endif /* __BFAD_DRV_H__ */