refresh

diff --git a/meta b/meta
index 6e65485155e841633c70ee7f7f0afd14d071b2be..2c761a14ed0e503e6b4eaefa9f8f1a7253effcd5 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: e6dfde8837c0fff63630fff4c57a5049e7d84191
-Head: 180b014f856304bf689af42f4a1d6b13b9ade598
+Previous: ee261573401cdf06740a63f6a9736dc57bc9f29b
+Head: ed9acc8bcab8e44b5505f7341f7ce6915674a3a3
 Applied:
   verbs-ext: 6fbf2b29ca68fc10b7ee47dc0c09f54db0b32320
-  compat-ex: ec9c0c03ce2fbafefee55520d4c59d29fd2276ed
-  refresh-temp: 180b014f856304bf689af42f4a1d6b13b9ade598
+  compat-ex: ed9acc8bcab8e44b5505f7341f7ce6915674a3a3
 Unapplied:
   xrcd: 0e21cac2fc216f26a141a34cfb9e6ce5adfcd9f0
 Hidden:

diff --git a/patches/compat-ex b/patches/compat-ex
index 77447ed374a10864483d1ddcc2690a078d602db7..9e390dd9fb6f41b4d61ec15107a6eb1ffd4eccc3 100644 (file)
--- a/patches/compat-ex
+++ b/patches/compat-ex
@@ -1,5 +1,5 @@
 Bottom: b2b2b839d978bb240b0641dff8459eaee9553d17
-Top:    601d3e8eb304fdbdc5bf4f3eb7a1998fa62e9693
+Top:    b17307fc83c62e15af664eff4c06da422fd1e70a
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-09-12 11:32:27 -0700
 
@@ -30,7 +30,7 @@ index cd00a65..1cfb008 100644
      $(libibverbs_version_script)
  src_libibverbs_la_DEPENDENCIES = $(srcdir)/src/libibverbs.map
 diff --git a/include/infiniband/verbs.h b/include/infiniband/verbs.h
-index a2577d8..4671231 100644
+index a2577d8..f3cb2fc 100644
 --- a/include/infiniband/verbs.h
 +++ b/include/infiniband/verbs.h
 @@ -307,9 +307,14 @@ enum ibv_access_flags {
@@ -158,15 +158,12 @@ index a2577d8..4671231 100644
  
  struct ibv_device_ops {
        struct ibv_context *    (*alloc_context)(struct ibv_device *device, int cmd_fd);
-@@ -653,9 +699,9 @@ struct verbs_device {
-       size_t  sz;
-       size_t  size_of_context;
+@@ -655,7 +701,7 @@ struct verbs_device {
        int     (*init_context)(struct verbs_device *device,
--                              struct ibv_context *ctx, int cmd_fd);
-+                              struct verbs_context *ctx, int cmd_fd);
+                               struct ibv_context *ctx, int cmd_fd);
        void    (*uninit_context)(struct verbs_device *device,
 -                              struct ibv_context *ctx);
-+                                struct verbs_context *ctx);
++                                struct ibv_context *ctx);
        /* future fields added here */
  };
  
@@ -707,7 +704,7 @@ index 0000000..fc5ba96
 +      ops->detach_mcast  = _ibv_detach_mcast_ex;
 +}
 diff --git a/src/device.c b/src/device.c
-index 9e43138..907fda6 100644
+index 9e43138..e9699b6 100644
 --- a/src/device.c
 +++ b/src/device.c
 @@ -127,7 +127,9 @@ struct ibv_context *__ibv_open_device(struct ibv_device *device)
@@ -777,7 +774,7 @@ index 9e43138..907fda6 100644
 -      return context;
 +      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;
@@ -823,7 +820,7 @@ index 9e43138..907fda6 100644
 +
 +      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);
 +      }

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index dac92b9..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,47 +0,0 @@
-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);
-       }