refresh

diff --git a/meta b/meta
index 3906b3960ecba3d2028a0cb5b8a5191ecc03b39e..a7c57166e6deb5d54aab2985537e654abffc9f67 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,10 @@
 Version: 1
-Previous: bf33574197ae536438184571476683e271a2bc0f
-Head: edfd750233e3090d7d25b9656026f7f2d271d319
+Previous: 2dfc706161271b0cfc464959e03a5a64d835bbd7
+Head: 404e74c3eec99818cf38bff5f2534dc48ad56627
 Applied:
   verbs-ext: 6f5bd9320736c14a35405d30b5bcda552c0a9bc3
   xrcd: b4857ddf1a0837fff54f81be34a1464e9239de0e
-  srq_ex: d347d0a929958e09fceecc8a5c403d1c782354b7
-  refresh-temp: edfd750233e3090d7d25b9656026f7f2d271d319
+  srq_ex: 404e74c3eec99818cf38bff5f2534dc48ad56627
 Unapplied:
   xrc_qp: fd2b241fc556d6178ad0bd9d0277eccb11614869
   open_qp: 6879b6122f8020f5defafa829507258bde55d00d

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 2f3ec73..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: 2524e29d2e369a9ff026f617bd9b1d60640fa84f
-Top:    c6aef470f56908563376a1ec23ad504646517935
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-09-28 09:35:26 -0700
-
-Refresh of srq_ex
-
----
-
-diff --git a/include/infiniband/verbs.h b/include/infiniband/verbs.h
-index 47ec63c..d649fb5 100644
---- a/include/infiniband/verbs.h
-+++ b/include/infiniband/verbs.h
-@@ -1053,7 +1053,7 @@ ibv_create_srq_ex(struct ibv_context *context,
-                 struct ibv_srq_init_attr_ex *srq_init_attr_ex)
- {
-       struct verbs_context *vctx;
--      uint64_t mask = srq_init_attr_ex->comp_mask;
-+      uint32_t mask = srq_init_attr_ex->comp_mask;
- 
-       if (!(mask & ~(IBV_SRQ_INIT_ATTR_PD | IBV_SRQ_INIT_ATTR_TYPE)) &&
-           (mask & IBV_SRQ_INIT_ATTR_PD) &&

diff --git a/patches/srq_ex b/patches/srq_ex
index a97c76bfa158ff733c7b7f18091a3ce89c225d2d..a2232609e5c13a98b370e2ff8242baa4a063f14e 100644 (file)
--- a/patches/srq_ex
+++ b/patches/srq_ex
@@ -1,5 +1,5 @@
 Bottom: 50fe62a5135102a5b41345c318cadbad44e6e872
-Top:    2524e29d2e369a9ff026f617bd9b1d60640fa84f
+Top:    c6aef470f56908563376a1ec23ad504646517935
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-09-17 12:34:55 -0700
 
@@ -123,7 +123,7 @@ index d7c673f..3d72fa7 100644
  
  struct ibv_destroy_cq_v1 {
 diff --git a/include/infiniband/verbs.h b/include/infiniband/verbs.h
-index ca330e0..47ec63c 100644
+index ca330e0..d649fb5 100644
 --- a/include/infiniband/verbs.h
 +++ b/include/infiniband/verbs.h
 @@ -415,6 +415,30 @@ struct ibv_srq_init_attr {
@@ -176,7 +176,7 @@ index ca330e0..47ec63c 100644
 +                struct ibv_srq_init_attr_ex *srq_init_attr_ex)
 +{
 +      struct verbs_context *vctx;
-+      uint64_t mask = srq_init_attr_ex->comp_mask;
++      uint32_t mask = srq_init_attr_ex->comp_mask;
 +
 +      if (!(mask & ~(IBV_SRQ_INIT_ATTR_PD | IBV_SRQ_INIT_ATTR_TYPE)) &&
 +          (mask & IBV_SRQ_INIT_ATTR_PD) &&