From: shefty <shefty@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Date: Tue, 10 Nov 2009 19:24:28 +0000 (+0000)
Subject: winverbs/ibacm: update to match git tree
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=5610b707b1be3ab75f9e281c17d628ee9c3152cf;p=~shefty%2Frdma-win.git

winverbs/ibacm: update to match git tree

git-svn-id: svn://openib.tc.cornell.edu/gen1@2555 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86
---

diff --git a/branches/winverbs/ulp/dirs b/branches/winverbs/ulp/dirs
index 70eca775..20986cd9 100644
--- a/branches/winverbs/ulp/dirs
+++ b/branches/winverbs/ulp/dirs
@@ -3,6 +3,7 @@ DIRS =			\
 	dapl2		\
 	ibacm		\
 	ipoib		\
+	nd		\
 	srp			\
 	qlgcvnic	\
 	libibverbs	\
diff --git a/branches/winverbs/ulp/ibacm/src/acm.c b/branches/winverbs/ulp/ibacm/src/acm.c
index ef8ec364..10e50454 100644
--- a/branches/winverbs/ulp/ibacm/src/acm.c
+++ b/branches/winverbs/ulp/ibacm/src/acm.c
@@ -1332,7 +1332,7 @@ acm_client_query_resp(struct acm_ep *ep, struct acm_client *client,
 	msg->hdr.status = status;
 
 	ret = send(client->sock, (char *) msg, msg->hdr.length, 0);
-	if (ret != sizeof(*msg))
+	if (ret != msg->hdr.length))
 		acm_log(0, "failed to send response\n");
 	else
 		ret = 0;
@@ -1533,7 +1533,7 @@ acm_svr_verify_resolve(struct acm_resolve_msg *msg)
 
 	if ((msg->data[1].flags != IB_ACM_FLAGS_OUTBOUND) ||
 	    !msg->data[1].type || (msg->data[1].type >= ACM_ADDRESS_RESERVED)) {
-		acm_log(0, "ERROR - destinationa address required second\n");
+		acm_log(0, "ERROR - destination address required second\n");
 		return ACM_STATUS_EDESTTYPE;
 	}
 
diff --git a/branches/winverbs/ulp/ibacm/src/libacm.c b/branches/winverbs/ulp/ibacm/src/libacm.c
index 93181e84..b018e202 100644
--- a/branches/winverbs/ulp/ibacm/src/libacm.c
+++ b/branches/winverbs/ulp/ibacm/src/libacm.c
@@ -102,6 +102,7 @@ static int acm_format_resp(struct acm_resolve_msg *msg,
 	struct ib_acm_path_data *path_data;
 	int i, addr_cnt;
 
+	*count = 0;
 	addr_cnt = (msg->hdr.length - ACM_MSG_HDR_LENGTH) /
 		sizeof(struct acm_ep_addr_data);
 	path_data = (struct ib_acm_path_data *)
@@ -129,7 +130,6 @@ static int acm_format_resp(struct acm_resolve_msg *msg,
 	*paths = path_data;
 	return 0;
 err:
-	*count = 0;
 	free(path_data);
 	return -1;
 }
@@ -185,7 +185,7 @@ static int acm_resolve(uint8_t *src, uint8_t *dest, uint8_t type,
 	ret = recv(sock, (char *) &msg, sizeof msg, 0);
 	if (ret < ACM_MSG_HDR_LENGTH || ret != msg.hdr.length)
 		goto out;
-	
+
 	if (msg.hdr.status) {
 		ret = msg.hdr.status;
 		goto out;