Bottom: fa748f1c52b43305bedd9af43719f0863bbecab5
-Top: 02d34126680ab0fe5b80784d79d0d5bdbf9ff7bf
+Top: 99fd1b0da6fbee8b9db50e535e592788c9eb9113
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..40eb65a 100644
+index 177bb9e..1af5bb9 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)
p_ifc->create_id = cm_create_id;\r
p_ifc->destroy_id = cm_destroy_id;\r
p_ifc->listen = cm_listen;\r
-+ p_ifc->get_reqeust = cm_get_request;\r
++ p_ifc->get_request = cm_get_request;\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/winverbs/kernel/wv_ep.c b/trunk/core/winverbs/kernel/wv_ep.c
-index 3d5c6ce..47baba1 100644
+index 3d5c6ce..3a303fe 100644
--- a/trunk/core/winverbs/kernel/wv_ep.c
+++ b/trunk/core/winverbs/kernel/wv_ep.c
-@@ -1110,24 +1110,30 @@ complete:
+@@ -1110,28 +1110,34 @@ complete:
WdfRequestComplete(Request, status);\r
}\r
\r
- ASSERT(!IsListEmpty(&listen->Entry));\r
- ep = CONTAINING_RECORD(RemoveHeadList(&listen->Entry), WV_ENDPOINT, Entry);\r
- ep->pIbCmId = pId;\r
+- pId->callback = WvEpIbCmHandler;\r
+- pId->context = ep;\r
+ ASSERT(!IsListEmpty(&pListen->Entry));\r
+ ep = CONTAINING_RECORD(RemoveHeadList(&pListen->Entry), WV_ENDPOINT, Entry);\r
+ ep->pIbCmId = id;\r
- pId->callback = WvEpIbCmHandler;\r
- pId->context = ep;\r
++ id->callback = WvEpIbCmHandler;\r
++ id->context = ep;\r
\r
-@@ -1162,10 +1168,68 @@ static NTSTATUS WvEpIbListenHandler(iba_cm_id *pId, iba_cm_event *pEvent)
+- hdr = pEvent->data.req.req.p_pdata;\r
++ hdr = event.data.req.req.p_pdata;\r
+ if ((hdr->IpVersion >> 4) == 4) {\r
+ ep->Attributes.LocalAddress.SockAddr.In.SinFamily = WV_AF_INET;\r
+ ep->Attributes.LocalAddress.SockAddr.In.SinAddr = hdr->DstAddress.Ip4.Address;\r
+@@ -1145,27 +1151,85 @@ static NTSTATUS WvEpIbListenHandler(iba_cm_id *pId, iba_cm_event *pEvent)
+ RtlCopyMemory(ep->Attributes.PeerAddress.SockAddr.In6.Sin6Addr,\r
+ hdr->SrcAddress.Ip6Address, 16);\r
+ }\r
+- ep->Attributes.Device.DeviceGuid = pEvent->data.req.local_ca_guid;\r
+- ep->Attributes.Device.Pkey = pEvent->data.req.req.p_primary_path->pkey;\r
+- ep->Attributes.Device.PortNumber = pEvent->data.req.port_num;\r
+- ep->Attributes.Param.Connect.ResponderResources = pEvent->data.req.req.resp_res;\r
+- ep->Attributes.Param.Connect.InitiatorDepth = pEvent->data.req.req.init_depth;\r
+- ep->Attributes.Param.Connect.RetryCount = pEvent->data.req.req.retry_cnt;\r
+- ep->Attributes.Param.Connect.RnrRetryCount = pEvent->data.req.req.rnr_retry_cnt;\r
++ ep->Attributes.Device.DeviceGuid = event.data.req.local_ca_guid;\r
++ ep->Attributes.Device.Pkey = event.data.req.req.p_primary_path->pkey;\r
++ ep->Attributes.Device.PortNumber = event.data.req.port_num;\r
++ ep->Attributes.Param.Connect.ResponderResources = event.data.req.req.resp_res;\r
++ ep->Attributes.Param.Connect.InitiatorDepth = event.data.req.req.init_depth;\r
++ ep->Attributes.Param.Connect.RetryCount = event.data.req.req.retry_cnt;\r
++ ep->Attributes.Param.Connect.RnrRetryCount = event.data.req.req.rnr_retry_cnt;\r
+ ep->Attributes.Param.Connect.DataLength = sizeof(ep->Attributes.Param.Connect.Data);\r
+ RtlCopyMemory(ep->Attributes.Param.Connect.Data, hdr + 1,\r
+ sizeof(ep->Attributes.Param.Connect.Data));\r
+- ep->Route = *pEvent->data.req.req.p_primary_path;\r
++ ep->Route = *event.data.req.req.p_primary_path;\r
+ \r
+ ep->State = WvEpPassiveConnect;\r
+ WvEpPut(ep);\r
\r
WdfRequestComplete(request, STATUS_SUCCESS);\r
release:\r
+++ /dev/null
-Bottom: 02d34126680ab0fe5b80784d79d0d5bdbf9ff7bf
-Top: 99fd1b0da6fbee8b9db50e535e592788c9eb9113
-Author: U-AMR\MSHEFTY <MSHEFTY@mshefty-MOBL2.amr.corp.intel.com>
-Date: 2010-01-06 15:45:04 -0800
-
-Refresh of cm_poll
-
----
-
-diff --git a/trunk/core/al/kernel/al_cm.c b/trunk/core/al/kernel/al_cm.c
-index 40eb65a..1af5bb9 100644
---- a/trunk/core/al/kernel/al_cm.c
-+++ b/trunk/core/al/kernel/al_cm.c
-@@ -375,7 +375,7 @@ void cm_get_interface(iba_cm_interface *p_ifc)
- p_ifc->create_id = cm_create_id;\r
- p_ifc->destroy_id = cm_destroy_id;\r
- p_ifc->listen = cm_listen;\r
-- p_ifc->get_reqeust = cm_get_request;\r
-+ p_ifc->get_request = cm_get_request;\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/winverbs/kernel/wv_ep.c b/trunk/core/winverbs/kernel/wv_ep.c
-index 47baba1..3a303fe 100644
---- a/trunk/core/winverbs/kernel/wv_ep.c
-+++ b/trunk/core/winverbs/kernel/wv_ep.c
-@@ -1134,10 +1134,10 @@ static void WvEpGetIbRequest(WV_ENDPOINT *pListen)
- ASSERT(!IsListEmpty(&pListen->Entry));\r
- ep = CONTAINING_RECORD(RemoveHeadList(&pListen->Entry), WV_ENDPOINT, Entry);\r
- ep->pIbCmId = id;\r
-- pId->callback = WvEpIbCmHandler;\r
-- pId->context = ep;\r
-+ id->callback = WvEpIbCmHandler;\r
-+ id->context = ep;\r
- \r
-- hdr = pEvent->data.req.req.p_pdata;\r
-+ hdr = event.data.req.req.p_pdata;\r
- if ((hdr->IpVersion >> 4) == 4) {\r
- ep->Attributes.LocalAddress.SockAddr.In.SinFamily = WV_AF_INET;\r
- ep->Attributes.LocalAddress.SockAddr.In.SinAddr = hdr->DstAddress.Ip4.Address;\r
-@@ -1151,17 +1151,17 @@ static void WvEpGetIbRequest(WV_ENDPOINT *pListen)
- RtlCopyMemory(ep->Attributes.PeerAddress.SockAddr.In6.Sin6Addr,\r
- hdr->SrcAddress.Ip6Address, 16);\r
- }\r
-- ep->Attributes.Device.DeviceGuid = pEvent->data.req.local_ca_guid;\r
-- ep->Attributes.Device.Pkey = pEvent->data.req.req.p_primary_path->pkey;\r
-- ep->Attributes.Device.PortNumber = pEvent->data.req.port_num;\r
-- ep->Attributes.Param.Connect.ResponderResources = pEvent->data.req.req.resp_res;\r
-- ep->Attributes.Param.Connect.InitiatorDepth = pEvent->data.req.req.init_depth;\r
-- ep->Attributes.Param.Connect.RetryCount = pEvent->data.req.req.retry_cnt;\r
-- ep->Attributes.Param.Connect.RnrRetryCount = pEvent->data.req.req.rnr_retry_cnt;\r
-+ ep->Attributes.Device.DeviceGuid = event.data.req.local_ca_guid;\r
-+ ep->Attributes.Device.Pkey = event.data.req.req.p_primary_path->pkey;\r
-+ ep->Attributes.Device.PortNumber = event.data.req.port_num;\r
-+ ep->Attributes.Param.Connect.ResponderResources = event.data.req.req.resp_res;\r
-+ ep->Attributes.Param.Connect.InitiatorDepth = event.data.req.req.init_depth;\r
-+ ep->Attributes.Param.Connect.RetryCount = event.data.req.req.retry_cnt;\r
-+ ep->Attributes.Param.Connect.RnrRetryCount = event.data.req.req.rnr_retry_cnt;\r
- ep->Attributes.Param.Connect.DataLength = sizeof(ep->Attributes.Param.Connect.Data);\r
- RtlCopyMemory(ep->Attributes.Param.Connect.Data, hdr + 1,\r
- sizeof(ep->Attributes.Param.Connect.Data));\r
-- ep->Route = *pEvent->data.req.req.p_primary_path;\r
-+ ep->Route = *event.data.req.req.p_primary_path;\r
- \r
- ep->State = WvEpPassiveConnect;\r
- WvEpPut(ep);