From 725f759ab0b8b067913fd7cf967b4d3212a91efb Mon Sep 17 00:00:00 2001
From: Sean Hefty <sean.hefty@intel.com>
Date: Wed, 14 Sep 2011 12:45:08 -0700
Subject: [PATCH] refresh

---
 meta                                   |  7 +++----
 patches/ibacm-add-performance-counters |  6 +++---
 patches/refresh-temp                   | 21 ---------------------
 3 files changed, 6 insertions(+), 28 deletions(-)
 delete mode 100644 patches/refresh-temp

diff --git a/meta b/meta
index ddb2cae..ebfc52c 100644
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 91dba0b2f8ebb7534f6a52481d3b506cfc16b092
-Head: 8bbc2e5a0e92ef86fd98f27a1d75d9e2b12a5fdc
+Previous: c05cbd6ed7efbaff8d811d6351b01ab2548524ef
+Head: f5864c3e6d03eef8f041c5d040c887be4c6a7117
 Applied:
-  ibacm-add-performance-counters: 9d3ba5d9bd6ae5738af3b680fba82ccc1e7ae820
-  refresh-temp: 8bbc2e5a0e92ef86fd98f27a1d75d9e2b12a5fdc
+  ibacm-add-performance-counters: f5864c3e6d03eef8f041c5d040c887be4c6a7117
 Unapplied:
   ib_acme-add-missing-carriage-r: 1958ff2ca4ff687a0f6fe4116af4173bba4767a2
   acm1.0.5: af72eb3f07335de5fbffd7eed79cbf814859e095
diff --git a/patches/ibacm-add-performance-counters b/patches/ibacm-add-performance-counters
index ef336ef..85ec2a1 100644
--- a/patches/ibacm-add-performance-counters
+++ b/patches/ibacm-add-performance-counters
@@ -1,5 +1,5 @@
 Bottom: c1a3265ecb373be6114f838a6a7b82453aafd16e
-Top:    131a3de8a72737d956e57cbdeed00328b22d8209
+Top:    17be346bccb3202eeaf8e301a5e1b6614b651c95
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2011-06-27 10:29:36 -0700
 
@@ -599,7 +599,7 @@ index d42ba81..f3faa68 100644
 +	exit(1);
  }
 diff --git a/src/libacm.c b/src/libacm.c
-index 8a644c4..f96760c 100644
+index 8a644c4..8e9ccdb 100644
 --- a/src/libacm.c
 +++ b/src/libacm.c
 @@ -36,6 +36,8 @@
@@ -686,7 +686,7 @@ index 8a644c4..f96760c 100644
 +	msg.hdr.opcode = ACM_OP_PERF_QUERY;
 +	msg.hdr.length = htons(ACM_MSG_HDR_LENGTH);
 +
-+	ret = send(sock, (char *) &msg, msg.hdr.length, 0);
++	ret = send(sock, (char *) &msg, ACM_MSG_HDR_LENGTH, 0);
 +	if (ret != msg.hdr.length)
 +		goto out;
 +
diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644
index c13fe4b..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,21 +0,0 @@
-Bottom: 131a3de8a72737d956e57cbdeed00328b22d8209
-Top:    17be346bccb3202eeaf8e301a5e1b6614b651c95
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2011-09-14 12:45:08 -0700
-
-Refresh of ibacm-add-performance-counters
-
----
-
-diff --git a/src/libacm.c b/src/libacm.c
-index f96760c..8e9ccdb 100644
---- a/src/libacm.c
-+++ b/src/libacm.c
-@@ -327,7 +327,7 @@ int ib_acm_query_perf(uint64_t **counters, int *count)
- 	msg.hdr.opcode = ACM_OP_PERF_QUERY;
- 	msg.hdr.length = htons(ACM_MSG_HDR_LENGTH);
- 
--	ret = send(sock, (char *) &msg, msg.hdr.length, 0);
-+	ret = send(sock, (char *) &msg, ACM_MSG_HDR_LENGTH, 0);
- 	if (ret != msg.hdr.length)
- 		goto out;
-- 
2.46.0