From: Sean Hefty Date: Thu, 27 Sep 2012 18:15:09 +0000 (-0700) Subject: refresh (create temporary patch) X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=150846d118c0683b0652c032ed72bac279e6f4a0;p=~shefty%2Flibibverbs.git refresh (create temporary patch) --- diff --git a/meta b/meta index 90a020a..c1c108c 100644 --- a/meta +++ b/meta @@ -1,10 +1,11 @@ Version: 1 -Previous: d886585590302b4efec4b4904afaf044048d9946 -Head: c09f0f5210d792fa6846494d34abc038665698a7 +Previous: a0c07669a18eca3a2024ea4a4487c7c2c64ba1f3 +Head: f3a75e695d99944239346379df5ad1714548f94e Applied: verbs-ext: b3d744f488bc97442df7e6cef8536d3b0352a786 xrcd: 07cc711dd4091666de3c99545c64578ce6472da7 srq_ex: c09f0f5210d792fa6846494d34abc038665698a7 + refresh-temp: f3a75e695d99944239346379df5ad1714548f94e Unapplied: xrc_qp: db63132ca115254044900ae234e123e8c963e8ee open_qp: 62f82b2b6f0a5e44b9051558844fb4e381eacad5 diff --git a/patches/refresh-temp b/patches/refresh-temp new file mode 100644 index 0000000..ccc5560 --- /dev/null +++ b/patches/refresh-temp @@ -0,0 +1,44 @@ +Bottom: 203c56684f2558fb5994fc74bd9bfd9ff44db867 +Top: 22e627497c4d3ed923e688a26a726335555baa45 +Author: Sean Hefty +Date: 2012-09-27 11:15:08 -0700 + +Refresh of srq_ex + +--- + +diff --git a/include/infiniband/verbs.h b/include/infiniband/verbs.h +index 0a29c9b..946a127 100644 +--- a/include/infiniband/verbs.h ++++ b/include/infiniband/verbs.h +@@ -422,7 +422,7 @@ enum ibv_srq_type { + + enum ibv_srq_init_attr_mask { + IBV_SRQ_INIT_ATTR_TYPE = 1 << 0, +- IBV_SRQ_INIT_ATTR_PD = 1 << 1 ++ IBV_SRQ_INIT_ATTR_PD = 1 << 1, + IBV_SRQ_INIT_ATTR_XRCD = 1 << 2, + IBV_SRQ_INIT_ATTR_CQ = 1 << 3, + IBV_SRQ_INIT_ATTR_RESERVED = 1 << 4 +diff --git a/src/cmd.c b/src/cmd.c +index 89cebbe..1369867 100644 +--- a/src/cmd.c ++++ b/src/cmd.c +@@ -511,7 +511,7 @@ int ibv_cmd_create_srq_ex(struct verbs_context *context, + if (attr_ex->comp_mask & IBV_SRQ_INIT_ATTR_CQ) + cmd->cq_handle = attr_ex->cq->handle; + +- if (write(context->cmd_fd, cmd, cmd_size) != cmd_size) ++ if (write(context->context.cmd_fd, cmd, cmd_size) != cmd_size) + return errno; + + VALGRIND_MAKE_MEM_DEFINED(resp, resp_size); +@@ -519,7 +519,7 @@ int ibv_cmd_create_srq_ex(struct verbs_context *context, + srq->srq.handle = resp->srq_handle; + srq->srq.context = &context->context; + srq->srq.srq_context = attr_ex->srq_context; +- srq->srq.pd = pd; ++ srq->srq.pd = attr_ex->pd; + srq->srq.events_completed = 0; + pthread_mutex_init(&srq->srq.mutex, NULL); + pthread_cond_init(&srq->srq.cond, NULL);