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 70eca775c418e19e838e4d3c8d5c1264874b2ef3..20986cd9b2002c6f1235a46616ed2dd7e9ade265 100644 (file)
--- a/branches/winverbs/ulp/dirs
+++ b/branches/winverbs/ulp/dirs
@@ -3,6 +3,7 @@ DIRS =                  \
        dapl2           \\r
        ibacm           \\r
        ipoib           \\r
+       nd              \\r
        srp                     \\r
        qlgcvnic        \\r
        libibverbs      \\r

diff --git a/branches/winverbs/ulp/ibacm/src/acm.c b/branches/winverbs/ulp/ibacm/src/acm.c
index ef8ec36495da4d5ed0bdf1e9f26b207d7c341f53..10e50454e7de888978207af47bbe841a16c56f44 100644 (file)
--- 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;\r
 \r
        ret = send(client->sock, (char *) msg, msg->hdr.length, 0);\r
-       if (ret != sizeof(*msg))\r
+       if (ret != msg->hdr.length))\r
                acm_log(0, "failed to send response\n");\r
        else\r
                ret = 0;\r
@@ -1533,7 +1533,7 @@ acm_svr_verify_resolve(struct acm_resolve_msg *msg)
 \r
        if ((msg->data[1].flags != IB_ACM_FLAGS_OUTBOUND) ||\r
            !msg->data[1].type || (msg->data[1].type >= ACM_ADDRESS_RESERVED)) {\r
-               acm_log(0, "ERROR - destinationa address required second\n");\r
+               acm_log(0, "ERROR - destination address required second\n");\r
                return ACM_STATUS_EDESTTYPE;\r
        }\r
 \r

diff --git a/branches/winverbs/ulp/ibacm/src/libacm.c b/branches/winverbs/ulp/ibacm/src/libacm.c
index 93181e841eff0ff3244e8484e7df8af063245025..b018e202615d39d2d9440d930f8c3f8663df4c09 100644 (file)
--- 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;\r
        int i, addr_cnt;\r
 \r
+       *count = 0;\r
        addr_cnt = (msg->hdr.length - ACM_MSG_HDR_LENGTH) /\r
                sizeof(struct acm_ep_addr_data);\r
        path_data = (struct ib_acm_path_data *)\r
@@ -129,7 +130,6 @@ static int acm_format_resp(struct acm_resolve_msg *msg,
        *paths = path_data;\r
        return 0;\r
 err:\r
-       *count = 0;\r
        free(path_data);\r
        return -1;\r
 }\r
@@ -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);\r
        if (ret < ACM_MSG_HDR_LENGTH || ret != msg.hdr.length)\r
                goto out;\r
-       \r
+\r
        if (msg.hdr.status) {\r
                ret = msg.hdr.status;\r
                goto out;\r