Merge branch 'devel' into next

[sfrench/cifs-2.6.git] / drivers / net / mlx4 / mlx4.h

diff --git a/drivers/net/mlx4/mlx4.h b/drivers/net/mlx4/mlx4.h
index 34c909deaff325e9e90573065fa4d4efb45044b8..e0213bad61c7c6a7be36bcf8d93cda3d7878be37 100644 (file)
--- a/drivers/net/mlx4/mlx4.h
+++ b/drivers/net/mlx4/mlx4.h
@@ -62,12 +62,6 @@ enum {
        MLX4_MTT_ENTRY_PER_SEG  = 8
 };
 
-enum {
-       MLX4_EQ_ASYNC,
-       MLX4_EQ_COMP,
-       MLX4_NUM_EQ
-};
-
 enum {
        MLX4_NUM_PDS            = 1 << 15
 };
@@ -205,10 +199,11 @@ struct mlx4_cq_table {
 
 struct mlx4_eq_table {
        struct mlx4_bitmap      bitmap;
+       char                   *irq_names;
        void __iomem           *clr_int;
-       void __iomem           *uar_map[(MLX4_NUM_EQ + 6) / 4];
+       void __iomem          **uar_map;
        u32                     clr_mask;
-       struct mlx4_eq          eq[MLX4_NUM_EQ];
+       struct mlx4_eq         *eq;
        u64                     icm_virt;
        struct page            *icm_page;
        dma_addr_t              icm_dma;
@@ -328,6 +323,9 @@ void mlx4_bitmap_cleanup(struct mlx4_bitmap *bitmap);
 
 int mlx4_reset(struct mlx4_dev *dev);
 
+int mlx4_alloc_eq_table(struct mlx4_dev *dev);
+void mlx4_free_eq_table(struct mlx4_dev *dev);
+
 int mlx4_init_pd_table(struct mlx4_dev *dev);
 int mlx4_init_uar_table(struct mlx4_dev *dev);
 int mlx4_init_mr_table(struct mlx4_dev *dev);