refresh

diff --git a/meta b/meta
index a1bed7f5e5754c41ef11fa226236f52bb97da642..b4afdba46bf3a89c8e5478f25a42b35e392acaa9 100644 (file)
--- a/meta
+++ b/meta
@@ -1,13 +1,12 @@
 Version: 1
-Previous: ae80014625538d440a094931c675c8b2a05fefa0
-Head: 4f780e66f281e88b1de419d3cc6ad10fed50013a
+Previous: 546c42a4c8ef79b3293ea2b5702d771a468bc384
+Head: 5a153ad1d91a85e22f8736a391f049b9610c5dd3
 Applied:
   verbs-ext: b3d744f488bc97442df7e6cef8536d3b0352a786
   xrcd: 07cc711dd4091666de3c99545c64578ce6472da7
   srq_ex: 2b683573a3b3c27afab01f09c73e7e4ae6b0bbc9
   xrc_qp: 4ad62e7ffdfe45e2f3ffcfc77cd1fe327c5c24fa
-  open_qp: 62eacbcea6e993ffee75cfeaca2fd198a68aa3a7
-  refresh-temp: 4f780e66f281e88b1de419d3cc6ad10fed50013a
+  open_qp: 5a153ad1d91a85e22f8736a391f049b9610c5dd3
 Unapplied:
   open_qp_man: b2a73ca0cc278c7b3b005dbc4f16f1269498a314
   xrc_sample: ce405884d6d6c30911d84c7905a104cb0a025b68

diff --git a/patches/open_qp b/patches/open_qp
index fb581370b3195a6acf4e9b95dce1de8a0de56a2f..1b5942a913a4391f6ea7a4b83b6e55d65b647b96 100644 (file)
--- a/patches/open_qp
+++ b/patches/open_qp
@@ -1,5 +1,5 @@
 Bottom: ee35ff9eb019eeb28d8e132079af9b57733715cf
-Top:    4f912fee5dd0b56b91d5d6d3ebef3afbc2fa2ff4
+Top:    697326efa6369e085f3c40640776e4d0596477f2
 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..b82eefc 100644
+index 56c5db0..964f7f2 100644
 --- a/include/infiniband/verbs.h
 +++ b/include/infiniband/verbs.h
 @@ -486,6 +486,22 @@ struct ibv_qp_init_attr_ex {
@@ -136,7 +136,7 @@ index 56c5db0..b82eefc 100644
 +              errno = ENOSYS;
 +              return NULL;
 +      }
-+      return vctx->open_qp(xrcd, qp_open_attr);
++      return vctx->open_qp(context, qp_open_attr);
 +}
 +
 +/**

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index e946f24..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: 4f912fee5dd0b56b91d5d6d3ebef3afbc2fa2ff4
-Top:    697326efa6369e085f3c40640776e4d0596477f2
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-09-27 11:51:08 -0700
-
-Refresh of open_qp
-
----
-
-diff --git a/include/infiniband/verbs.h b/include/infiniband/verbs.h
-index b82eefc..964f7f2 100644
---- a/include/infiniband/verbs.h
-+++ b/include/infiniband/verbs.h
-@@ -1192,7 +1192,7 @@ ibv_open_qp(struct ibv_context *context, struct ibv_qp_open_attr *qp_open_attr)
-               errno = ENOSYS;
-               return NULL;
-       }
--      return vctx->open_qp(xrcd, qp_open_attr);
-+      return vctx->open_qp(context, qp_open_attr);
- }
- 
- /**