LU-6215 lnet: make o2iblnd buildable for 4.2.1 kernels

The commit f5c9753872cfa8ad47821be3fa924c74c4c8b0d
altered some macros for the ko2iblnd driver which wasn't
updated for the most recent kernels. A simple one line change
restores this support.

Change-Id: Iedd5e36451bf84aae29058e40a89055f451bfeec
Signed-off-by: James Simmons <uja.ornl@yahoo.com>
Reviewed-on: http://review.whamcloud.com/16767
Reviewed-by: Frank Zago <fzago@cray.com>
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Reviewed-by: Dmitry Eremin <dmitry.eremin@intel.com>
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>

diff --git a/lnet/klnds/o2iblnd/o2iblnd.c b/lnet/klnds/o2iblnd/o2iblnd.c
index 6ca9367..924468c 100644 (file)
--- a/lnet/klnds/o2iblnd/o2iblnd.c
+++ b/lnet/klnds/o2iblnd/o2iblnd.c
@@ -825,7 +825,7 @@ kiblnd_create_conn(kib_peer_t *peer, struct rdma_cm_id *cmid,
        kiblnd_map_rx_descs(conn);
 
 #ifdef HAVE_IB_CQ_INIT_ATTR
-       cq_attr.cqe = IBLND_CQ_ENTRIES(version);
+       cq_attr.cqe = IBLND_CQ_ENTRIES(conn);
        cq_attr.comp_vector = kiblnd_get_completion_vector(conn, cpt);
        cq = ib_create_cq(cmid->device,
                          kiblnd_cq_completion, kiblnd_cq_event, conn,