pop

diff --git a/meta b/meta
index 595fe8e3530b8639c64202998cda5d2e53cd7ff2..c149aa882af87b2a26f08c299de7ac07bdcd61a9 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 7cad100894d7168c70a39529e40620800c5e3d36
-Head: 86b07a20aa4a1241894d41cd8458e4b813937302
+Previous: b60a056adaa719d50cea1780cfabe7ca1e6cf0dc
+Head: c6b406075dbaf90f70dd15c8ce8af5844f9af13e
 Applied:
   nd2: f6ad71f3726dd9ddc572452b92ee1b73f56f3004
   nd-heap: 1a16264e443de2a1140722ea4640cfc953d66527
@@ -13,8 +13,8 @@ Applied:
   qp-init: 7d030b48de9d34d5266e9aed7f56bb07f4c587bb
   qp-flush: e6d6179a65aa26829d1c132a6508fcb66556b952
   cq-group: 86b07a20aa4a1241894d41cd8458e4b813937302
+  srq-group: c6b406075dbaf90f70dd15c8ce8af5844f9af13e
 Unapplied:
-  srq-group: 70f126fab975c083efbaae391043a4929cf013e7
   cq-status: 32822edfd7095c39f7dd9ba4347ecf4ac8b9a258
   wv-rm-ioctl: 2c4f8b27f89993bc9c1215e8c358046b2934f755
   wv-ver: 9abd550558317c525e7f7f82caae75f1a810d2b7

diff --git a/patches/srq-group b/patches/srq-group
index 82f7153a65c93687dd82ba00c8f75880467e359e..9b452e10b7a36526463c9d6405f986fc15d2c8bf 100644 (file)
--- a/patches/srq-group
+++ b/patches/srq-group
@@ -1,5 +1,5 @@
-Bottom: 2864d6adb87a4d885026f286adf07ed040e1cea2
-Top:    2ca44578a55a9522cb7450492f865b41ffe6431e
+Bottom: 433c35ec9a867a050b14e5de51de290dac7eb8a1
+Top:    bed4052f6b8d8c4ccfab0a0cb879538e5d7dd065
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-07-26 23:58:18 -0700
 
@@ -11,10 +11,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 a5977fa..6be7c3f 100644
+index cdb1044..d168ba3 100644
 --- a/trunk/ulp/netdirect2/user/nd_adapter.cpp
 +++ b/trunk/ulp/netdirect2/user/nd_adapter.cpp
-@@ -205,7 +205,7 @@ CreateSharedReceiveQueue(REFIID iid, DWORD queueDepth, DWORD maxSge,
+@@ -206,7 +206,7 @@ CreateSharedReceiveQueue(REFIID iid, DWORD queueDepth, DWORD maxSge,
        }\r
  \r
        return CNDSharedReceiveQueue::CreateInstance(this, queueDepth, maxSge,\r
@@ -24,10 +24,10 @@ index a5977fa..6be7c3f 100644
  }\r
  \r
 diff --git a/trunk/ulp/netdirect2/user/nd_srq.cpp b/trunk/ulp/netdirect2/user/nd_srq.cpp
-index 0703aa9..435878e 100644
+index edbc70c..a307304 100644
 --- a/trunk/ulp/netdirect2/user/nd_srq.cpp
 +++ b/trunk/ulp/netdirect2/user/nd_srq.cpp
-@@ -38,7 +38,8 @@ CNDSharedReceiveQueue::CNDSharedReceiveQueue(CNDAdapter *pAdapter)
+@@ -39,7 +39,8 @@ CNDSharedReceiveQueue::CNDSharedReceiveQueue(CNDAdapter *pAdapter)
  }\r
  \r
  STDMETHODIMP CNDSharedReceiveQueue::\r