1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/net/mlx4/cq.c b/drivers/net/mlx4/cq.c
index caa5bcf54e35..95e87a2f8896 100644
--- a/drivers/net/mlx4/cq.c
+++ b/drivers/net/mlx4/cq.c
@@ -180,7 +180,7 @@ int mlx4_cq_resize(struct mlx4_dev *dev, struct mlx4_cq *cq,
         cq_context->mtt_base_addr_h = mtt_addr >> 32;
         cq_context->mtt_base_addr_l = cpu_to_be32(mtt_addr & 0xffffffff);
 
-        err = mlx4_MODIFY_CQ(dev, mailbox, cq->cqn, 1);
+        err = mlx4_MODIFY_CQ(dev, mailbox, cq->cqn, 0);
 
         mlx4_free_cmd_mailbox(dev, mailbox);
         return err;
@@ -188,7 +188,8 @@ int mlx4_cq_resize(struct mlx4_dev *dev, struct mlx4_cq *cq,
 EXPORT_SYMBOL_GPL(mlx4_cq_resize);
 
 int mlx4_cq_alloc(struct mlx4_dev *dev, int nent, struct mlx4_mtt *mtt,
-                  struct mlx4_uar *uar, u64 db_rec, struct mlx4_cq *cq)
+                  struct mlx4_uar *uar, u64 db_rec, struct mlx4_cq *cq,
+                  int collapsed)
 {
         struct mlx4_priv *priv = mlx4_priv(dev);
         struct mlx4_cq_table *cq_table = &priv->cq_table;
@@ -224,6 +225,7 @@ int mlx4_cq_alloc(struct mlx4_dev *dev, int nent, struct mlx4_mtt *mtt,
         cq_context = mailbox->buf;
         memset(cq_context, 0, sizeof *cq_context);
 
+        cq_context->flags           = cpu_to_be32(!!collapsed << 18);
         cq_context->logsize_usrpage = cpu_to_be32((ilog2(nent) << 24) | uar->index);
         cq_context->comp_eqn        = priv->eq_table.eq[MLX4_EQ_COMP].eqn;
         cq_context->log_page_size   = mtt->page_shift - MLX4_ICM_PAGE_SHIFT;