Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

[pandora-kernel.git] / drivers / scsi / bnx2fc / bnx2fc.h

diff --git a/drivers/scsi/bnx2fc/bnx2fc.h b/drivers/scsi/bnx2fc/bnx2fc.h
index 0a404bf..d924236 100644 (file)
--- a/drivers/scsi/bnx2fc/bnx2fc.h
+++ b/drivers/scsi/bnx2fc/bnx2fc.h
@@ -62,7 +62,7 @@
 #include "bnx2fc_constants.h"
 
 #define BNX2FC_NAME            "bnx2fc"
-#define BNX2FC_VERSION         "1.0.1"
+#define BNX2FC_VERSION         "1.0.3"
 
 #define PFX                    "bnx2fc: "
 
@@ -152,7 +152,6 @@ struct bnx2fc_percpu_s {
        spinlock_t fp_work_lock;
 };
 
-
 struct bnx2fc_hba {
        struct list_head link;
        struct cnic_dev *cnic;
@@ -179,6 +178,7 @@ struct bnx2fc_hba {
                #define BNX2FC_CTLR_INIT_DONE           1
                #define BNX2FC_CREATE_DONE              2
        struct fcoe_ctlr ctlr;
+       struct list_head vports;
        u8 vlan_enabled;
        int vlan_id;
        u32 next_conn_id;
@@ -232,6 +232,11 @@ struct bnx2fc_hba {
 
 #define bnx2fc_from_ctlr(fip) container_of(fip, struct bnx2fc_hba, ctlr)
 
+struct bnx2fc_lport {
+       struct list_head list;
+       struct fc_lport *lport;
+};
+
 struct bnx2fc_cmd_mgr {
        struct bnx2fc_hba *hba;
        u16 next_idx;
@@ -262,9 +267,14 @@ struct bnx2fc_rport {
 #define BNX2FC_FLAG_UPLD_REQ_COMPL     0x8
 #define BNX2FC_FLAG_EXPL_LOGO          0x9
 
+       u8 src_addr[ETH_ALEN];
        u32 max_sqes;
        u32 max_rqes;
        u32 max_cqes;
+       atomic_t free_sqes;
+
+       struct b577xx_doorbell_set_prod sq_db;
+       struct b577xx_fcoe_rx_doorbell rx_db;
 
        struct fcoe_sqe *sq;
        dma_addr_t sq_dma;
@@ -274,7 +284,7 @@ struct bnx2fc_rport {
 
        struct fcoe_cqe *cq;
        dma_addr_t cq_dma;
-       u32 cq_cons_idx;
+       u16 cq_cons_idx;
        u8 cq_curr_toggle_bit;
        u32 cq_mem_size;
 
@@ -423,6 +433,7 @@ struct bnx2fc_work {
 struct bnx2fc_unsol_els {
        struct fc_lport *lport;
        struct fc_frame *fp;
+       struct bnx2fc_hba *hba;
        struct work_struct unsol_els_work;
 };
 
@@ -505,6 +516,7 @@ struct fc_seq *bnx2fc_elsct_send(struct fc_lport *lport, u32 did,
                                                   struct fc_frame *,
                                                   void *),
                                      void *arg, u32 timeout);
+void bnx2fc_arm_cq(struct bnx2fc_rport *tgt);
 int bnx2fc_process_new_cqes(struct bnx2fc_rport *tgt);
 void bnx2fc_process_cq_compl(struct bnx2fc_rport *tgt, u16 wqe);
 struct bnx2fc_rport *bnx2fc_tgt_lookup(struct fcoe_port *port,