Version: 1
-Previous: 2afe4ed7f5483aa2d15786902f751ba58563b5eb
-Head: bc1521f4c1bc279e473b128a7f81a7bffc5e2323
+Previous: cb3aba85f8ee77826640526f54dc7a001ffa56d8
+Head: dec7f686ba8d2af5962d4a0de83866bfe9da5f1d
Applied:
rm-build: d6d2302f2d258fa2c07e55a2e124a9bdd75367a0
cm_listen_handler: 56372fe5e423b7238a4db99258c1493748c0a582
cm_poll: bc1521f4c1bc279e473b128a7f81a7bffc5e2323
+ refresh-temp: dec7f686ba8d2af5962d4a0de83866bfe9da5f1d
Unapplied:
old-bld-32: bd1bd1d366e3927b7646da33e243213a5d59c235
old-apphang: 7a6f7ff02c6035e54fc262414eb9484ea98018b9
--- /dev/null
+Bottom: 1547ce30760ad3ad2e5f75b6bc3f5fea149e4690
+Top: 63c882c8247675acf9df13d96a1beba51a1e0858
+Author: U-AMR\MSHEFTY <MSHEFTY@mshefty-MOBL2.amr.corp.intel.com>
+Date: 2010-01-06 17:48:02 -0800
+
+Refresh of cm_poll
+
+---
+
+diff --git a/trunk/core/al/kernel/al_cm.c b/trunk/core/al/kernel/al_cm.c
+index 7bc4b51..8ba28f1 100644
+--- a/trunk/core/al/kernel/al_cm.c
++++ b/trunk/core/al/kernel/al_cm.c
+@@ -102,7 +102,7 @@ cm_listen_handler(const ib_al_handle_t h_al, const net32_t cid)
+ iba_cm_id *id;\r
+ iba_cm_event event;\r
+ \r
+- id = (iba_cm_id *) kal_cep_get_context(h_al, cid, cm_listen_handler, NULL);\r
++ id = (iba_cm_id *) kal_cep_get_context(h_al, cid, NULL, NULL);\r
+ memset(&event, 0, sizeof event);\r
+ event.type = iba_cm_req_received;\r
+ id->callback(id, &event);\r
+diff --git a/trunk/core/al/kernel/al_cm_cep.c b/trunk/core/al/kernel/al_cm_cep.c
+index a380e9c..ea12045 100644
+--- a/trunk/core/al/kernel/al_cm_cep.c
++++ b/trunk/core/al/kernel/al_cm_cep.c
+@@ -6652,7 +6652,7 @@ kal_cep_get_context(
+ goto out;\r
+ }\r
+ \r
+- if( p_cep->pfn_cb != pfn_cb )\r
++ if( pfn_cb && p_cep->pfn_cb != pfn_cb )\r
+ {\r
+ AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
+ ("CEP callback mismatch for cid %d, h_al %p\n", cid, h_al ));\r
+@@ -6660,7 +6660,7 @@ kal_cep_get_context(
+ }\r
+ \r
+ context = p_cep->context;\r
+- if( context != NULL )\r
++ if( pfn_addref && context != NULL )\r
+ {\r
+ pfn_addref( context );\r
+ }