From: Sean Hefty <sean.hefty@intel.com>
Date: Wed, 17 Feb 2010 19:42:46 +0000 (-0800)
Subject: refresh (create temporary patch)
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=435d5b02a3e5dd084011254bdd0f93c9b554347e;p=~shefty%2Frdma-win.git

refresh (create temporary patch)
---

diff --git a/meta b/meta
index f25e843e..b67a877e 100644
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 18bd91162c2d6d47f07540ab3a49f7ffeed21136
-Head: 259d61aef2214addaf218e0e055cf35f20000780
+Previous: 447347193fcd8d804f56070797dd46b266500ede
+Head: 1ffedac85b8020d77a4ed0f5926dccf77862a0fb
 Applied:
   rm-build: 6ece22f911fcfc6fceeb779a3cb16702ab4ba386
   dapl-cleanup2: 81e62e90410bb28ef7b1d23f0f6d7e50aede57a2
@@ -9,6 +9,7 @@ Applied:
   dapl-clean-lock: 33cc4404015c647a832803d6f029938d31c0ba67
   dapl-queue: eae59391d42fc62a1790bad6abf914274720f81c
   retry-ibat: 259d61aef2214addaf218e0e055cf35f20000780
+  refresh-temp: 1ffedac85b8020d77a4ed0f5926dccf77862a0fb
 Unapplied:
   dapl-debug: e13c7a46d1fab529c3008c37bac955a1d7738195
   dapl-close: 81beb1f83c87c85a473f9cc153ec564e6d832f57
diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644
index 00000000..90577857
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,46 @@
+Bottom: 1a90d794717896554d2561a768f575bb9fca7ce3
+Top:    5be2fd81c9cb0011b245f6751d8bf811d0886a5f
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2010-02-17 11:42:43 -0800
+
+Refresh of retry-ibat
+
+---
+
+diff --git a/trunk/core/ibat/user/ibat.cpp b/trunk/core/ibat/user/ibat.cpp
+index 2dfcff1..ede0a5e 100644
+--- a/trunk/core/ibat/user/ibat.cpp
++++ b/trunk/core/ibat/user/ibat.cpp
+@@ -358,6 +358,9 @@ Resolve(
+     return S_OK;
+ }
+ 
++#endif // WINVER >= 0x600
++
++
+ HRESULT
+ ResolvePath(
+     __in const struct sockaddr* pSrcAddr,
+@@ -379,8 +382,7 @@ ResolvePath(
+ 	return hr;
+ }
+ 
+-#endif
+-}
++} /* IBAT namespace */
+ 
+ extern "C"
+ {
+diff --git a/trunk/ulp/librdmacm/src/cma.cpp b/trunk/ulp/librdmacm/src/cma.cpp
+index 9205c56..40e7411 100644
+--- a/trunk/ulp/librdmacm/src/cma.cpp
++++ b/trunk/ulp/librdmacm/src/cma.cpp
+@@ -514,7 +514,7 @@ int rdma_resolve_route(struct rdma_cm_id *id, int timeout_ms)
+ 	HRESULT hr;
+ 
+ 	hr = IBAT::ResolvePath(&id->route.addr.src_addr, &id->route.addr.dst_addr,
+-						   path, timeout_ms);
++						   &path, timeout_ms);
+ 	if (FAILED(hr)) {
+ 		return hr;
+ 	}