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
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
---
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)
- 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
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
+++ /dev/null
-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
- }