Version: 1
-Previous: ac3709db015123ce3c40e2cda2194907c1297155
-Head: ec9c0c03ce2fbafefee55520d4c59d29fd2276ed
+Previous: e6dfde8837c0fff63630fff4c57a5049e7d84191
+Head: 180b014f856304bf689af42f4a1d6b13b9ade598
Applied:
verbs-ext: 6fbf2b29ca68fc10b7ee47dc0c09f54db0b32320
compat-ex: ec9c0c03ce2fbafefee55520d4c59d29fd2276ed
+ refresh-temp: 180b014f856304bf689af42f4a1d6b13b9ade598
Unapplied:
xrcd: 0e21cac2fc216f26a141a34cfb9e6ce5adfcd9f0
Hidden:
--- /dev/null
+Bottom: 601d3e8eb304fdbdc5bf4f3eb7a1998fa62e9693
+Top: b17307fc83c62e15af664eff4c06da422fd1e70a
+Author: Sean Hefty <sean.hefty@intel.com>
+Date: 2012-09-14 18:23:06 -0700
+
+Refresh of compat-ex
+
+---
+
+diff --git a/include/infiniband/verbs.h b/include/infiniband/verbs.h
+index 4671231..f3cb2fc 100644
+--- a/include/infiniband/verbs.h
++++ b/include/infiniband/verbs.h
+@@ -699,9 +699,9 @@ struct verbs_device {
+ size_t sz;
+ size_t size_of_context;
+ int (*init_context)(struct verbs_device *device,
+- struct verbs_context *ctx, int cmd_fd);
++ struct ibv_context *ctx, int cmd_fd);
+ void (*uninit_context)(struct verbs_device *device,
+- struct verbs_context *ctx);
++ struct ibv_context *ctx);
+ /* future fields added here */
+ };
+
+diff --git a/src/device.c b/src/device.c
+index 907fda6..e9699b6 100644
+--- a/src/device.c
++++ b/src/device.c
+@@ -164,7 +164,7 @@ struct ibv_context *__ibv_open_device(struct ibv_device *device)
+
+ priv_ctx->context_ex.sz = sizeof(struct verbs_context);
+ if (vdev) {
+- if (vdev->init_context(vdev, &priv_ctx->context_ex, cmd_fd))
++ if (vdev->init_context(vdev, &priv_ctx->context_ex.context, cmd_fd))
+ goto err2;
+
+ priv_ctx->real_context = &priv_ctx->context_ex.context;
+@@ -197,7 +197,7 @@ int __ibv_close_device(struct ibv_context *context)
+
+ if (ibv_support_ex(context)) {
+ struct verbs_device *verbs_device = verbs_get_device(context->device);
+- verbs_device->uninit_context(verbs_device, &priv_ctx->context_ex);
++ verbs_device->uninit_context(verbs_device, &priv_ctx->context_ex.context);
+ } else {
+ context->device->ops.free_context(priv_ctx->real_context);
+ }