refresh

diff --git a/meta b/meta
index 0c8517304b93891b67863893e22b8074df7ddba4..82e124511785a46bc4fd54e527cb79ec8c1fbadf 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,10 @@
 Version: 1
-Previous: 0e54646ddb576217010a6b059aa629b48c9f5b17
-Head: 503fb27e9c6853e5a1a0e04687375e5e689a61b3
+Previous: 7cbff579ad79972832b3837190a98cfaa13dc6a5
+Head: bb54db79de75677360c8e74cd7e22ab858cef7e5
 Applied:
   ibacm-add-performance-counters: f5864c3e6d03eef8f041c5d040c887be4c6a7117
   ib_acme-add-missing-carriage-r: 10d77b5a361567756cdabf3f4be82bf966ea9893
-  acm1.0.5: c4c470a91c1d2e227702b4c8982a248dacabefa1
-  refresh-temp: 503fb27e9c6853e5a1a0e04687375e5e689a61b3
+  acm1.0.5: bb54db79de75677360c8e74cd7e22ab858cef7e5
 Unapplied:
   name2ip: 8e00708e882239292492e13aa51c82042255933c
   addr_size: 8de02c47fbf595132105a7050ad6f755f49f9a7a

diff --git a/patches/acm1.0.5 b/patches/acm1.0.5
index 4c057912340efd6b6f8ef458c2c635bd74406fb9..03ba16de6ce7b66232bdec421edf1a5663b78c1f 100644 (file)
--- a/patches/acm1.0.5
+++ b/patches/acm1.0.5
@@ -1,5 +1,5 @@
 Bottom: 91ec8488425ee8901ad8c14e7daf0ef853248170
-Top:    9b4fdc376f3c6c10aa44bea8d763a6cc9768982b
+Top:    b90d808dae6f9a6dc500c28edc932883514a5ef7
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2011-05-19 13:15:20 -0700
 
@@ -40,3 +40,17 @@ index 7a2ed9f..a926fea 100644
 +Version: 1.0.5
  Release: 1%{?dist}
  Summary: InfiniBand Communication Manager Assistant
+ 
+diff --git a/src/acm.c b/src/acm.c
+index fed0440..a4a017c 100644
+--- a/src/acm.c
++++ b/src/acm.c
+@@ -2262,7 +2262,7 @@ static int acm_svr_perf_query(struct acm_client *client, struct acm_msg *msg)
+               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/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 2decd9b..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: 9b4fdc376f3c6c10aa44bea8d763a6cc9768982b
-Top:    b90d808dae6f9a6dc500c28edc932883514a5ef7
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2011-09-14 14:14:13 -0700
-
-Refresh of acm1.0.5
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index fed0440..a4a017c 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -2262,7 +2262,7 @@ static int acm_svr_perf_query(struct acm_client *client, struct acm_msg *msg)
-               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;