From: Sean Hefty <sean.hefty@intel.com>
Date: Wed, 14 Sep 2011 21:21:47 +0000 (-0700)
Subject: refresh (create temporary patch)
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=f936540f90fc113b6f39fe7e079f4eee89bb92bc;p=~shefty%2Fibacm.git

refresh (create temporary patch)
---

diff --git a/meta b/meta
index 82e1245..319b4f1 100644
--- a/meta
+++ b/meta
@@ -1,10 +1,11 @@
 Version: 1
-Previous: 7cbff579ad79972832b3837190a98cfaa13dc6a5
-Head: bb54db79de75677360c8e74cd7e22ab858cef7e5
+Previous: 2d47d8650ec52d0b014dfb58e00a24e8b9094b36
+Head: c8e97072fbbf0839302208d7ac8131b250724de5
 Applied:
   ibacm-add-performance-counters: f5864c3e6d03eef8f041c5d040c887be4c6a7117
   ib_acme-add-missing-carriage-r: 10d77b5a361567756cdabf3f4be82bf966ea9893
   acm1.0.5: bb54db79de75677360c8e74cd7e22ab858cef7e5
+  refresh-temp: c8e97072fbbf0839302208d7ac8131b250724de5
 Unapplied:
   name2ip: 8e00708e882239292492e13aa51c82042255933c
   addr_size: 8de02c47fbf595132105a7050ad6f755f49f9a7a
diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644
index 0000000..3c03baf
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,43 @@
+Bottom: b90d808dae6f9a6dc500c28edc932883514a5ef7
+Top:    42e4729a57fa30e42770d8787e4b6b02c7bf2204
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2011-09-14 14:21:47 -0700
+
+Refresh of acm1.0.5
+
+---
+
+diff --git a/src/acm.c b/src/acm.c
+index a4a017c..d47f9d6 100644
+--- a/src/acm.c
++++ b/src/acm.c
+@@ -2255,7 +2255,7 @@ static int acm_svr_perf_query(struct acm_client *client, struct acm_msg *msg)
+ 	msg->hdr.data[0] = ACM_MAX_COUNTER;
+ 	msg->hdr.data[1] = 0;
+ 	msg->hdr.data[2] = 0;
+-	len = htons(ACM_MSG_HDR_LENGTH + (ACM_MAX_COUNTER * sizeof(uint64_t)));
++	len = ACM_MSG_HDR_LENGTH + (ACM_MAX_COUNTER * sizeof(uint64_t));
+ 	msg->hdr.length = htons(len);
+ 
+ 	for (i = 0; i < ACM_MAX_COUNTER; i++)
+diff --git a/src/libacm.c b/src/libacm.c
+index 8e9ccdb..727741f 100644
+--- a/src/libacm.c
++++ b/src/libacm.c
+@@ -328,12 +328,14 @@ int ib_acm_query_perf(uint64_t **counters, int *count)
+ 	msg.hdr.length = htons(ACM_MSG_HDR_LENGTH);
+ 
+ 	ret = send(sock, (char *) &msg, ACM_MSG_HDR_LENGTH, 0);
+-	if (ret != msg.hdr.length)
++	if (ret != ACM_MSG_HDR_LENGTH)
+ 		goto out;
+ 
+ 	ret = recv(sock, (char *) &msg, sizeof msg, 0);
+-	if (ret < ACM_MSG_HDR_LENGTH || ret != ntohs(msg.hdr.length))
++	if (ret < ACM_MSG_HDR_LENGTH || ret != ntohs(msg.hdr.length)) {
++		ret = ACM_STATUS_EINVAL;
+ 		goto out;
++	}
+ 
+ 	if (msg.hdr.status) {
+ 		ret = acm_error(msg.hdr.status);