From: Sean Hefty Date: Fri, 29 May 2015 18:25:15 +0000 (-0700) Subject: refresh (create temporary patch) X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=5fa977a5f31c37cc7f23ba936e814c69ecc547d4;p=~shefty%2Flibrdmacm.git refresh (create temporary patch) --- diff --git a/meta b/meta index cf867842..90616015 100644 --- a/meta +++ b/meta @@ -1,8 +1,9 @@ Version: 1 -Previous: 93d68e0c3d0db9dc7fa811b941d82298bf61d273 -Head: d21329a1c55ac881a1430bbaeb2b7fea3b8769b4 +Previous: cc500679e58df0e5b0cf77282db8177b199c9f73 +Head: a75c69ebd97436dfce5f57f39245466f8b3eb0f8 Applied: rs-initbufs: d21329a1c55ac881a1430bbaeb2b7fea3b8769b4 + refresh-temp: a75c69ebd97436dfce5f57f39245466f8b3eb0f8 Unapplied: raccept-invalid: 8d5251952074622e8be0c9828d5eb573b4a1c6d2 old-af-ib: aaa0d9ca917c8c361a978e5a116963c2cceac5ba diff --git a/patches/refresh-temp b/patches/refresh-temp new file mode 100644 index 00000000..3ebac791 --- /dev/null +++ b/patches/refresh-temp @@ -0,0 +1,35 @@ +Bottom: 3556f173e3d38cdf07e4b42632dc27ffd1a6ab1f +Top: ba0e63b777474cf9c3176c7ae793e229dbdff16f +Author: Sean Hefty +Date: 2015-05-29 11:25:14 -0700 + +Refresh of rs-initbufs + +--- + +diff --git a/src/rsocket.c b/src/rsocket.c +index bcb253e..95d791c 100644 +--- a/src/rsocket.c ++++ b/src/rsocket.c +@@ -839,10 +839,6 @@ static int rs_create_ep(struct rsocket *rs) + rs_set_qp_size(rs); + if (rs->cm_id->verbs->device->transport_type == IBV_TRANSPORT_IWARP) + rs->opts |= RS_OPT_MSG_SEND; +- ret = rs_init_bufs(rs); +- if (ret) +- return ret; +- + ret = rs_create_cq(rs, rs->cm_id); + if (ret) + return ret; +@@ -867,6 +863,10 @@ static int rs_create_ep(struct rsocket *rs) + if ((rs->opts & RS_OPT_MSG_SEND) && (rs->sq_inline < RS_MSG_SIZE)) + return ERR(ENOTSUP); + ++ ret = rs_init_bufs(rs); ++ if (ret) ++ return ret; ++ + for (i = 0; i < rs->rq_size; i++) { + ret = rs_post_recv(rs); + if (ret)