From a3b718509abcb99068b7de2d6a26170c6f4c4f06 Mon Sep 17 00:00:00 2001
From: Sean Hefty <sean.hefty@intel.com>
Date: Tue, 27 Jul 2010 00:09:03 -0700
Subject: [PATCH] squash

---
 meta                                          |  7 ++--
 .../{nd2 => nd2-provide-update-provider-ap}   | 35 ++++++++++++----
 patches/srq                                   | 41 -------------------
 3 files changed, 31 insertions(+), 52 deletions(-)
 rename patches/{nd2 => nd2-provide-update-provider-ap} (92%)
 delete mode 100644 patches/srq

diff --git a/meta b/meta
index f31ec111..70a64c9e 100644
--- a/meta
+++ b/meta
@@ -1,8 +1,8 @@
 Version: 1
-Previous: c0a3c68507ac817769db9678b9a82d20a575f3c3
-Head: 7fae076cc5f6b3d4e5dfbbe9600f6616acea260a
+Previous: a14609f3cbfcc83c69e84926fabd424fb5f449c3
+Head: 209fe858d9870d9ed31e785bb6423e688294a2c8
 Applied:
-  nd2: 7fae076cc5f6b3d4e5dfbbe9600f6616acea260a
+  nd2-provide-update-provider-ap: 209fe858d9870d9ed31e785bb6423e688294a2c8
 Unapplied:
   nd-heap: 4073d4bd9835679d69e79783b4fd841e173ec458
   wv-reg: 2c86a99e122511e0ef8723c8ec08456f4002a39a
@@ -10,7 +10,6 @@ Unapplied:
   nd-adapt-query: 4b10643cd3ba9593cb4dcfd787bf8b1285dbbb2b
   sge: f00370179e2dcdfb8aaf58da81785439872a8557
   mr: 08fda6a1a2612a27925c8afaf1af286a65469af5
-  srq: 967671cec63bf66a517bec9e5ac49a21c8279e20
   srq-32: 39a3c8243009a85178c8ade30dba40951505c976
   listen: 2be03271e485814fa964867af100c67d5bad37b8
   connect: 7945145cdb880952fcab35d524bddaddc3ef9d1b
diff --git a/patches/nd2 b/patches/nd2-provide-update-provider-ap
similarity index 92%
rename from patches/nd2
rename to patches/nd2-provide-update-provider-ap
index b719b1ce..950a434b 100644
--- a/patches/nd2
+++ b/patches/nd2-provide-update-provider-ap
@@ -1,7 +1,7 @@
 Bottom: 06cdce656914daffeb60188020c0cbccef3f6806
-Top:    7a08ebdd6b23d5fe2e5792f4bd0cc673b626d5af
+Top:    35779dc2230b0eb4dd48c03129e98b3caee2c9de
 Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-07-27 00:06:02 -0700
+Date:   2010-07-27 00:09:01 -0700
 
 nd2/provide: update provider APIs to match latest spec
 
@@ -334,7 +334,7 @@ index 1d09ddc..3ce320f 100644
  };
  
 diff --git a/trunk/ulp/netdirect2/user/nd_srq.cpp b/trunk/ulp/netdirect2/user/nd_srq.cpp
-index e472757..2856763 100644
+index e472757..ab0abd3 100644
 --- a/trunk/ulp/netdirect2/user/nd_srq.cpp
 +++ b/trunk/ulp/netdirect2/user/nd_srq.cpp
 @@ -38,11 +38,10 @@ CNDSharedReceiveQueue::CNDSharedReceiveQueue(CNDAdapter *pAdapter)
@@ -350,11 +350,32 @@ index e472757..2856763 100644
  	hr = m_pAdapter->m_pWvPd->CreateSharedReceiveQueue(queueDepth, maxSGE,
  													   notifyThreshold, &m_pWvSrq);
  	return NDConvertWVStatus(hr);
