refresh

diff --git a/meta b/meta
index be249beeb20133ce79465890a21ef8ed8fd2b20c..56d4d0ad6115f1de0aaff95153e4b993679cbc4c 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: b2629ef04ba55c2021cdd0d9c42867318c33948c
-Head: 8e11def69eb2263fb66826dea957885f219a4c7d
+Previous: 1779e06bdea0342d896d8a8208bfbdccbfb5d2b9
+Head: 0839f7a91e91b717ebda707c51a7a5a9d2407921
 Applied:
   rm-build: 6ece22f911fcfc6fceeb779a3cb16702ab4ba386
   dapl-cleanup2: 81e62e90410bb28ef7b1d23f0f6d7e50aede57a2
@@ -8,8 +8,7 @@ Applied:
   debug-wv: f98e9be2365ed35d30abdf31128c331322849c93
   dapl-clean-lock: 33cc4404015c647a832803d6f029938d31c0ba67
   dapl-queue: eae59391d42fc62a1790bad6abf914274720f81c
-  retry-ibat: d90a5fc37d68e916475551301b89c4fcc966b7a8
-  refresh-temp: 8e11def69eb2263fb66826dea957885f219a4c7d
+  retry-ibat: 0839f7a91e91b717ebda707c51a7a5a9d2407921
 Unapplied:
   dapl-debug: e13c7a46d1fab529c3008c37bac955a1d7738195
   dapl-close: 81beb1f83c87c85a473f9cc153ec564e6d832f57

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 233bcc3..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,30 +0,0 @@
-Bottom: 63c9fdc97cde2b7f9fdb6aff7bc8413f3b8db205
-Top:    b18207f4fb01bfdfc27a797196a26147674cdd61
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-02-18 13:53:43 -0800
-
-Refresh of retry-ibat
-
----
-
-diff --git a/trunk/core/ibat/user/ibat.cpp b/trunk/core/ibat/user/ibat.cpp
-index 46d3301..773bfd8 100644
---- a/trunk/core/ibat/user/ibat.cpp
-+++ b/trunk/core/ibat/user/ibat.cpp
-@@ -372,14 +372,14 @@ ResolvePath(
-       HRESULT hr;\r
- \r
-       to = (Timeout == INFINITE) ? MAXINT64 : (INT64) ((UINT64) Timeout);\r
--      do {\r
-+      for (;;) {\r
-               hr = Resolve(pSrcAddr, pDestAddr, pPath);\r
-               if( hr != E_PENDING || to <= 0 )\r
-                       break;\r
- \r
-               to -= 10;\r
-               Sleep(10);\r
--      } while( to > 0 );\r
-+      };\r
- \r
-       return hr;\r
- }

diff --git a/patches/retry-ibat b/patches/retry-ibat
index d97290efb77649d327e0337a96091178d41761e2..0536914ad883dc39dd4ef4b77560cef24a6a39e9 100644 (file)
--- a/patches/retry-ibat
+++ b/patches/retry-ibat
@@ -1,5 +1,5 @@
 Bottom: b022ea9e3b49aa9b9088a3e8e3d23c0d2de66303
-Top:    63c9fdc97cde2b7f9fdb6aff7bc8413f3b8db205
+Top:    b18207f4fb01bfdfc27a797196a26147674cdd61
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-02-17 10:12:23 -0800
 
@@ -24,7 +24,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/trunk/core/ibat/user/ibat.cpp b/trunk/core/ibat/user/ibat.cpp
-index 69d9186..46d3301 100644
+index 69d9186..773bfd8 100644
 --- a/trunk/core/ibat/user/ibat.cpp
 +++ b/trunk/core/ibat/user/ibat.cpp
 @@ -358,9 +358,34 @@ Resolve(
@@ -46,14 +46,14 @@ index 69d9186..46d3301 100644
 +      HRESULT hr;\r
 +\r
 +      to = (Timeout == INFINITE) ? MAXINT64 : (INT64) ((UINT64) Timeout);\r
-+      do {\r
++      for (;;) {\r
 +              hr = Resolve(pSrcAddr, pDestAddr, pPath);\r
 +              if( hr != E_PENDING || to <= 0 )\r
 +                      break;\r
 +\r
 +              to -= 10;\r
 +              Sleep(10);\r
-+      } while( to > 0 );\r
++      };\r
 +\r
 +      return hr;\r
  }\r