refresh

diff --git a/meta b/meta
index 673317e7216d22ca6f355ff2b16e2fa05265c560..217dfcb66f024870ed555db65d665453d07fb5bd 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 329e302432bb5ed732d47ddc979174d5f329a883
-Head: 01a0784a9e2f6926596622d4c7332d62425bc348
+Previous: 79d67bfaca986777bc491115cc457abb9a786064
+Head: 3df6cdff1fb72c589d09b476ef8830d6413423a3
 Applied:
   nd-heap: 4073d4bd9835679d69e79783b4fd841e173ec458
   wv-reg: 2c86a99e122511e0ef8723c8ec08456f4002a39a
@@ -14,8 +14,7 @@ Applied:
   srq-32: adbb8ebc8304351cf34a2712f8c8f6ecac123a68
   listen: ae007cabdb6a68c408cac91522ed1bb655414930
   connect: 3c44aa8cb21ffc2d81fac1cd442b0b3a87db07ed
-  cq: 258eda4d5fc74ffc6aae36b493223ba17fe423a1
-  refresh-temp: 01a0784a9e2f6926596622d4c7332d62425bc348
+  cq: 3df6cdff1fb72c589d09b476ef8830d6413423a3
 Unapplied:
   wv-rm-ioctl: 2c4f8b27f89993bc9c1215e8c358046b2934f755
   wv-ver: 9abd550558317c525e7f7f82caae75f1a810d2b7

diff --git a/patches/cq b/patches/cq
index 97ac22b4c2a22accaf6a3b57fb3e296348f87965..14aa6229c4f913281cfe7ab342e0915cb838b7b8 100644 (file)
--- a/patches/cq
+++ b/patches/cq
@@ -1,5 +1,5 @@
 Bottom: 1219550e488f5be4e9136d0544983156be63f2f8
-Top:    1219550e488f5be4e9136d0544983156be63f2f8
+Top:    789441d2ac52c77bd9c589e49565d547b30e890d
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-07-26 23:04:54 -0700
 
@@ -10,4 +10,32 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/trunk/ulp/netdirect2/user/nd_cq.cpp b/trunk/ulp/netdirect2/user/nd_cq.cpp
+index 9f8fdb6..be4b4bd 100644
+--- a/trunk/ulp/netdirect2/user/nd_cq.cpp
++++ b/trunk/ulp/netdirect2/user/nd_cq.cpp
+@@ -98,6 +98,12 @@ GetOverlappedResult(OVERLAPPED *pOverlapped, BOOL bWait)
+ }\r
+ \r
+ STDMETHODIMP CNDCompletionQueue::\r
++GetNotifyAffinity(USHORT* pGroup, KAFFINITY* pAffinity)\r
++{\r
++      return ND_NOT_SUPPORTED;\r
++}\r
++\r
++STDMETHODIMP CNDCompletionQueue::\r
+ Resize(DWORD queueDepth)\r
+ {\r
+       HRESULT hr;\r
+diff --git a/trunk/ulp/netdirect2/user/nd_cq.h b/trunk/ulp/netdirect2/user/nd_cq.h
+index dcca211..fdadd98 100644
+--- a/trunk/ulp/netdirect2/user/nd_cq.h
++++ b/trunk/ulp/netdirect2/user/nd_cq.h
+@@ -50,6 +50,7 @@ public:
+       STDMETHODIMP GetOverlappedResult(OVERLAPPED *pOverlapped, BOOL bWait);\r
+ \r
+       // INDCompletionQueue methods\r
++      STDMETHODIMP GetNotifyAffinity(USHORT* pGroup, KAFFINITY* pAffinity);\r
+       STDMETHODIMP Resize(DWORD queueDepth);\r
+       STDMETHODIMP Notify(DWORD type, OVERLAPPED* pOverlapped);\r
+       STDMETHODIMP_(DWORD) GetResults(ND_RESULT results[], DWORD nResults);

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index b89e62c..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,38 +0,0 @@
-Bottom: 1219550e488f5be4e9136d0544983156be63f2f8
-Top:    789441d2ac52c77bd9c589e49565d547b30e890d
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-07-26 23:09:47 -0700
-
-Refresh of cq
-
----
-
-diff --git a/trunk/ulp/netdirect2/user/nd_cq.cpp b/trunk/ulp/netdirect2/user/nd_cq.cpp
-index 9f8fdb6..be4b4bd 100644
---- a/trunk/ulp/netdirect2/user/nd_cq.cpp
-+++ b/trunk/ulp/netdirect2/user/nd_cq.cpp
-@@ -98,6 +98,12 @@ GetOverlappedResult(OVERLAPPED *pOverlapped, BOOL bWait)
- }\r
- \r
- STDMETHODIMP CNDCompletionQueue::\r
-+GetNotifyAffinity(USHORT* pGroup, KAFFINITY* pAffinity)\r
-+{\r
-+      return ND_NOT_SUPPORTED;\r
-+}\r
-+\r
-+STDMETHODIMP CNDCompletionQueue::\r
- Resize(DWORD queueDepth)\r
- {\r
-       HRESULT hr;\r
-diff --git a/trunk/ulp/netdirect2/user/nd_cq.h b/trunk/ulp/netdirect2/user/nd_cq.h
-index dcca211..fdadd98 100644
---- a/trunk/ulp/netdirect2/user/nd_cq.h
-+++ b/trunk/ulp/netdirect2/user/nd_cq.h
-@@ -50,6 +50,7 @@ public:
-       STDMETHODIMP GetOverlappedResult(OVERLAPPED *pOverlapped, BOOL bWait);\r
- \r
-       // INDCompletionQueue methods\r
-+      STDMETHODIMP GetNotifyAffinity(USHORT* pGroup, KAFFINITY* pAffinity);\r
-       STDMETHODIMP Resize(DWORD queueDepth);\r
-       STDMETHODIMP Notify(DWORD type, OVERLAPPED* pOverlapped);\r
-       STDMETHODIMP_(DWORD) GetResults(ND_RESULT results[], DWORD nResults);