[openib-general] [PATCH] GSI: Merge in Sean's changes to ib_xxx_cq functions

[Hal Rosenstock]

Merge in Sean's changes to ib_xxx_cq functions

Index: access/gsi_main.c
===================================================================
--- access/gsi_main.c	(revision 583)
+++ access/gsi_main.c	(working copy)
@@ -655,7 +655,7 @@
 	struct gsi_hca_info_st *hca = NULL, *head =
 	    (struct gsi_hca_info_st *) &gsi_hca_list, *entry;
 	int ret;
-	u32 cq_size;
+	int cq_size;
 	struct ib_qp_init_attr qp_init_attr;
 	struct ib_qp_cap qp_cap;
 	GSI_HCA_LIST_LOCK_VAR;
@@ -706,7 +706,7 @@
 	cq_size = GSI_QP_SND_SIZE + GSI_QP_RCV_SIZE + 20;
 	hca->cq = ib_create_cq(hca->handle,
 			       (ib_comp_handler) gsi_thread_compl_cb,
-			       (void *) hca, &cq_size);
+			       (void *) hca, cq_size);
 	if (IS_ERR(hca->cq)) {
 		printk(KERN_ERR "Could not create receive CQ.\n");
 		ret = PTR_ERR(hca->cq);
Index: include/ib_verbs.h
===================================================================
--- include/ib_verbs.h	(revision 562)
+++ include/ib_verbs.h	(working copy)
@@ -70,6 +70,7 @@
 	struct ib_device *device;
 	ib_comp_handler comp_handler;
 	void *cq_context;
+	int cqe;
 };
 
 struct ib_srq {
@@ -600,12 +601,10 @@
 
 struct ib_cq *ib_create_cq(struct ib_device *device,
 			   ib_comp_handler comp_handler,
-			   void *cq_context, int *cqe);
+			   void *cq_context, int cqe);
 
-int ib_query_cq(struct ib_cq *cq, void *cq_context, int *cqe);
+int ib_resize_cq(struct ib_cq *cq, int cqe);
 
-int ib_resize_cq(struct ib_cq *cq, int *cqe);
-
 int ib_destroy_cq(struct ib_cq *cq);
 
 /* in functions below iova_start is in/out parameter */