refresh

diff --git a/meta b/meta
index 0e3e5d50cb9b73edbbd0b2d411d0987e1bfb3bdf..cf94bb32a053b03cec7ceb8b23fe4bd3b5538914 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,10 @@
 Version: 1
-Previous: 5842fc74a135fe6ae67c11c785a7eafb33fee64a
-Head: 0408ba747c1fe855f110b51f3e9317175c3ddaf4
+Previous: 2afe4ed7f5483aa2d15786902f751ba58563b5eb
+Head: bc1521f4c1bc279e473b128a7f81a7bffc5e2323
 Applied:
   rm-build: d6d2302f2d258fa2c07e55a2e124a9bdd75367a0
   cm_listen_handler: 56372fe5e423b7238a4db99258c1493748c0a582
-  cm_poll: 90a6aedbf678173e0a74d6567a87da7ca4af6ba5
-  refresh-temp: 0408ba747c1fe855f110b51f3e9317175c3ddaf4
+  cm_poll: bc1521f4c1bc279e473b128a7f81a7bffc5e2323
 Unapplied:
   old-bld-32: bd1bd1d366e3927b7646da33e243213a5d59c235
   old-apphang: 7a6f7ff02c6035e54fc262414eb9484ea98018b9

diff --git a/patches/cm_poll b/patches/cm_poll
index dabb5afacc56759a3f40988236a6a99f07315fb6..a5d1884e46ba8f7c7cf24e125293b88ab6d8a528 100644 (file)
--- a/patches/cm_poll
+++ b/patches/cm_poll
@@ -1,5 +1,5 @@
 Bottom: fa748f1c52b43305bedd9af43719f0863bbecab5
-Top:    320329bcea61ab9c1c6da4cb408e769a18685487
+Top:    1547ce30760ad3ad2e5f75b6bc3f5fea149e4690
 Author: U-AMR\MSHEFTY <MSHEFTY@mshefty-MOBL2.amr.corp.intel.com>
 Date:   2010-01-06 10:08:50 -0800
 
@@ -22,7 +22,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/trunk/core/al/kernel/al_cm.c b/trunk/core/al/kernel/al_cm.c
-index 177bb9e..d22901f 100644
+index 177bb9e..7bc4b51 100644
 --- a/trunk/core/al/kernel/al_cm.c
 +++ b/trunk/core/al/kernel/al_cm.c
 @@ -99,36 +99,44 @@ cm_cep_handler(const ib_al_handle_t h_al, const net32_t cid)
@@ -54,7 +54,7 @@ index 177bb9e..d22901f 100644
 -              listen_id = (iba_cm_id *) context;\r
 +      ib_status = al_cep_poll(gh_al, p_listen_id->cid, &context, &new_cid, &mad);\r
 +      if (ib_status != IB_SUCCESS) {\r
-+              return ib_to_ntstatus(ib_status);\r
++              return STATUS_NO_MORE_ENTRIES;\r
 +      }\r
  \r
 -              id = cm_alloc_id(listen_id->callback, listen_id);\r
@@ -100,6 +100,42 @@ index 177bb9e..d22901f 100644
        p_ifc->send_req = cm_send_req;\r
        p_ifc->send_rep = cm_send_rep;\r
        p_ifc->send_rtu = cm_send_rtu;\r
