From: Sean Hefty <sean.hefty@intel.com>
Date: Mon, 16 Aug 2010 20:51:48 +0000 (-0700)
Subject: refresh
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=00ffd55ec195b95cf5808eca630451e0a55dc7cc;p=~shefty%2Frdma-win.git

refresh
---

diff --git a/meta b/meta
index 0c6e9dc2..3bcd5cf5 100644
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 60871865c4458174b71044babebe246be3395fc5
-Head: dcf67904557764123895128c41bb90b77f95fcb7
+Previous: 8b3c9cdf4aecf63a4c233b396e1c3edf6675f4ba
+Head: 8684529206a75b8facf6e8874a45c4ef15c2911d
 Applied:
   sync: 452ce3b051e10e10363baa77834962a89267e052
   pre-af-ib: 73504ef1f812bea6d1fd59f194f90e5194ca2efa
@@ -8,8 +8,7 @@ Applied:
   opt-cq: eb08384598a3829b40cc525aa2871e4e96817507
   max-rdma: 0dd5de47b21e3a7274ec258f969cfb366f7b5e46
   opt-cp: 0c67e54602a5ce5524698f8aba7f543f356a865a
-  gai: 22a27cbc8c17e08322878c0b84167c75dde413d2
-  refresh-temp: dcf67904557764123895128c41bb90b77f95fcb7
+  gai: 8684529206a75b8facf6e8874a45c4ef15c2911d
 Unapplied:
   getreq: ec24782ee35808a9cc8ad204f7d47eb4af97f32a
   ep: b6661981936a6240b03752a7dff93cac501dfbea
diff --git a/patches/gai b/patches/gai
index 27739c53..9c6565ac 100644
--- a/patches/gai
+++ b/patches/gai
@@ -1,5 +1,5 @@
 Bottom: 5a4bd54fa45c17ca116710f00c36a7a09b2b37db
-Top:    56e98b8b077817b4af2ad424863deb09e4c52197
+Top:    085e884a1d34e4301dc068c9a126aecdb16f247c
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-08-16 10:05:05 -0700
 
@@ -71,10 +71,10 @@ index 6a8418a..4934f04 100644
  		   ..\..\..\inc\user\linux;
 diff --git a/trunk/ulp/librdmacm/src/addrinfo.cpp b/trunk/ulp/librdmacm/src/addrinfo.cpp
 new file mode 100644
-index 0000000..f40503b
+index 0000000..b9642fe
 --- /dev/null
 +++ b/trunk/ulp/librdmacm/src/addrinfo.cpp
-@@ -0,0 +1,209 @@
+@@ -0,0 +1,211 @@
 +/*
 + * Copyright (c) 2010 Intel Corporation.  All rights reserved.
 + *
@@ -203,6 +203,7 @@ index 0000000..f40503b
 +	return 0;
 +}
 +
++__declspec(dllexport)
 +int rdma_getaddrinfo(char *node, char *service,
 +					 struct rdma_addrinfo *hints,
 +					 struct rdma_addrinfo **res)
@@ -255,6 +256,7 @@ index 0000000..f40503b
 +	return ret;
 +}
 +
++__declspec(dllexport)
 +void rdma_freeaddrinfo(struct rdma_addrinfo *res)
 +{
 +	struct rdma_addrinfo *rai;
diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644
index 0e501a73..00000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,29 +0,0 @@
-Bottom: 56e98b8b077817b4af2ad424863deb09e4c52197
-Top:    085e884a1d34e4301dc068c9a126aecdb16f247c
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-08-16 13:51:44 -0700
-
-Refresh of gai
-
----
-
-diff --git a/trunk/ulp/librdmacm/src/addrinfo.cpp b/trunk/ulp/librdmacm/src/addrinfo.cpp
-index f40503b..b9642fe 100644
---- a/trunk/ulp/librdmacm/src/addrinfo.cpp
-+++ b/trunk/ulp/librdmacm/src/addrinfo.cpp
-@@ -126,6 +126,7 @@ static int ucma_convert_to_rai(struct rdma_addrinfo *rai, struct addrinfo *ai)
- 	return 0;
- }
- 
-+__declspec(dllexport)
- int rdma_getaddrinfo(char *node, char *service,
- 					 struct rdma_addrinfo *hints,
- 					 struct rdma_addrinfo **res)
-@@ -178,6 +179,7 @@ err1:
- 	return ret;
- }
- 
-+__declspec(dllexport)
- void rdma_freeaddrinfo(struct rdma_addrinfo *res)
- {
- 	struct rdma_addrinfo *rai;