refresh (create temporary patch)

diff --git a/meta b/meta
index f25e843eb74ce92cd302062f3eaad917893f220d..b67a877e8369425db18332a24e1fed8436ca8484 100644 (file)
--- 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 (file)
index 0000000..9057785
--- /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;\r
+ }\r
+ \r
++#endif // WINVER >= 0x600\r
++\r
++\r
+ HRESULT\r
+ ResolvePath(\r
+     __in const struct sockaddr* pSrcAddr,\r
+@@ -379,8 +382,7 @@ ResolvePath(
+       return hr;\r
+ }\r
+ \r
+-#endif\r
+-}\r
++} /* IBAT namespace */\r
+ \r
+ extern "C"\r
+ {\r
+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;\r
+ \r
+       hr = IBAT::ResolvePath(&id->route.addr.src_addr, &id->route.addr.dst_addr,\r
+-                                                 path, timeout_ms);\r
++                                                 &path, timeout_ms);\r
+       if (FAILED(hr)) {\r
+               return hr;\r
+       }