+diff --git a/trunk/core/al/kernel/al_cm_cep.c b/trunk/core/al/kernel/al_cm_cep.c
+index 4987207..a380e9c 100644
+--- a/trunk/core/al/kernel/al_cm_cep.c
++++ b/trunk/core/al/kernel/al_cm_cep.c
+@@ -6376,7 +6376,7 @@ al_cep_poll(
+ {\r
+       ib_api_status_t         status;\r
+       kcep_t                          *p_cep;\r
+-      KLOCK_QUEUE_HANDLE      hdl;\r
++      KIRQL                           irql;\r
+ \r
+       AL_PRINT( TRACE_LEVEL_VERBOSE, AL_DBG_CM, ("[ CID = %d\n", cid) );\r
+ \r
+@@ -6384,11 +6384,11 @@ al_cep_poll(
+       CL_ASSERT( p_new_cid );\r
+       CL_ASSERT( pp_mad );\r
+ \r
+-      KeAcquireInStackQueuedSpinLock( &gp_cep_mgr->lock, &hdl );\r
++      KeAcquireSpinLock( &gp_cep_mgr->lock, &irql );\r
+       p_cep = __lookup_cep( h_al, cid );\r
+       if( !p_cep )\r
+       {\r
+-              KeReleaseInStackQueuedSpinLock( &hdl );\r
++              KeReleaseSpinLock( &gp_cep_mgr->lock, irql );\r
+               AL_EXIT( AL_DBG_CM );\r
+               return IB_INVALID_HANDLE;\r
+       }\r
+@@ -6417,7 +6417,7 @@ al_cep_poll(
+       status = IB_SUCCESS;\r
+ \r
+ done:\r
+-      KeReleaseInStackQueuedSpinLock( &hdl );\r
++      KeReleaseSpinLock( &gp_cep_mgr->lock, irql );\r
+       AL_PRINT( TRACE_LEVEL_VERBOSE, AL_DBG_CM, ("] return %d\n", status) );\r
+       return status;\r
+ }\r
 diff --git a/trunk/core/winverbs/kernel/wv_ep.c b/trunk/core/winverbs/kernel/wv_ep.c
 index 3d5c6ce..3a9e02f 100644
 --- a/trunk/core/winverbs/kernel/wv_ep.c

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 63eb8ac..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,58 +0,0 @@
-Bottom: 320329bcea61ab9c1c6da4cb408e769a18685487
-Top:    1547ce30760ad3ad2e5f75b6bc3f5fea149e4690
-Author: U-AMR\MSHEFTY <MSHEFTY@mshefty-MOBL2.amr.corp.intel.com>
-Date:   2010-01-06 17:05:15 -0800
-
-Refresh of cm_poll
-
----
-
-diff --git a/trunk/core/al/kernel/al_cm.c b/trunk/core/al/kernel/al_cm.c
-index d22901f..7bc4b51 100644
---- a/trunk/core/al/kernel/al_cm.c
-+++ b/trunk/core/al/kernel/al_cm.c
-@@ -119,7 +119,7 @@ cm_get_request(iba_cm_id *p_listen_id, iba_cm_id **pp_id, iba_cm_event *p_event)
- \r
-       ib_status = al_cep_poll(gh_al, p_listen_id->cid, &context, &new_cid, &mad);\r
-       if (ib_status != IB_SUCCESS) {\r
--              return ib_to_ntstatus(ib_status);\r
-+              return STATUS_NO_MORE_ENTRIES;\r
-       }\r
- \r
-       *pp_id = cm_alloc_id(p_listen_id->callback, p_listen_id);\r
-diff --git a/trunk/core/al/kernel/al_cm_cep.c b/trunk/core/al/kernel/al_cm_cep.c
-index 4987207..a380e9c 100644
---- a/trunk/core/al/kernel/al_cm_cep.c
-+++ b/trunk/core/al/kernel/al_cm_cep.c
-@@ -6376,7 +6376,7 @@ al_cep_poll(
- {\r
-       ib_api_status_t         status;\r
-       kcep_t                          *p_cep;\r
--      KLOCK_QUEUE_HANDLE      hdl;\r
-+      KIRQL                           irql;\r
- \r
-       AL_PRINT( TRACE_LEVEL_VERBOSE, AL_DBG_CM, ("[ CID = %d\n", cid) );\r
- \r
-@@ -6384,11 +6384,11 @@ al_cep_poll(
-       CL_ASSERT( p_new_cid );\r
-       CL_ASSERT( pp_mad );\r
- \r
--      KeAcquireInStackQueuedSpinLock( &gp_cep_mgr->lock, &hdl );\r
-+      KeAcquireSpinLock( &gp_cep_mgr->lock, &irql );\r
-       p_cep = __lookup_cep( h_al, cid );\r
-       if( !p_cep )\r
-       {\r
--              KeReleaseInStackQueuedSpinLock( &hdl );\r
-+              KeReleaseSpinLock( &gp_cep_mgr->lock, irql );\r
-               AL_EXIT( AL_DBG_CM );\r
-               return IB_INVALID_HANDLE;\r
-       }\r
-@@ -6417,7 +6417,7 @@ al_cep_poll(
-       status = IB_SUCCESS;\r
- \r
- done:\r
--      KeReleaseInStackQueuedSpinLock( &hdl );\r
-+      KeReleaseSpinLock( &gp_cep_mgr->lock, irql );\r
-       AL_PRINT( TRACE_LEVEL_VERBOSE, AL_DBG_CM, ("] return %d\n", status) );\r
-       return status;\r
- }