igb: add support for SGMII-based MDIO PHYs

[deliverable/linux.git] / drivers / net / cnic.h

diff --git a/drivers/net/cnic.h b/drivers/net/cnic.h
index 08b1235d987db09492df534521a2fd9d89c0e8d5..275c36114d852a4fd5bd97d1e1da6feea0b629bb 100644 (file)
--- a/drivers/net/cnic.h
+++ b/drivers/net/cnic.h
@@ -169,6 +169,16 @@ struct cnic_context {
        } proto;
 };
 
+struct kcq_info {
+       struct cnic_dma dma;
+       struct kcqe     **kcq;
+
+       u16             *hw_prod_idx_ptr;
+       u16             sw_prod_idx;
+       u16             *status_idx_ptr;
+       u32             io_addr;
+};
+
 struct cnic_local {
 
        spinlock_t cnic_ulp_lock;
@@ -202,9 +212,6 @@ struct cnic_local {
        u16             rx_cons;
        u16             tx_cons;
 
-       u32 kwq_cid_addr;
-       u32 kcq_cid_addr;
-
        struct cnic_dma         kwq_info;
        struct kwqe             **kwq;
 
@@ -218,11 +225,7 @@ struct cnic_local {
        u16             *kwq_con_idx_ptr;
        u16             kwq_con_idx;
 
-       struct cnic_dma kcq_info;
-       struct kcqe     **kcq;
-
-       u16             kcq_prod_idx;
-       u32             kcq_io_addr;
+       struct kcq_info kcq1;
 
        union {
                void                            *gen;
@@ -248,8 +251,10 @@ struct cnic_local {
        struct cnic_iscsi       *iscsi_tbl;
        struct cnic_context     *ctx_tbl;
        struct cnic_id_tbl      cid_tbl;
-       int                     max_iscsi_conn;
        atomic_t                iscsi_conn;
+       u32                     iscsi_start_cid;
+
+       u32                     max_cid_space;
 
        /* per connection parameters */
        int                     num_iscsi_tasks;