refresh

diff --git a/meta b/meta
index a5bfaf91abe30e3cf0cd4fedf0e2d5845fa95716..d88b47318afcdec7f7789f254ab8c56b72944aad 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 1ce033dfd7decd02cb110576a74a634c1b27f1ca
-Head: 894673005be944c0eb167ad4c84124e4a1ca080d
+Previous: 3add45326bebae40f251a5191cca24e1e934c607
+Head: e14742d888bc74a96ba3d7a7b1b9c9b77a9dae9b
 Applied:
   verbs-ext: b3d744f488bc97442df7e6cef8536d3b0352a786
   xrcd: 5fb0d908fd199cbad61d107b890ef2a597a26c64
@@ -8,8 +8,7 @@ Applied:
   xrc_qp: e53f15c90e27fbc87ec085fddadfcff3b0277ba2
   open_qp: 5648b2c274068715935e4f85e69fc4247c934a5e
   open_qp_man: 839738b2b040667c0fda0df158fd478c5b8d44d7
-  xrc_sample: 72450f788fd3a5c6efd6432acba3edacb30ace6d
-  refresh-temp: 894673005be944c0eb167ad4c84124e4a1ca080d
+  xrc_sample: e14742d888bc74a96ba3d7a7b1b9c9b77a9dae9b
 Unapplied:
   compat-ex: 81b9e1927e19f096b0c34a461b5a0f102b672d43
 Hidden:

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 69bf037..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,26 +0,0 @@
-Bottom: 0641700f065faadce26e7254b683d5e781fdffc2
-Top:    257730eb828c0b2dbb382b2fcfabf2e8558b9693
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-09-27 14:38:32 -0700
-
-Refresh of xrc_sample
-
----
-
-diff --git a/examples/xsrq_pingpong.c b/examples/xsrq_pingpong.c
-index 363ceaa..a0da3d7 100644
---- a/examples/xsrq_pingpong.c
-+++ b/examples/xsrq_pingpong.c
-@@ -279,10 +279,11 @@ static int pp_init_ctx(char *ib_devname)
-       attr.attr.max_wr = ctx.num_clients;
-       attr.attr.max_sge = 1;
-       attr.comp_mask = IBV_SRQ_INIT_ATTR_TYPE | IBV_SRQ_INIT_ATTR_XRCD |
--                       IBV_SRQ_INIT_ATTR_CQ;
-+                       IBV_SRQ_INIT_ATTR_CQ | IBV_SRQ_INIT_ATTR_PD;
-       attr.srq_type = IBV_SRQT_XRC;
-       attr.xrcd = ctx.xrcd;
-       attr.cq = ctx.recv_cq;
-+      attr.pd = ctx.pd;
- 
-       ctx.srq = ibv_create_srq_ex(ctx.context, &attr);
-       if (!ctx.srq)  {

diff --git a/patches/xrc_sample b/patches/xrc_sample
index e164cf7896e5c2c1fd44292e33ea897a6724d523..7e7e565ca4ba2f5cfa7eef2267158657ac584e2f 100644 (file)
--- a/patches/xrc_sample
+++ b/patches/xrc_sample
@@ -1,5 +1,5 @@
 Bottom: ee8882f658072b8765821e9cdd860b8db3eb550f
-Top:    0641700f065faadce26e7254b683d5e781fdffc2
+Top:    257730eb828c0b2dbb382b2fcfabf2e8558b9693
 Author: Jay Sternberg <jay.e.sternberg@intel.com>
 Date:   2012-09-19 14:46:28 -0700
 
@@ -35,10 +35,10 @@ index cd00a65..4821ec6 100644
  
 diff --git a/examples/xsrq_pingpong.c b/examples/xsrq_pingpong.c
 new file mode 100644
-index 0000000..363ceaa
+index 0000000..a0da3d7
 --- /dev/null
 +++ b/examples/xsrq_pingpong.c
-@@ -0,0 +1,878 @@
+@@ -0,0 +1,879 @@
 +/*
 + * Copyright (c) 2005 Topspin Communications.  All rights reserved.
 + * Copyright (c) 2011 Intel Corporation, Inc.  All rights reserved.
@@ -320,10 +320,11 @@ index 0000000..363ceaa
 +      attr.attr.max_wr = ctx.num_clients;
 +      attr.attr.max_sge = 1;
 +      attr.comp_mask = IBV_SRQ_INIT_ATTR_TYPE | IBV_SRQ_INIT_ATTR_XRCD |
-+                       IBV_SRQ_INIT_ATTR_CQ;
++                       IBV_SRQ_INIT_ATTR_CQ | IBV_SRQ_INIT_ATTR_PD;
 +      attr.srq_type = IBV_SRQT_XRC;
 +      attr.xrcd = ctx.xrcd;
 +      attr.cq = ctx.recv_cq;
++      attr.pd = ctx.pd;
 +
 +      ctx.srq = ibv_create_srq_ex(ctx.context, &attr);
 +      if (!ctx.srq)  {