+@@ -101,6 +100,12 @@ GetOverlappedResult(OVERLAPPED *pOverlapped, BOOL bWait)
+ }
+ 
+ STDMETHODIMP CNDSharedReceiveQueue::
++GetNotifyAffinity(USHORT *pGroup, KAFFINITY* pAffinity)
++{
++	return ND_NOT_SUPPORTED;
++}
++
++STDMETHODIMP CNDSharedReceiveQueue::
+ Modify(DWORD queueDepth, DWORD notifyThreshold)
+ {
+ 	HRESULT hr;
 diff --git a/trunk/ulp/netdirect2/user/nd_srq.h b/trunk/ulp/netdirect2/user/nd_srq.h
-index 80f2c4b..c35cc97 100644
+index 80f2c4b..79f3dc1 100644
 --- a/trunk/ulp/netdirect2/user/nd_srq.h
 +++ b/trunk/ulp/netdirect2/user/nd_srq.h
-@@ -60,8 +60,8 @@ public:
+@@ -51,6 +51,7 @@ public:
+ 	STDMETHODIMP GetOverlappedResult(OVERLAPPED *pOverlapped, BOOL bWait);
+ 
+ 	// INDSharedReceiveQueue methods
++	STDMETHODIMP GetNotifyAffinity(USHORT *pGroup, KAFFINITY* pAffinity);
+ 	STDMETHODIMP Modify(DWORD queueDepth, DWORD notifyThreshold);
+ 	STDMETHODIMP Notify(OVERLAPPED* pOverlapped);
+ 	STDMETHODIMP Receive(VOID* requestContext, const ND_SGE* pSGE, DWORD nSGE);
+@@ -60,8 +61,8 @@ public:
  	void Delete() {delete this;}
  	static STDMETHODIMP
  	CreateInstance(CNDAdapter *pAdapter, DWORD queueDepth, DWORD maxSGE,
@@ -365,7 +386,7 @@ index 80f2c4b..c35cc97 100644
  	{
  		HRESULT hr;
  		CNDSharedReceiveQueue *srq;
-@@ -72,7 +72,7 @@ public:
+@@ -72,7 +73,7 @@ public:
  			goto err1;
  		}
  
@@ -374,7 +395,7 @@ index 80f2c4b..c35cc97 100644
  		if (FAILED(hr)) {
  			goto err2;
  		}
-@@ -93,7 +93,7 @@ protected:
+@@ -93,7 +94,7 @@ protected:
  	CNDAdapter				*m_pAdapter;
  
  	STDMETHODIMP Init(DWORD queueDepth, DWORD maxSGE, DWORD notifyThreshold,
diff --git a/patches/srq b/patches/srq
deleted file mode 100644
index 317b0938..00000000
--- a/patches/srq
+++ /dev/null
@@ -1,41 +0,0 @@
-Bottom: d3479d116ff5a108058c5d9a747892a3388c40a8
-Top:    14f5873cf5f2c53f80d287f3300b462819b45a9a
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-07-26 17:23:20 -0700
-
-nd: update SRQ APIs to match latest ND spec
-
-Signed-off-by: Sean Hefty <sean.hefty@intel.com>
-
-
----
-
-diff --git a/trunk/ulp/netdirect2/user/nd_srq.cpp b/trunk/ulp/netdirect2/user/nd_srq.cpp
-index c64b9af..7499617 100644
---- a/trunk/ulp/netdirect2/user/nd_srq.cpp
-+++ b/trunk/ulp/netdirect2/user/nd_srq.cpp
-@@ -100,6 +100,12 @@ GetOverlappedResult(OVERLAPPED *pOverlapped, BOOL bWait)
- }
- 
- STDMETHODIMP CNDSharedReceiveQueue::
-+GetNotifyAffinity(USHORT *pGroup, KAFFINITY* pAffinity)
-+{
-+	return ND_NOT_SUPPORTED;
-+}
-+
-+STDMETHODIMP CNDSharedReceiveQueue::
- Modify(DWORD queueDepth, DWORD notifyThreshold)
- {
- 	HRESULT hr;
-diff --git a/trunk/ulp/netdirect2/user/nd_srq.h b/trunk/ulp/netdirect2/user/nd_srq.h
-index b4f2058..5384036 100644
---- a/trunk/ulp/netdirect2/user/nd_srq.h
-+++ b/trunk/ulp/netdirect2/user/nd_srq.h
-@@ -51,6 +51,7 @@ public:
- 	STDMETHODIMP GetOverlappedResult(OVERLAPPED *pOverlapped, BOOL bWait);
- 
- 	// INDSharedReceiveQueue methods
-+	STDMETHODIMP GetNotifyAffinity(USHORT *pGroup, KAFFINITY* pAffinity);
- 	STDMETHODIMP Modify(DWORD queueDepth, DWORD notifyThreshold);
- 	STDMETHODIMP Notify(OVERLAPPED* pOverlapped);
- 	STDMETHODIMP Receive(VOID* requestContext, const ND_SGE* pSge, DWORD nSge);
-- 
2.46.0