refresh

diff --git a/meta b/meta
index 9bc7c37d54b7ac51cd2fd088b31c0fc508d28a51..7c4bb9330ec6f448236861007977e541ae81f879 100644 (file)
--- a/meta
+++ b/meta
@@ -1,13 +1,12 @@
 Version: 1
-Previous: 54ab7664bccf2374d94bb2456843f2a0f7ee4253
-Head: 10793eb2b22eac7ac2fdb10c9517f693db75a495
+Previous: a6b6c96d0d43130ad72e274794267146a05666a4
+Head: 4b10643cd3ba9593cb4dcfd787bf8b1285dbbb2b
 Applied:
   nd-heap: 4073d4bd9835679d69e79783b4fd841e173ec458
   wv-reg: 2c86a99e122511e0ef8723c8ec08456f4002a39a
   nd-prov: 81ab80a03d5f8659869a1bec2a2ab68a3ebf8626
   nd-prov2: 61a1070ec9016e11f409ee637d9fba3946453b85
-  nd-adapt-query: 6670f3d9612b3c61e864ef65af58c26c50dd407b
-  refresh-temp: 10793eb2b22eac7ac2fdb10c9517f693db75a495
+  nd-adapt-query: 4b10643cd3ba9593cb4dcfd787bf8b1285dbbb2b
 Unapplied:
   nd-adapt: 9a4b4b2afababb3d3df4acc8ec842b127d2a2cf5
   sge: 91a15eccfd85d9ededc20737c88d4841bf330144

diff --git a/patches/nd-adapt-query b/patches/nd-adapt-query
index 6382ed0c83e59f7173facda77605d6e28b0134a2..419d522ace89a746d14b1ee8c7b4daf444c209ae 100644 (file)
--- a/patches/nd-adapt-query
+++ b/patches/nd-adapt-query
@@ -1,5 +1,5 @@
 Bottom: 2a8179400fd6ad6b1768f2c0ce95648d58fad1d5
-Top:    86fe5d7526bb5b315792703412f00fef2697ff86
+Top:    aded63317d3a994c66a6b04aeed53854ce6f7ec1
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-07-26 16:06:51 -0700
 
@@ -14,10 +14,10 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/trunk/ulp/netdirect2/user/nd_adapter.cpp b/trunk/ulp/netdirect2/user/nd_adapter.cpp
-index 475c1e6..9b99c1e 100644
+index 475c1e6..6ced0d4 100644
 --- a/trunk/ulp/netdirect2/user/nd_adapter.cpp
 +++ b/trunk/ulp/netdirect2/user/nd_adapter.cpp
-@@ -116,15 +116,15 @@ Query(ND_ADAPTER_INFO* pInfo, SIZE_T* pcbInfo)
+@@ -116,16 +116,17 @@ Query(ND_ADAPTER_INFO* pInfo, SIZE_T* pcbInfo)
        WV_DEVICE_ATTRIBUTES attr;\r
        HRESULT hr;\r
  \r
@@ -30,10 +30,22 @@ index 475c1e6..9b99c1e 100644
                goto out;\r
        }\r
  \r
+-      hr = m_pWvDevice->Query(&attr);\r
 +      if (pInfo != NULL && pInfo->InfoVersion != 1) {\r
-+              return ND_NOT_SUPPORTED;\r
++              hr = ND_NOT_SUPPORTED;\r
++              goto out;\r
 +      }\r
 +\r
-       hr = m_pWvDevice->Query(&attr);\r
++      hr = NDConvertWVStatus(m_pWvDevice->Query(&attr));\r
        if (FAILED(hr)) {\r
-               goto out;
+               goto out;\r
+       }\r
+@@ -157,7 +158,7 @@ Query(ND_ADAPTER_INFO* pInfo, SIZE_T* pcbInfo)
+ \r
+ out:\r
+       *pcbInfo = sizeof(ND_ADAPTER_INFO);\r
+-      return NDConvertWVStatus(hr);\r
++      return hr;\r
+ }\r
+ \r
+ STDMETHODIMP CNDAdapter::

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 895690f..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,36 +0,0 @@
-Bottom: 86fe5d7526bb5b315792703412f00fef2697ff86
-Top:    aded63317d3a994c66a6b04aeed53854ce6f7ec1
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-07-26 16:49:21 -0700
-
-Refresh of nd-adapt-query
-
----
-
-diff --git a/trunk/ulp/netdirect2/user/nd_adapter.cpp b/trunk/ulp/netdirect2/user/nd_adapter.cpp
-index 9b99c1e..6ced0d4 100644
---- a/trunk/ulp/netdirect2/user/nd_adapter.cpp
-+++ b/trunk/ulp/netdirect2/user/nd_adapter.cpp
-@@ -122,10 +122,11 @@ Query(ND_ADAPTER_INFO* pInfo, SIZE_T* pcbInfo)
-       }\r
- \r
-       if (pInfo != NULL && pInfo->InfoVersion != 1) {\r
--              return ND_NOT_SUPPORTED;\r
-+              hr = ND_NOT_SUPPORTED;\r
-+              goto out;\r
-       }\r
- \r
--      hr = m_pWvDevice->Query(&attr);\r
-+      hr = NDConvertWVStatus(m_pWvDevice->Query(&attr));\r
-       if (FAILED(hr)) {\r
-               goto out;\r
-       }\r
-@@ -157,7 +158,7 @@ Query(ND_ADAPTER_INFO* pInfo, SIZE_T* pcbInfo)
- \r
- out:\r
-       *pcbInfo = sizeof(ND_ADAPTER_INFO);\r
--      return NDConvertWVStatus(hr);\r
-+      return hr;\r
- }\r
- \r
- STDMETHODIMP CNDAdapter::