Merge pull request #24 from shefty/master

Keep in sync with libfabric changes
aingerson · Oct 2, 2014 · de8db17 · de8db17
2 parents 5b10d1f + 4ba2c13
commit de8db17
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/ported/libibverbs/rc_pingpong.c b/ported/libibverbs/rc_pingpong.c
@@ -225,7 +225,7 @@ static int pp_accept_ctx(struct pingpong_context *ctx)
 		goto err;
 	}
 
-	rc = fi_accept(ctx->ep, entry.connreq, NULL, 0);
+	rc = fi_accept(ctx->ep, NULL, 0);
 	if (rc) {
 		FI_ERR_LOG("fi_accept", rc);
 		goto err;

diff --git a/simple/pingpong.c b/simple/pingpong.c
@@ -364,7 +364,7 @@ static int server_listen(void)
 	int ret;
 
 	hints.ep_cap |= FI_PASSIVE;
-	ret = fi_getinfo(FI_VERSION(1, 0), src_addr, port, FI_EVENT, &hints, &fi);
+	ret = fi_getinfo(FI_VERSION(1, 0), src_addr, port, 0, &hints, &fi);
 	if (ret) {
 		printf("fi_getinfo %s\n", strerror(-ret));
 		return ret;
@@ -414,7 +414,6 @@ static int server_connect(void)
 	struct fi_eq_cm_entry entry;
 	enum fi_eq_event event;
 	struct fi_info *info = NULL;
-	fi_connreq_t connreq = NULL;
 	ssize_t rd;
 	int ret;
 
@@ -431,7 +430,6 @@ static int server_connect(void)
 	}
 
 	info = entry.info;
-	connreq = entry.connreq;
 	ret = fi_domain(fab, info->domain_attr, &dom, NULL);
 	if (ret) {
 		printf("fi_fdomain %s\n", fi_strerror(-ret));
@@ -452,13 +450,12 @@ static int server_connect(void)
 	if (ret)
 		goto err3;
 
-	ret = fi_accept(ep, connreq, NULL, 0);
+	ret = fi_accept(ep, NULL, 0);
 	if (ret) {
 		printf("fi_accept %s\n", fi_strerror(-ret));
 		goto err3;
 	}
 
-	connreq = NULL;
 	rd = fi_eq_sread(cmeq, &event, &entry, sizeof entry, -1, 0);
 	if (rd != sizeof entry) {
 		printf("fi_eq_sread %zd %s\n", rd, fi_strerror((int) -rd));
@@ -480,8 +477,7 @@ static int server_connect(void)
 err2:
 	fi_close(&ep->fid);
 err1:
-	if (connreq)
-		fi_reject(pep, connreq, NULL, 0);
+	fi_reject(pep, info->connreq, NULL, 0);
 	fi_freeinfo(info);
 	return ret;
 }