refresh

diff --git a/meta b/meta
index 8dec13d572b05c81a33eb644f7e6ad0e79fe3483..c881ba241b4bea46ba2c804956d434c4fad983a2 100644 (file)
--- a/meta
+++ b/meta
@@ -1,13 +1,12 @@
 Version: 1
-Previous: 6527f613164eaa430c4a0671d7bf6dda4c2d3bc0
-Head: e9380be1eb7ebf1f6e753015a209a01440d73e19
+Previous: a459d5d8528bec51be97b07e7a1281b9d761115e
+Head: 4bb4a33e5148c746357ce3c5eba91b6ae1231003
 Applied:
   verbs-ext: b3d744f488bc97442df7e6cef8536d3b0352a786
   xrcd: 07cc711dd4091666de3c99545c64578ce6472da7
   srq_ex: 9698473fabcdee089e866558fb1bfc9dbc867609
   xrc_qp: db63132ca115254044900ae234e123e8c963e8ee
-  open_qp: 11a9a8325dd527b7722190e2127cd7359ff29a94
-  refresh-temp: e9380be1eb7ebf1f6e753015a209a01440d73e19
+  open_qp: 4bb4a33e5148c746357ce3c5eba91b6ae1231003
 Unapplied:
   compat-ex: 81b9e1927e19f096b0c34a461b5a0f102b672d43
   open_qp_man: 6cf6dc5761417ce54613251a1f16131b443da5ca

diff --git a/patches/open_qp b/patches/open_qp
index 69612b126ec607dae62ec430bc005eae045eb6f1..c0bbe7b02757e9b0734997d888fbd30de0afe25a 100644 (file)
--- a/patches/open_qp
+++ b/patches/open_qp
@@ -1,5 +1,5 @@
 Bottom: b66e97fee148aae0ef83ec03c25a6d56d444f6ea
-Top:    1a16e3381c4b7dbc2761fffbde96a85542425f8d
+Top:    b712a07be07aca050238082e1b2ac1a12b5c8351
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-09-19 09:19:59 -0700
 
@@ -142,7 +142,7 @@ index 799822d..d0c3e1d 100644
   */
  int ibv_modify_qp(struct ibv_qp *qp, struct ibv_qp_attr *attr,
 diff --git a/src/cmd.c b/src/cmd.c
-index 3bde238..da13177 100644
+index 3bde238..fd9531b 100644
 --- a/src/cmd.c
 +++ b/src/cmd.c
 @@ -797,6 +797,41 @@ int ibv_cmd_create_qp(struct ibv_pd *pd,
@@ -161,19 +161,19 @@ index 3bde238..da13177 100644
 +      cmd->qpn         = attr->qp_num;
 +      cmd->qp_type     = attr->qp_type;
 +
-+      if (write(xrcd->context->cmd_fd, cmd, cmd_size) != cmd_size)
++      if (write(xrcd->xrcd.context->cmd_fd, cmd, cmd_size) != cmd_size)
 +              return errno;
 +
 +      VALGRIND_MAKE_MEM_DEFINED(resp, resp_size);
 +
 +      qp->qp.handle     = resp->qp_handle;
 +      qp->qp.context    = xrcd->xrcd.context;
-+      qp->qp.qp_context = qp_open_attr->qp_context;
++      qp->qp.qp_context = attr->qp_context;
 +      qp->qp.pd         = NULL;
 +      qp->qp.send_cq    = qp->qp.recv_cq = NULL;
 +      qp->qp.srq        = NULL;
-+      qp->qp.qp_num     = qp_open_attr->qp_num;
-+      qp->qp.qp_type    = qp_open_attr->qp_type;
++      qp->qp.qp_num     = attr->qp_num;
++      qp->qp.qp_type    = attr->qp_type;
 +      qp->qp.state      = IBV_QPS_UNKNOWN;
 +      qp->qp.events_completed = 0;
 +      pthread_mutex_init(&qp->qp.mutex, NULL);

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 6fc557f..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,37 +0,0 @@
-Bottom: 1a16e3381c4b7dbc2761fffbde96a85542425f8d
-Top:    b712a07be07aca050238082e1b2ac1a12b5c8351
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-09-26 14:16:57 -0700
-
-Refresh of open_qp
-
----
-
-diff --git a/src/cmd.c b/src/cmd.c
-index da13177..fd9531b 100644
---- a/src/cmd.c
-+++ b/src/cmd.c
-@@ -809,19 +809,19 @@ int ibv_cmd_open_qp(struct verbs_xrcd *xrcd, struct verbs_qp *qp,
-       cmd->qpn         = attr->qp_num;
-       cmd->qp_type     = attr->qp_type;
- 
--      if (write(xrcd->context->cmd_fd, cmd, cmd_size) != cmd_size)
-+      if (write(xrcd->xrcd.context->cmd_fd, cmd, cmd_size) != cmd_size)
-               return errno;
- 
-       VALGRIND_MAKE_MEM_DEFINED(resp, resp_size);
- 
-       qp->qp.handle     = resp->qp_handle;
-       qp->qp.context    = xrcd->xrcd.context;
--      qp->qp.qp_context = qp_open_attr->qp_context;
-+      qp->qp.qp_context = attr->qp_context;
-       qp->qp.pd         = NULL;
-       qp->qp.send_cq    = qp->qp.recv_cq = NULL;
-       qp->qp.srq        = NULL;
--      qp->qp.qp_num     = qp_open_attr->qp_num;
--      qp->qp.qp_type    = qp_open_attr->qp_type;
-+      qp->qp.qp_num     = attr->qp_num;
-+      qp->qp.qp_type    = attr->qp_type;
-       qp->qp.state      = IBV_QPS_UNKNOWN;
-       qp->qp.events_completed = 0;
-       pthread_mutex_init(&qp->qp.mutex, NULL);