refresh (create temporary patch)

diff --git a/meta b/meta
index 9b85e57f503d1b051fbcfac1bcaa5e24b7bc5f82..5a5eef07139bc3484e7399b3f1153ab5ef6e6a70 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,11 @@
 Version: 1
-Previous: 63a394bd4e09ddb49cef8d26f2781b37613dab0c
-Head: 3065a5cc4992c1604b37316627a16b1c04869374
+Previous: 3a239c83ef56a2155639ed91baf5174c42682628
+Head: b2bbc1047e63085e96094be42742eb2564b92274
 Applied:
   rm-build: d6d2302f2d258fa2c07e55a2e124a9bdd75367a0
   cm_listen_handler: 56372fe5e423b7238a4db99258c1493748c0a582
   cm_poll: 3065a5cc4992c1604b37316627a16b1c04869374
+  refresh-temp: b2bbc1047e63085e96094be42742eb2564b92274
 Unapplied:
   old-bld-32: bd1bd1d366e3927b7646da33e243213a5d59c235
   old-apphang: 7a6f7ff02c6035e54fc262414eb9484ea98018b9

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..0ed3533
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,66 @@
+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);