From: Sean Hefty <sean.hefty@intel.com>
Date: Tue, 27 Jul 2010 06:54:14 +0000 (-0700)
Subject: refresh (create temporary patch)
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=ba6569b7135380ce0f4aa690827a00d51d8cb628;p=~shefty%2Frdma-win.git

refresh (create temporary patch)
---

diff --git a/meta b/meta
index ad0311e9..3647723f 100644
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: fa24d4b631b9207501f3c2491c5215fb89307443
-Head: 1a4581b86e410fb947c09ce13178c84a3d6109be
+Previous: 833e23a764fa4c9841602fe7b9eb5897395acffe
+Head: 158da89f772b37cc03bf2270389163578a53dd4c
 Applied:
   nd-heap: 4073d4bd9835679d69e79783b4fd841e173ec458
   wv-reg: 2c86a99e122511e0ef8723c8ec08456f4002a39a
@@ -8,6 +8,7 @@ Applied:
   nd-prov2: 61a1070ec9016e11f409ee637d9fba3946453b85
   nd-adapt-query: 4b10643cd3ba9593cb4dcfd787bf8b1285dbbb2b
   nd-adapt: 1a4581b86e410fb947c09ce13178c84a3d6109be
+  refresh-temp: 158da89f772b37cc03bf2270389163578a53dd4c
 Unapplied:
   sge: b92e6586257b3937ddf556dc3872778a76ac94a5
   mr: 109bb2efd3748d8126bc22861a2fdbdc3632dbae
diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644
index 00000000..1c522bf9
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,55 @@
+Bottom: e360be789abd5a318636040ac4b013ab010955b3
+Top:    dfbc711c3bd688bd28c603f2cc2911009240f1c9
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2010-07-26 23:54:10 -0700
+
+Refresh of nd-adapt
+
+---
+
+diff --git a/trunk/ulp/netdirect2/user/nd_adapter.cpp b/trunk/ulp/netdirect2/user/nd_adapter.cpp
+index 891741e..408a133 100644
+--- a/trunk/ulp/netdirect2/user/nd_adapter.cpp
++++ b/trunk/ulp/netdirect2/user/nd_adapter.cpp
+@@ -168,7 +168,7 @@ QueryAddressList(SOCKET_ADDRESS_LIST* pAddressList, SIZE_T* pcbAddressList)
+ }
+ 
+ STDMETHODIMP CNDAdapter::
+-CreateCompletionQueue(REFIID iid, DWORD queueDepth, KAFFINITY affinity,
++CreateCompletionQueue(REFIID iid, DWORD queueDepth, USHORT group, KAFFINITY affinity,
+ 					  VOID** ppCompletionQueue)
+ {
+ 	return CNDCompletionQueue::CreateInstance(this, queueDepth, ppCompletionQueue);
+@@ -196,8 +196,8 @@ CreateMemoryWindow(REFIID iid, VOID** ppMemoryWindow)
+ 
+ STDMETHODIMP CNDAdapter::
+ CreateSharedReceiveQueue(REFIID iid, DWORD queueDepth, DWORD maxSge,
+-						 DWORD notifyThreshold, KAFFINITY affinity,
+-						 VOID** ppSharedReceiveQueue)
++						 DWORD notifyThreshold, USHORT group,
++						 KAFFINITY affinity, VOID** ppSharedReceiveQueue)
+ {
+ 	if (iid != IID_INDSharedReceiveQueue) {
+ 		return E_NOINTERFACE;
+diff --git a/trunk/ulp/netdirect2/user/nd_adapter.h b/trunk/ulp/netdirect2/user/nd_adapter.h
+index 96cf8d3..941f80a 100644
+--- a/trunk/ulp/netdirect2/user/nd_adapter.h
++++ b/trunk/ulp/netdirect2/user/nd_adapter.h
+@@ -49,13 +49,13 @@ public:
+ 	STDMETHODIMP_(HANDLE) GetFileHandle();
+ 	STDMETHODIMP Query(ND_ADAPTER_INFO* pInfo, SIZE_T* pcbInfo);
+ 	STDMETHODIMP QueryAddressList(SOCKET_ADDRESS_LIST* pAddressList, SIZE_T* pcbAddressList);
+-	STDMETHODIMP CreateCompletionQueue(REFIID iid, DWORD queueDepth, KAFFINITY affinity,
+-									   VOID** ppCompletionQueue);
++	STDMETHODIMP CreateCompletionQueue(REFIID iid, DWORD queueDepth, USHORT group,
++									   KAFFINITY affinity, VOID** ppCompletionQueue);
+ 	STDMETHODIMP CreateMemoryRegion(REFIID iid, VOID** ppMemoryRegion);
+ 	STDMETHODIMP CreateMemoryWindow(REFIID iid, VOID** ppMemoryWindow);
+ 	STDMETHODIMP CreateSharedReceiveQueue(REFIID iid, DWORD queueDepth, DWORD maxSge,
+-										  DWORD notifyThreshold, KAFFINITY affinity,
+-										  VOID** ppSharedReceiveQueue);
++										  DWORD notifyThreshold, USHORT group,
++										  KAFFINITY affinity, VOID** ppSharedReceiveQueue);
+ 	STDMETHODIMP CreateQueuePair(REFIID iid, IUnknown* pReceiveCompletionQueue,
+ 								 IUnknown* pInitiatorCompletionQueue, VOID* context,
+ 								 DWORD receiveQueueDepth, DWORD initiatorQueueDepth,