refresh

diff --git a/meta b/meta
index 17092f64c3e6447923f09756490e4e5c6a8c18c9..619eedc96c3413ca202fbb74f3d074b8fae8d3c6 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 83bf3f5b447a391e2efcfd05db9b2762d316171c
-Head: c1da6e0e02bee69300079504a0e604cb0138dcb3
+Previous: e43d8523868c97cb9227b2915bf46cafe59a364a
+Head: 0e21cac2fc216f26a141a34cfb9e6ce5adfcd9f0
 Applied:
   verbs-ext: 6fbf2b29ca68fc10b7ee47dc0c09f54db0b32320
-  xrcd: 8bdcc2556f5066dfe036298d329682c370b06a18
-  refresh-temp: c1da6e0e02bee69300079504a0e604cb0138dcb3
+  xrcd: 0e21cac2fc216f26a141a34cfb9e6ce5adfcd9f0
 Unapplied:
 Hidden:

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index a9d260d..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,24 +0,0 @@
-Bottom: 28f531f9e142910869c0b0f216a13cd487ab87bb
-Top:    e420e22f8ca61393cc88917e2edcedba0010e915
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-09-12 11:29:18 -0700
-
-Refresh of xrcd
-
----
-
-diff --git a/src/cmd.c b/src/cmd.c
-index a674f2b..4a98c64 100644
---- a/src/cmd.c
-+++ b/src/cmd.c
-@@ -208,8 +208,9 @@ int ibv_cmd_open_xrcd(struct ibv_context *context, struct ibv_xrcd *xrcd,
- 
-       VALGRIND_MAKE_MEM_DEFINED(resp, resp_size);
- 
--      xrcd->handle  = resp->xrcd_handle;
-+      xrcd->comp_mask = IBV_XRCD_CONTEXT | IBV_XRCD_HANDLE;
-       xrcd->context = context;
-+      xrcd->handle  = resp->xrcd_handle;
- 
-       return 0;
- }

diff --git a/patches/xrcd b/patches/xrcd
index 7a6fddbdd9af756e67a03331e56c21502a0f9cf1..2b140d980b0b3ae977a850d5bcb752beb9ad8aec 100644 (file)
--- a/patches/xrcd
+++ b/patches/xrcd
@@ -1,5 +1,5 @@
 Bottom: b2b2b839d978bb240b0641dff8459eaee9553d17
-Top:    28f531f9e142910869c0b0f216a13cd487ab87bb
+Top:    e420e22f8ca61393cc88917e2edcedba0010e915
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-09-07 14:38:07 -0700
 
@@ -160,10 +160,10 @@ index a2577d8..913ee63 100644
   */
  struct ibv_mr *ibv_reg_mr(struct ibv_pd *pd, void *addr,
 diff --git a/src/cmd.c b/src/cmd.c
-index dab8930..a674f2b 100644
+index dab8930..4a98c64 100644
 --- a/src/cmd.c
 +++ b/src/cmd.c
-@@ -194,6 +194,39 @@ int ibv_cmd_dealloc_pd(struct ibv_pd *pd)
+@@ -194,6 +194,40 @@ int ibv_cmd_dealloc_pd(struct ibv_pd *pd)
        return 0;
  }
  
@@ -181,8 +181,9 @@ index dab8930..a674f2b 100644
 +
 +      VALGRIND_MAKE_MEM_DEFINED(resp, resp_size);
 +
-+      xrcd->handle  = resp->xrcd_handle;
++      xrcd->comp_mask = IBV_XRCD_CONTEXT | IBV_XRCD_HANDLE;
 +      xrcd->context = context;
++      xrcd->handle  = resp->xrcd_handle;
 +
 +      return 0;
 +}