From 7d6062a56fcfc9ec6414ca3a2f4a16f9b74ade7d Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Wed, 26 Sep 2012 15:06:42 -0700 Subject: [PATCH] refresh (create temporary patch) --- meta | 5 +++-- patches/refresh-temp | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 patches/refresh-temp diff --git a/meta b/meta index c881ba2..b3e7c56 100644 --- a/meta +++ b/meta @@ -1,12 +1,13 @@ Version: 1 -Previous: a459d5d8528bec51be97b07e7a1281b9d761115e -Head: 4bb4a33e5148c746357ce3c5eba91b6ae1231003 +Previous: ac82cc98e873ed46dd45c4294b2c361716fd27a3 +Head: 458e314bf7e6413035fb46ab115cf38ea8677439 Applied: verbs-ext: b3d744f488bc97442df7e6cef8536d3b0352a786 xrcd: 07cc711dd4091666de3c99545c64578ce6472da7 srq_ex: 9698473fabcdee089e866558fb1bfc9dbc867609 xrc_qp: db63132ca115254044900ae234e123e8c963e8ee open_qp: 4bb4a33e5148c746357ce3c5eba91b6ae1231003 + refresh-temp: 458e314bf7e6413035fb46ab115cf38ea8677439 Unapplied: compat-ex: 81b9e1927e19f096b0c34a461b5a0f102b672d43 open_qp_man: 6cf6dc5761417ce54613251a1f16131b443da5ca diff --git a/patches/refresh-temp b/patches/refresh-temp new file mode 100644 index 0000000..c9e2966 --- /dev/null +++ b/patches/refresh-temp @@ -0,0 +1,35 @@ +Bottom: b712a07be07aca050238082e1b2ac1a12b5c8351 +Top: 8acc5160ff1885d6af90923f891dbc7ad02d3921 +Author: Sean Hefty +Date: 2012-09-26 15:06:41 -0700 + +Refresh of open_qp + +--- + +diff --git a/include/infiniband/verbs.h b/include/infiniband/verbs.h +index d0c3e1d..1e3003e 100644 +--- a/include/infiniband/verbs.h ++++ b/include/infiniband/verbs.h +@@ -1180,7 +1180,7 @@ ibv_create_qp_ex(struct ibv_context *context, struct ibv_qp_init_attr_ex *qp_ini + * ibv_open_qp - Open a shareable queue pair. + */ + static inline struct ibv_qp * +-ibv_open_qp(struct ibv_xrcd *xrcd, struct ibv_qp_open_attr *qp_open_attr); ++ibv_open_qp(struct ibv_xrcd *xrcd, struct ibv_qp_open_attr *qp_open_attr) + { + struct verbs_context *vctx = verbs_get_ctx_op(xrcd->context, open_qp); + if (!vctx) { +diff --git a/src/cmd.c b/src/cmd.c +index fd9531b..a45dfd6 100644 +--- a/src/cmd.c ++++ b/src/cmd.c +@@ -826,7 +826,7 @@ int ibv_cmd_open_qp(struct verbs_xrcd *xrcd, struct verbs_qp *qp, + qp->qp.events_completed = 0; + pthread_mutex_init(&qp->qp.mutex, NULL); + pthread_cond_init(&qp->qp.cond, NULL); +- qp->comp_mask = IBV_QP_XRCD; ++ qp->comp_mask = VERBS_QP_XRCD; + qp->xrcd = xrcd; + + return 0; -- 2.41.0