refresh

diff --git a/meta b/meta
index b332ce9495a9bb1624efdb87b9d527e47011b62d..ba753504569bade01bf3ba7d0f71b769eafcdfdf 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: e77f3c5e9f8e7d4eb8d4b464b9273ff8710ce992
-Head: 1a4a79404e21361d694abf0c20bf6134094b776d
+Previous: 39036ac7b39154ae445c96eda22c7318df1b2d19
+Head: f6ad71f3726dd9ddc572452b92ee1b73f56f3004
 Applied:
-  nd2: 170d73d4ced1a1c881e227eaa17554d3f38746d2
-  refresh-temp: 1a4a79404e21361d694abf0c20bf6134094b776d
+  nd2: f6ad71f3726dd9ddc572452b92ee1b73f56f3004
 Unapplied:
   nd-heap: 869178afb74d56f34d6610eb2628f2fbf33c8836
   wv-reg: 022e07ace7f63972967ff1f65adba7fe69fde82d

diff --git a/patches/nd2 b/patches/nd2
index 80265544addf5e9b27739573d66b5cccd5a48f95..749fb79226b010b993269869acb8c4ca7f8a1874 100644 (file)
--- a/patches/nd2
+++ b/patches/nd2
@@ -1,5 +1,5 @@
 Bottom: 06cdce656914daffeb60188020c0cbccef3f6806
-Top:    2d72bd19972d4d131d55713954345dd131830d84
+Top:    467e2e4ab1b226bf9e2cd375712c778036114b9e
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-07-27 00:15:45 -0700
 
@@ -399,7 +399,7 @@ index d077a3e..08f2d01 100644
                HRESULT hr;\r
                CNDListen *listener;\r
 diff --git a/trunk/ulp/netdirect2/user/nd_mw.cpp b/trunk/ulp/netdirect2/user/nd_mw.cpp
-index be5446d..fb79025 100644
+index be5446d..89ed1a7 100644
 --- a/trunk/ulp/netdirect2/user/nd_mw.cpp
 +++ b/trunk/ulp/netdirect2/user/nd_mw.cpp
 @@ -67,6 +67,18 @@ Release(void)
@@ -407,7 +407,7 @@ index be5446d..fb79025 100644
  }\r
  \r
 +STDMETHODIMP CNDMemoryRegion::\r
-+CancelOverlappedRequests()\r
++CancelOverlappedRequests(void)\r
 +{\r
 +      return ND_NOT_SUPPORTED;\r
 +}\r

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 1699e21..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: 2d72bd19972d4d131d55713954345dd131830d84
-Top:    467e2e4ab1b226bf9e2cd375712c778036114b9e
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-07-27 00:21:23 -0700
-
-Refresh of nd2
-
----
-
-diff --git a/trunk/ulp/netdirect2/user/nd_mw.cpp b/trunk/ulp/netdirect2/user/nd_mw.cpp
-index fb79025..89ed1a7 100644
---- a/trunk/ulp/netdirect2/user/nd_mw.cpp
-+++ b/trunk/ulp/netdirect2/user/nd_mw.cpp
-@@ -68,7 +68,7 @@ Release(void)
- }\r
- \r
- STDMETHODIMP CNDMemoryRegion::\r
--CancelOverlappedRequests()\r
-+CancelOverlappedRequests(void)\r
- {\r
-       return ND_NOT_SUPPORTED;\r
- }