From 37869e09d1606fa334b5fb461728b238edfc5d17 Mon Sep 17 00:00:00 2001
From: Sean Hefty <sean.hefty@intel.com>
Date: Mon, 26 Jul 2010 16:07:22 -0700
Subject: [PATCH] refresh

---
 meta                   |  7 +++----
 patches/nd-adapt-query | 27 +++++++++++++++++++++++++--
 patches/refresh-temp   | 33 ---------------------------------
 3 files changed, 28 insertions(+), 39 deletions(-)
 delete mode 100644 patches/refresh-temp

diff --git a/meta b/meta
index 616721e7..d96986b9 100644
--- a/meta
+++ b/meta
@@ -1,13 +1,12 @@
 Version: 1
-Previous: d505a084e04e45b5ecd56804ca2909890e330eef
-Head: 08a1308dccbda570c8beb3f5be88ee21673d3d29
+Previous: f176796c5257eaa13963ea537780ac326d811e03
+Head: 6670f3d9612b3c61e864ef65af58c26c50dd407b
 Applied:
   nd-heap: 4073d4bd9835679d69e79783b4fd841e173ec458
   wv-reg: 2c86a99e122511e0ef8723c8ec08456f4002a39a
   nd-prov: 81ab80a03d5f8659869a1bec2a2ab68a3ebf8626
   nd-prov2: 61a1070ec9016e11f409ee637d9fba3946453b85
-  nd-adapt-query: 42cd05f953888c4bdb6e4e219c480b0b759ef716
-  refresh-temp: 08a1308dccbda570c8beb3f5be88ee21673d3d29
+  nd-adapt-query: 6670f3d9612b3c61e864ef65af58c26c50dd407b
 Unapplied:
   srq: 0024a4123a3ed01d41c946126590641f9f76bc20
   wv-rm-ioctl: 2c4f8b27f89993bc9c1215e8c358046b2934f755
diff --git a/patches/nd-adapt-query b/patches/nd-adapt-query
index dda6f7b6..6382ed0c 100644
--- a/patches/nd-adapt-query
+++ b/patches/nd-adapt-query
@@ -1,5 +1,5 @@
 Bottom: 2a8179400fd6ad6b1768f2c0ce95648d58fad1d5
-Top:    2a8179400fd6ad6b1768f2c0ce95648d58fad1d5
+Top:    86fe5d7526bb5b315792703412f00fef2697ff86
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-07-26 16:06:51 -0700
 
@@ -13,4 +13,27 @@ 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
+--- 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)
+ 	WV_DEVICE_ATTRIBUTES attr;
+ 	HRESULT hr;
+ 
+-	if (pInfo != NULL && pInfo->InfoVersion != 1) {
+-		return ND_NOT_SUPPORTED;
+-	}
+-
+ 	if (*pcbInfo < sizeof(ND_ADAPTER_INFO)) {
+ 		hr = ND_BUFFER_OVERFLOW;
+ 		goto out;
+ 	}
+ 
++	if (pInfo != NULL && pInfo->InfoVersion != 1) {
++		return ND_NOT_SUPPORTED;
++	}
++
+ 	hr = m_pWvDevice->Query(&attr);
+ 	if (FAILED(hr)) {
+ 		goto out;
diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644
index ef42899c..00000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,33 +0,0 @@
-Bottom: 2a8179400fd6ad6b1768f2c0ce95648d58fad1d5
-Top:    86fe5d7526bb5b315792703412f00fef2697ff86
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-07-26 16:07:17 -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 475c1e6..9b99c1e 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)
- 	WV_DEVICE_ATTRIBUTES attr;
- 	HRESULT hr;
- 
--	if (pInfo != NULL && pInfo->InfoVersion != 1) {
--		return ND_NOT_SUPPORTED;
--	}
--
- 	if (*pcbInfo < sizeof(ND_ADAPTER_INFO)) {
- 		hr = ND_BUFFER_OVERFLOW;
- 		goto out;
- 	}
- 
-+	if (pInfo != NULL && pInfo->InfoVersion != 1) {
-+		return ND_NOT_SUPPORTED;
-+	}
-+
- 	hr = m_pWvDevice->Query(&attr);
- 	if (FAILED(hr)) {
- 		goto out;
-- 
2.46.0