From 4ae8c1cc836d07095596214bad4f69fc7e8058e4 Mon Sep 17 00:00:00 2001
From: Sean Hefty <sean.hefty@intel.com>
Date: Mon, 8 Oct 2012 10:37:43 -0700
Subject: [PATCH] refresh (create temporary patch)

---
 meta                 |  5 +++--
 patches/refresh-temp | 50 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 2 deletions(-)
 create mode 100644 patches/refresh-temp

diff --git a/meta b/meta
index ed030517..95898e7f 100644
--- a/meta
+++ b/meta
@@ -1,8 +1,9 @@
 Version: 1
-Previous: 76fc599cf5b835f918594d4edc8ebab14578af1e
-Head: 6f60d8310bc350dea09cf8a8a0a573d4c54a3851
+Previous: 5a25485d097fc43e7b7a410aa33c65a0b02bb515
+Head: 43a13a57e9c93239954ae6c82c56c7cb5a87a015
 Applied:
   acm-port: 6f60d8310bc350dea09cf8a8a0a573d4c54a3851
+  refresh-temp: 43a13a57e9c93239954ae6c82c56c7cb5a87a015
 Unapplied:
   af-ib-conn: 70cdbcec6986d1fcc8146a73cf2d8b6a537e71f5
   addrtype: fffb812c9cbe707f830d1e7e713feb3ae3e2e8ec
diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644
index 00000000..9763e98e
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,50 @@
+Bottom: 7a63e115cc4adf073292cd3edca568d9910e1a6e
+Top:    617f5069912b4aeedf6a0bfe0178722f4aa39039
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2012-10-08 10:37:43 -0700
+
+Refresh of acm-port
+
+---
+
+diff --git a/src/acm.c b/src/acm.c
+index 3d8c912..c9ca5b5 100755
+--- a/src/acm.c
++++ b/src/acm.c
+@@ -62,7 +62,7 @@ typedef struct acm_msg cma_acm_msg_t;
+ 
+ static pthread_mutex_t acm_lock = PTHREAD_MUTEX_INITIALIZER;
+ static int sock = -1;
+-static short server_port = 6125;
++static short server_port;
+ 
+ struct ib_connect_hdr {
+ 	uint8_t  cma_version;
+@@ -76,7 +76,7 @@ struct ib_connect_hdr {
+ #define cma_dst_ip6 dst_addr[0]
+ };
+ 
+-static void ucma_set_server_port(void)
++static int ucma_set_server_port(void)
+ {
+ 	FILE *f;
+ 
+@@ -84,6 +84,7 @@ static void ucma_set_server_port(void)
+ 		fscanf(f, "%hu", (unsigned short *) &server_port);
+ 		fclose(f);
+ 	}
++	return server_port;
+ }
+ 
+ void ucma_ib_init(void)
+@@ -96,7 +97,9 @@ void ucma_ib_init(void)
+ 		return;
+ 
+ 	pthread_mutex_lock(&acm_lock);
+-	ucma_set_server_port();
++	if (!ucma_set_server_port())
++		goto out;
++
+ 	sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+ 	if (sock < 0)
+ 		goto out;
-- 
2.46.0