From 24b1c046e456eab4eeeb49ee401c0bf3396c93b1 Mon Sep 17 00:00:00 2001
From: Sean Hefty <sean.hefty@intel.com>
Date: Thu, 31 May 2012 16:50:47 -0700
Subject: [PATCH] refresh (create temporary patch)

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

diff --git a/meta b/meta
index 38954f0..f742450 100644
--- a/meta
+++ b/meta
@@ -1,9 +1,10 @@
 Version: 1
-Previous: 3fda81fd9f781a5d6fcf6a4c87b290abbf8c1dd6
-Head: d000110823793930480efc9b52f45b32a2ba7dcb
+Previous: 2b87edabd63b497074aa04753d54f4426d23b24d
+Head: f80cd6cbad7171e186a1793b2d0b2ca4b9c13a33
 Applied:
   subnet-timeout: ac94bb084f01f868389017d3940d4b74190d9387
   acme-src: d000110823793930480efc9b52f45b32a2ba7dcb
+  refresh-temp: f80cd6cbad7171e186a1793b2d0b2ca4b9c13a33
 Unapplied:
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c
   dev-addrsize: 8de02c47fbf595132105a7050ad6f755f49f9a7a
diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644
index 0000000..74d35c3
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,41 @@
+Bottom: 81c354afb6eda33cef711513651667706fe2af21
+Top:    6ae9d02b5c42dfe3869d0fdec73f76daed1d7a8e
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2012-05-31 16:50:47 -0700
+
+Refresh of acme-src
+
+---
+
+diff --git a/src/acme.c b/src/acme.c
+index e6ae188..0e1d4ed 100644
+--- a/src/acme.c
++++ b/src/acme.c
+@@ -495,7 +495,8 @@ static int resolve_lid(struct ibv_path_record *path)
+ {
+ 	int ret;
+ 
+-	path->slid = htons((uint16_t) atoi(src_addr));
++	if (src_addr)
++		path->slid = htons((uint16_t) atoi(src_addr));
+ 	path->dlid = htons((uint16_t) atoi(dest_addr));
+ 	path->reversible_numpath = IBV_PATH_RECORD_REVERSIBLE | 1;
+ 
+@@ -510,10 +511,13 @@ static int resolve_gid(struct ibv_path_record *path)
+ {
+ 	int ret;
+ 
+-	ret = inet_pton(AF_INET6, src_addr, &path->sgid);
+-	if (ret <= 0) {
+-		printf("inet_pton error on source address (%s): 0x%x\n", src_addr, ret);
+-		return ret ? ret : -1;
++	if (src_addr) {
++		ret = inet_pton(AF_INET6, src_addr, &path->sgid);
++		if (ret <= 0) {
++			printf("inet_pton error on source address (%s): 0x%x\n",
++			       src_addr, ret);
++			return ret ? ret : -1;
++		}
+ 	}
+ 
+ 	ret = inet_pton(AF_INET6, dest_addr, &path->dgid);
-- 
2.41.0