refresh (create temporary patch)

diff --git a/meta b/meta
index 94ba78f78f602a4606ba5d1cb43643e3add1a5b6..5c0576d9b0e959deecfdb6fd8cc31549f76d7290 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,10 @@
 Version: 1
-Previous: b4fe2da96634a63093fd5c8397dc42d706037ea5
-Head: 10d77b5a361567756cdabf3f4be82bf966ea9893
+Previous: 3ceb2ddff84ba4a2c060cfe66d58a6b1fd285e65
+Head: 65f546c5f66c0d2e4137cd391a37342a1d7072c1
 Applied:
   ibacm-add-performance-counters: f5864c3e6d03eef8f041c5d040c887be4c6a7117
   ib_acme-add-missing-carriage-r: 10d77b5a361567756cdabf3f4be82bf966ea9893
+  refresh-temp: 65f546c5f66c0d2e4137cd391a37342a1d7072c1
 Unapplied:
   acm1.0.5: 93f0269bc00c539e2c7f9bf8e4afb4a9b170f064
   name2ip: 8e00708e882239292492e13aa51c82042255933c

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..420cd26
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,51 @@
+Bottom: 91ec8488425ee8901ad8c14e7daf0ef853248170
+Top:    1a53c92d47dbca91a16fc53065c25604bca07ee1
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2011-09-14 14:22:51 -0700
+
+Refresh of ib_acme-add-missing-carriage-r
+
+---
+
+diff --git a/src/acm.c b/src/acm.c
+index fed0440..d47f9d6 100644
+--- a/src/acm.c
++++ b/src/acm.c
+@@ -2255,14 +2255,14 @@ 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++)
+               msg->perf_data[i] = htonll((uint64_t) atomic_get(&counter[i]));
+ 
+       ret = send(client->sock, (char *) msg, len, 0);
+-      if (ret != msg->hdr.length)
++      if (ret != len)
+               acm_log(0, "ERROR - failed to send response\n");
+       else
+               ret = 0;
+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);