From 8300858e7c507e30a08e7d6659e00a3c50e3567f Mon Sep 17 00:00:00 2001
From: Sean Hefty <sean.hefty@intel.com>
Date: Sat, 20 Jul 2013 21:37:41 -0700
Subject: [PATCH] refresh (create temporary patch)

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

diff --git a/meta b/meta
index 770d390f..260c208f 100644
--- a/meta
+++ b/meta
@@ -1,9 +1,10 @@
 Version: 1
-Previous: e82b55a5329204a9ae2876c69202f6a9b668cea2
-Head: 2da01e919b3733193b87e29a8292bef2ffa17ea8
+Previous: 76f3b279fc7ef1fa8041e9a278ef282e51862db0
+Head: db0a3932b584c52b1f43e53564dbd3e3ace453fe
 Applied:
   rst-afib: 8c8076b8893f5967b3d23da0f7ee6c093902ef3d
   ex-afib: 2da01e919b3733193b87e29a8292bef2ffa17ea8
+  refresh-temp: db0a3932b584c52b1f43e53564dbd3e3ace453fe
 Unapplied:
   rs-setroute: 70a6b0b2fce4adbe0ff7d7551074a87d43cac9a2
   old-af-ib: d71ebf70cf74111cfd5f0982d9abe6ec68fb38e3
diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644
index 00000000..1f2c41dd
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,61 @@
+Bottom: 8d61e72c859eba882a3f2d5c5b34ca2f73d66d06
+Top:    a522ef674e105a954443d2802c34fb4a1e4983d0
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2013-07-20 21:37:41 -0700
+
+Refresh of ex-afib
+
+---
+
+diff --git a/examples/rstream.c b/examples/rstream.c
+index 9c84a6b..e27ddcd 100644
+--- a/examples/rstream.c
++++ b/examples/rstream.c
+@@ -303,7 +303,9 @@ static int server_listen(void)
+ 		return ret;
+ 	}
+ 
+-	lrs = rs_socket(res->ai_family, SOCK_STREAM, 0);
++	lrs = rai_hints.ai_flags ?
++	      rs_socket(rai->ai_family, SOCK_STREAM, 0) :
++	      rs_socket(ai->ai_family, SOCK_STREAM, 0);
+ 	if (lrs < 0) {
+ 		perror("rsocket");
+ 		ret = lrs;
+@@ -381,14 +383,16 @@ static int client_connect(void)
+ 	socklen_t len;
+ 
+  	ret = rai_hints.ai_flags ?
+- 	      rdma_getaddrinfo(dst_addr, port, &rai_hints, *rai) :
++ 	      rdma_getaddrinfo(dst_addr, port, &rai_hints, &rai) :
+  	      getaddrinfo(dst_addr, port, &ai_hints, &ai);
+ 	if (ret) {
+ 		perror("getaddrinfo");
+ 		return ret;
+ 	}
+ 
+-	rs = rs_socket(res->ai_family, SOCK_STREAM, 0);
++	rs = rai_hints.ai_flags ?
++	     rs_socket(rai->ai_family, SOCK_STREAM, 0) :
++	     rs_socket(ai->ai_family, SOCK_STREAM, 0);
+ 	if (rs < 0) {
+ 		perror("rsocket");
+ 		ret = rs;
+@@ -431,7 +435,7 @@ free:
+ 	if (rai_hints.ai_flags)
+ 		rdma_freeaddrinfo(rai);
+ 	else
+-		freeaddrinfo(res);
++		freeaddrinfo(ai);
+ 	return ret;
+ }
+ 
+@@ -556,7 +560,7 @@ int main(int argc, char **argv)
+ 
+ 	ai_hints.ai_socktype = SOCK_STREAM;
+ 	rai_hints.ai_port_space = RDMA_PS_TCP;
+-	while ((op = getopt(argc, argv, "s:b:B:I:C:S:p:T:")) != -1) {
++	while ((op = getopt(argc, argv, "s:b:f:B:I:C:S:p:T:")) != -1) {
+ 		switch (op) {
+ 		case 's':
+ 			dst_addr = optarg;
-- 
2.46.0