refresh

diff --git a/meta b/meta
index 07495c1bcf37de933fb03342102e17881fba9dda..d17888812479822c55b449f2658b635aadb82585 100644 (file)
--- a/meta
+++ b/meta
@@ -1,13 +1,12 @@
 Version: 1
-Previous: 52c92d5ae6c2e2bba9cd7576ec5895c5f9740699
-Head: a83dc2bacd1235a7e69cb6a6f5a23ad288b5545f
+Previous: 6d77f9f12e08fee74dd80b61c4770a0e876e1a5f
+Head: a1877ca5323c12b03d462e06df0cc77936d85cf6
 Applied:
   rm-build: ecb1d23ab7af4d244d1cf424b3274f71c6bec70a
   dapl-rbuf: 7178f36157095410fdb1e4ae492b6a7576b7c575
   ep-timeout: 578223afa5cfd28c37227e8bfa063957ccb90a6e
   nd-conn: 300de0bd7f1c968103f5020d38828b4dbc2f57b3
-  nd-status: dc6feb1b1a19e0f4b888b3d1e4563fd22cc48af3
-  refresh-temp: a83dc2bacd1235a7e69cb6a6f5a23ad288b5545f
+  nd-status: a1877ca5323c12b03d462e06df0cc77936d85cf6
 Unapplied:
   dapl-rb: 1aa0b9f57f7544c8a16f73608547f6c76af64fb9
   debug-wv: f98e9be2365ed35d30abdf31128c331322849c93

diff --git a/patches/nd-status b/patches/nd-status
index 4b6182b521c4d3bf12930aa3f5db35ac32f057d9..48ba916f033e7ce6321251553b64eb9232386fbf 100644 (file)
--- a/patches/nd-status
+++ b/patches/nd-status
@@ -1,5 +1,5 @@
 Bottom: 12c179425f22e22af222cfcf8c0e2dcba0d0ce02
-Top:    12c179425f22e22af222cfcf8c0e2dcba0d0ce02
+Top:    53423a529c18ba6c9ec2e586bfdbb8e7122a80a1
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-03-05 10:53:35 -0800
 
@@ -17,4 +17,16 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/trunk/ulp/netdirect/user/nd_base.cpp b/trunk/ulp/netdirect/user/nd_base.cpp
+index e51bc59..5dfaf11 100644
+--- a/trunk/ulp/netdirect/user/nd_base.cpp
++++ b/trunk/ulp/netdirect/user/nd_base.cpp
+@@ -58,8 +58,6 @@ HRESULT NDConvertWVStatus(HRESULT hr)
+       switch (hr) {\r
+       case WV_IO_PENDING:\r
+               return ND_PENDING;\r
+-      case WV_IO_TIMEOUT:\r
+-              return ND_TIMEOUT;\r
+       default:\r
+               return hr;\r
+       }

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 43611c9..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: 12c179425f22e22af222cfcf8c0e2dcba0d0ce02
-Top:    53423a529c18ba6c9ec2e586bfdbb8e7122a80a1
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-03-05 10:56:06 -0800
-
-Refresh of nd-status
-
----
-
-diff --git a/trunk/ulp/netdirect/user/nd_base.cpp b/trunk/ulp/netdirect/user/nd_base.cpp
-index e51bc59..5dfaf11 100644
---- a/trunk/ulp/netdirect/user/nd_base.cpp
-+++ b/trunk/ulp/netdirect/user/nd_base.cpp
-@@ -58,8 +58,6 @@ HRESULT NDConvertWVStatus(HRESULT hr)
-       switch (hr) {\r
-       case WV_IO_PENDING:\r
-               return ND_PENDING;\r
--      case WV_IO_TIMEOUT:\r
--              return ND_TIMEOUT;\r
-       default:\r
-               return hr;\r
-       }