refresh

diff --git a/meta b/meta
index bf994a12dac79802cd64d4fb1b48a930a47a8c35..760b6b281c43d001bbf10107d65a9e3e6c24fd1f 100644 (file)
--- a/meta
+++ b/meta
@@ -1,13 +1,12 @@
 Version: 1
-Previous: 8e6e156e7df75372b4cab1413b2a5d9a613b29d2
-Head: f412e205a0dce16204748399c5d814ba98e3dbe3
+Previous: 91d827b6db23e22ad11326b55109284cbba34436
+Head: c32135a981134c2c45b2b5b7e418174e58a1b13a
 Applied:
   verbs-ext: b3d744f488bc97442df7e6cef8536d3b0352a786
   xrcd: 07cc711dd4091666de3c99545c64578ce6472da7
   srq_ex: 2b683573a3b3c27afab01f09c73e7e4ae6b0bbc9
   xrc_qp: 4ad62e7ffdfe45e2f3ffcfc77cd1fe327c5c24fa
-  open_qp: 6155278bdb257e9d5a1706a8895a15dc3ca30e29
-  refresh-temp: f412e205a0dce16204748399c5d814ba98e3dbe3
+  open_qp: c32135a981134c2c45b2b5b7e418174e58a1b13a
 Unapplied:
   open_qp_man: b2a73ca0cc278c7b3b005dbc4f16f1269498a314
   xrc_sample: ce405884d6d6c30911d84c7905a104cb0a025b68

diff --git a/patches/open_qp b/patches/open_qp
index 94373ff26a3663b2b07a94d700d2a0149e442227..11e6724a5e4a2067f9ceaac2e977a14a27d687ba 100644 (file)
--- a/patches/open_qp
+++ b/patches/open_qp
@@ -1,5 +1,5 @@
 Bottom: ee35ff9eb019eeb28d8e132079af9b57733715cf
-Top:    121437de54a1b4ef4ae07d86dfb9f960662ede35
+Top:    da594fe4eec205a47bacefd06483facb15424365
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-09-19 09:19:59 -0700
 
@@ -77,7 +77,7 @@ index b6d5ce9..e24fa4f 100644
  
  struct ibv_destroy_cq_v1 {
 diff --git a/include/infiniband/verbs.h b/include/infiniband/verbs.h
-index 56c5db0..a91662c 100644
+index 56c5db0..b82eefc 100644
 --- a/include/infiniband/verbs.h
 +++ b/include/infiniband/verbs.h
 @@ -486,6 +486,22 @@ struct ibv_qp_init_attr_ex {
@@ -129,9 +129,9 @@ index 56c5db0..a91662c 100644
 + * ibv_open_qp - Open a shareable queue pair.
 + */
 +static inline struct ibv_qp *
-+ibv_open_qp(struct ibv_xrcd *xrcd, struct ibv_qp_open_attr *qp_open_attr)
++ibv_open_qp(struct ibv_context *context, struct ibv_qp_open_attr *qp_open_attr)
 +{
-+      struct verbs_context *vctx = verbs_get_ctx_op(xrcd->context, open_qp);
++      struct verbs_context *vctx = verbs_get_ctx_op(context, open_qp);
 +      if (!vctx) {
 +              errno = ENOSYS;
 +              return NULL;

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index e199a5f..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,25 +0,0 @@
-Bottom: 121437de54a1b4ef4ae07d86dfb9f960662ede35
-Top:    da594fe4eec205a47bacefd06483facb15424365
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-09-27 11:47:05 -0700
-
-Refresh of open_qp
-
----
-
-diff --git a/include/infiniband/verbs.h b/include/infiniband/verbs.h
-index a91662c..b82eefc 100644
---- a/include/infiniband/verbs.h
-+++ b/include/infiniband/verbs.h
-@@ -1185,9 +1185,9 @@ ibv_create_qp_ex(struct ibv_context *context, struct ibv_qp_init_attr_ex *qp_ini
-  * ibv_open_qp - Open a shareable queue pair.
-  */
- static inline struct ibv_qp *
--ibv_open_qp(struct ibv_xrcd *xrcd, struct ibv_qp_open_attr *qp_open_attr)
-+ibv_open_qp(struct ibv_context *context, struct ibv_qp_open_attr *qp_open_attr)
- {
--      struct verbs_context *vctx = verbs_get_ctx_op(xrcd->context, open_qp);
-+      struct verbs_context *vctx = verbs_get_ctx_op(context, open_qp);
-       if (!vctx) {
-               errno = ENOSYS;
-               return NULL;