[openib-general] [PATCH] [TRIVIAL] In ib_cq struct, change member name from context to cq_context

[Roland Dreier]

    Hal> Note that I did not check the ULPs to see if they were
    Hal> affected.

No ULPs but both mthca and the access layer...

Index: infiniband/include/ib_verbs.h
===================================================================
--- infiniband/include/ib_verbs.h	(revision 828)
+++ infiniband/include/ib_verbs.h	(working copy)
@@ -592,7 +592,7 @@
 	struct ib_device *device;
 	ib_comp_handler   comp_handler;
 	void             (*event_handler)(struct ib_event *, void *);
-	void *            context;
+	void *            cq_context;
 	int               cqe;
 	atomic_t          usecnt; /* count number of work queues */
 };
Index: infiniband/core/ib_verbs.c
===================================================================
--- infiniband/core/ib_verbs.c	(revision 803)
+++ infiniband/core/ib_verbs.c	(working copy)
@@ -191,7 +191,7 @@
 		cq->device        = device;
 		cq->comp_handler  = comp_handler;
 		cq->event_handler = event_handler;
-		cq->context       = cq_context;
+		cq->cq_context    = cq_context;
 		atomic_set(&cq->usecnt, 0);
 	}
 
Index: infiniband/hw/mthca/mthca_cq.c
===================================================================
--- infiniband/hw/mthca/mthca_cq.c	(revision 803)
+++ infiniband/hw/mthca/mthca_cq.c	(working copy)
@@ -177,7 +177,7 @@
 		return;
 	}
 
-	cq->ibcq.comp_handler(&cq->ibcq, cq->ibcq.context);
+	cq->ibcq.comp_handler(&cq->ibcq, cq->ibcq.cq_context);
 
 	if (atomic_dec_and_test(&cq->refcount))
 		wake_up(&cq->wait);