refresh (create temporary patch)

diff --git a/meta b/meta
index 42973295e9010aa9f2b3706c2fde630dc8540b87..fa9ac7b1468f991a655bbf6fb0e94510a8fe3709 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,11 @@
 Version: 1
-Previous: 11fa8139b9e4738478bf5f6bcba2b433326b66d4
-Head: 680dc3c42d6ca10f22a1c20c448c767ceb362068
+Previous: d6e2bc92dd031e7258bfd403c1ad594f61b5694a
+Head: 6387e4778bdd566df5a12458c5de6d22abaf0c27
 Applied:
   rm-build: d6d2302f2d258fa2c07e55a2e124a9bdd75367a0
   cm_listen_handler: 56372fe5e423b7238a4db99258c1493748c0a582
   cm_poll: 680dc3c42d6ca10f22a1c20c448c767ceb362068
+  refresh-temp: 6387e4778bdd566df5a12458c5de6d22abaf0c27
 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..26e6205
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,52 @@
+Bottom: 99fd1b0da6fbee8b9db50e535e592788c9eb9113
+Top:    387b7f5f1602203485c10762ab1e083ed5ad08f6
+Author: U-AMR\MSHEFTY <MSHEFTY@mshefty-MOBL2.amr.corp.intel.com>
+Date:   2010-01-06 15:52:11 -0800
+
+Refresh of cm_poll
+
+---
+
+diff --git a/trunk/core/al/kernel/al_cm.c b/trunk/core/al/kernel/al_cm.c
+index 1af5bb9..d22901f 100644
+--- a/trunk/core/al/kernel/al_cm.c
++++ b/trunk/core/al/kernel/al_cm.c
+@@ -117,7 +117,7 @@ cm_get_request(iba_cm_id *p_listen_id, iba_cm_id **pp_id, iba_cm_event *p_event)
+       ib_api_status_t         ib_status;\r
+       NTSTATUS                        status;\r
+ \r
+-      status = al_cep_poll(gh_al, p_listen_id->cid, &context, &new_cid, &mad);\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
+       }\r
+diff --git a/trunk/core/winverbs/kernel/wv_ep.c b/trunk/core/winverbs/kernel/wv_ep.c
+index 3a303fe..874f3d1 100644
+--- a/trunk/core/winverbs/kernel/wv_ep.c
++++ b/trunk/core/winverbs/kernel/wv_ep.c
+@@ -1117,7 +1117,7 @@ static void WvEpGetIbRequest(WV_ENDPOINT *pListen)
+       NTSTATUS                status;\r
+       IB_CMA_HEADER   *hdr;\r
+       iba_cm_id               *id;\r
+-      iba_cm_event    *event;\r
++      iba_cm_event    event;\r
+ \r
+       WdfObjectAcquireLock(pListen->Queue);\r
+       status = WdfIoQueueRetrieveNextRequest(pListen->Queue, &request);\r
+@@ -1127,7 +1127,7 @@ static void WvEpGetIbRequest(WV_ENDPOINT *pListen)
+ \r
+       status = IbCmInterface.CM.get_request(pListen->pIbCmId, &id, &event);\r
+       if (!NT_SUCCESS(status)) {\r
+-              WdfIoRequestRequeue(request);\r
++              WdfRequestRequeue(request);\r
+               goto release;\r
+       }\r
+ \r
+@@ -1169,7 +1169,6 @@ static void WvEpGetIbRequest(WV_ENDPOINT *pListen)
+       WdfRequestComplete(request, STATUS_SUCCESS);\r
+ release:\r
+       WdfObjectReleaseLock(pListen->Queue);\r
+-      return status;\r
+ }\r
+ \r
+ static NTSTATUS WvEpIbListenHandler(iba_cm_id *pId, iba_cm_event *pEvent)