From 87e185fb6785ca0817903a64d0645b7c4bcbd057 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

---
 meta                 |  7 +++----
 patches/acme-src     | 35 +++++++++++++++++++++++++++++++++--
 patches/refresh-temp | 41 -----------------------------------------
 3 files changed, 36 insertions(+), 47 deletions(-)
 delete mode 100644 patches/refresh-temp

diff --git a/meta b/meta
index f742450..8cbc0d9 100644
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: 2b87edabd63b497074aa04753d54f4426d23b24d
-Head: f80cd6cbad7171e186a1793b2d0b2ca4b9c13a33
+Previous: a4ae70a6fbf1cb5f5899af8d7879a2f9f75ffad9
+Head: 02a29ca8e1bbb65d63927aee498bde333dc38e39
 Applied:
   subnet-timeout: ac94bb084f01f868389017d3940d4b74190d9387
-  acme-src: d000110823793930480efc9b52f45b32a2ba7dcb
-  refresh-temp: f80cd6cbad7171e186a1793b2d0b2ca4b9c13a33
+  acme-src: 02a29ca8e1bbb65d63927aee498bde333dc38e39
 Unapplied:
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c
   dev-addrsize: 8de02c47fbf595132105a7050ad6f755f49f9a7a
diff --git a/patches/acme-src b/patches/acme-src
index fa8ca4e..65ffac2 100644
--- a/patches/acme-src
+++ b/patches/acme-src
@@ -1,5 +1,5 @@
 Bottom: 81c354afb6eda33cef711513651667706fe2af21
-Top:    81c354afb6eda33cef711513651667706fe2af21
+Top:    6ae9d02b5c42dfe3869d0fdec73f76daed1d7a8e
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-05-31 16:48:32 -0700
 
@@ -11,4 +11,35 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+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);
diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644
index 74d35c3..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,41 +0,0 @@
-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