From 6f778f75bb02f925f700aaa3740aa9430b9c55c3 Mon Sep 17 00:00:00 2001 From: "U-AMR\\MSHEFTY" Date: Wed, 6 Jan 2010 15:52:15 -0800 Subject: [PATCH] refresh --- meta | 7 +++--- patches/cm_poll | 32 +++++++++++++-------------- patches/refresh-temp | 52 -------------------------------------------- 3 files changed, 18 insertions(+), 73 deletions(-) delete mode 100644 patches/refresh-temp diff --git a/meta b/meta index fa9ac7b1..91da5d9a 100644 --- a/meta +++ b/meta @@ -1,11 +1,10 @@ Version: 1 -Previous: d6e2bc92dd031e7258bfd403c1ad594f61b5694a -Head: 6387e4778bdd566df5a12458c5de6d22abaf0c27 +Previous: 2aca7eb360f90f509419b8fcbb2d2100ece65691 +Head: ef232f09cbd9ac35a211764532bcfe8f841df683 Applied: rm-build: d6d2302f2d258fa2c07e55a2e124a9bdd75367a0 cm_listen_handler: 56372fe5e423b7238a4db99258c1493748c0a582 - cm_poll: 680dc3c42d6ca10f22a1c20c448c767ceb362068 - refresh-temp: 6387e4778bdd566df5a12458c5de6d22abaf0c27 + cm_poll: ef232f09cbd9ac35a211764532bcfe8f841df683 Unapplied: old-bld-32: bd1bd1d366e3927b7646da33e243213a5d59c235 old-apphang: 7a6f7ff02c6035e54fc262414eb9484ea98018b9 diff --git a/patches/cm_poll b/patches/cm_poll index a0c4e2f5..0000c965 100644 --- a/patches/cm_poll +++ b/patches/cm_poll @@ -1,5 +1,5 @@ Bottom: fa748f1c52b43305bedd9af43719f0863bbecab5 -Top: 99fd1b0da6fbee8b9db50e535e592788c9eb9113 +Top: 387b7f5f1602203485c10762ab1e083ed5ad08f6 Author: U-AMR\MSHEFTY Date: 2010-01-06 10:08:50 -0800 @@ -22,7 +22,7 @@ Signed-off-by: Sean Hefty --- diff --git a/trunk/core/al/kernel/al_cm.c b/trunk/core/al/kernel/al_cm.c -index 177bb9e..1af5bb9 100644 +index 177bb9e..d22901f 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) @@ -52,7 +52,7 @@ index 177bb9e..1af5bb9 100644 - while (al_cep_poll(h_al, cid, &context, &new_cid, &mad) == IB_SUCCESS) { - - listen_id = (iba_cm_id *) context; -+ status = al_cep_poll(gh_al, p_listen_id->cid, &context, &new_cid, &mad); ++ ib_status = al_cep_poll(gh_al, p_listen_id->cid, &context, &new_cid, &mad); + if (ib_status != IB_SUCCESS) { + return ib_to_ntstatus(ib_status); + } @@ -101,7 +101,7 @@ index 177bb9e..1af5bb9 100644 p_ifc->send_rep = cm_send_rep; p_ifc->send_rtu = cm_send_rtu; diff --git a/trunk/core/winverbs/kernel/wv_ep.c b/trunk/core/winverbs/kernel/wv_ep.c -index 3d5c6ce..3a303fe 100644 +index 3d5c6ce..874f3d1 100644 --- a/trunk/core/winverbs/kernel/wv_ep.c +++ b/trunk/core/winverbs/kernel/wv_ep.c @@ -1110,28 +1110,34 @@ complete: @@ -117,7 +117,7 @@ index 3d5c6ce..3a303fe 100644 NTSTATUS status; IB_CMA_HEADER *hdr; + iba_cm_id *id; -+ iba_cm_event *event; ++ iba_cm_event event; - listen = ((iba_cm_id *) pId->context)->context; + WdfObjectAcquireLock(pListen->Queue); @@ -130,7 +130,7 @@ index 3d5c6ce..3a303fe 100644 - status = WdfIoQueueRetrieveNextRequest(listen->Queue, &request); + status = IbCmInterface.CM.get_request(pListen->pIbCmId, &id, &event); if (!NT_SUCCESS(status)) { -+ WdfIoRequestRequeue(request); ++ WdfRequestRequeue(request); goto release; } @@ -150,7 +150,7 @@ index 3d5c6ce..3a303fe 100644 if ((hdr->IpVersion >> 4) == 4) { ep->Attributes.LocalAddress.SockAddr.In.SinFamily = WV_AF_INET; ep->Attributes.LocalAddress.SockAddr.In.SinAddr = hdr->DstAddress.Ip4.Address; -@@ -1145,27 +1151,85 @@ static NTSTATUS WvEpIbListenHandler(iba_cm_id *pId, iba_cm_event *pEvent) +@@ -1145,25 +1151,82 @@ static NTSTATUS WvEpIbListenHandler(iba_cm_id *pId, iba_cm_event *pEvent) RtlCopyMemory(ep->Attributes.PeerAddress.SockAddr.In6.Sin6Addr, hdr->SrcAddress.Ip6Address, 16); } @@ -180,10 +180,10 @@ index 3d5c6ce..3a303fe 100644 WdfRequestComplete(request, STATUS_SUCCESS); release: - WdfObjectReleaseLock(listen->Queue); +- return status; + WdfObjectReleaseLock(pListen->Queue); - return status; - } - ++} ++ +static NTSTATUS WvEpIbListenHandler(iba_cm_id *pId, iba_cm_event *pEvent) +{ + WV_ENDPOINT *listen; @@ -240,12 +240,10 @@ index 3d5c6ce..3a303fe 100644 +//release: +// WdfObjectReleaseLock(listen->Queue); +// return status; -+} -+ + } + void WvEpListen(WV_PROVIDER *pProvider, WDFREQUEST Request) - { - WV_ENDPOINT *ep; -@@ -1235,24 +1299,24 @@ void WvEpGetRequest(WV_PROVIDER *pProvider, WDFREQUEST Request) +@@ -1235,24 +1298,24 @@ void WvEpGetRequest(WV_PROVIDER *pProvider, WDFREQUEST Request) status = WdfRequestRetrieveInputBuffer(Request, sizeof(WV_IO_EP_GET_REQUEST), &req, NULL); if (!NT_SUCCESS(status)) { @@ -274,7 +272,7 @@ index 3d5c6ce..3a303fe 100644 } WdfObjectAcquireLock(ep->Queue); -@@ -1262,9 +1326,8 @@ void WvEpGetRequest(WV_PROVIDER *pProvider, WDFREQUEST Request) +@@ -1262,9 +1325,8 @@ void WvEpGetRequest(WV_PROVIDER *pProvider, WDFREQUEST Request) status = STATUS_CONNECTION_IN_USE; } WdfObjectReleaseLock(ep->Queue); @@ -285,7 +283,7 @@ index 3d5c6ce..3a303fe 100644 } WdfObjectAcquireLock(listen->Queue); -@@ -1274,15 +1337,21 @@ void WvEpGetRequest(WV_PROVIDER *pProvider, WDFREQUEST Request) +@@ -1274,15 +1336,21 @@ void WvEpGetRequest(WV_PROVIDER *pProvider, WDFREQUEST Request) WvEpGet(ep); } WdfObjectReleaseLock(listen->Queue); diff --git a/patches/refresh-temp b/patches/refresh-temp deleted file mode 100644 index 26e62053..00000000 --- a/patches/refresh-temp +++ /dev/null @@ -1,52 +0,0 @@ -Bottom: 99fd1b0da6fbee8b9db50e535e592788c9eb9113 -Top: 387b7f5f1602203485c10762ab1e083ed5ad08f6 -Author: U-AMR\MSHEFTY -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; - NTSTATUS status; - -- status = al_cep_poll(gh_al, p_listen_id->cid, &context, &new_cid, &mad); -+ ib_status = al_cep_poll(gh_al, p_listen_id->cid, &context, &new_cid, &mad); - if (ib_status != IB_SUCCESS) { - return ib_to_ntstatus(ib_status); - } -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; - IB_CMA_HEADER *hdr; - iba_cm_id *id; -- iba_cm_event *event; -+ iba_cm_event event; - - WdfObjectAcquireLock(pListen->Queue); - status = WdfIoQueueRetrieveNextRequest(pListen->Queue, &request); -@@ -1127,7 +1127,7 @@ static void WvEpGetIbRequest(WV_ENDPOINT *pListen) - - status = IbCmInterface.CM.get_request(pListen->pIbCmId, &id, &event); - if (!NT_SUCCESS(status)) { -- WdfIoRequestRequeue(request); -+ WdfRequestRequeue(request); - goto release; - } - -@@ -1169,7 +1169,6 @@ static void WvEpGetIbRequest(WV_ENDPOINT *pListen) - WdfRequestComplete(request, STATUS_SUCCESS); - release: - WdfObjectReleaseLock(pListen->Queue); -- return status; - } - - static NTSTATUS WvEpIbListenHandler(iba_cm_id *pId, iba_cm_event *pEvent) -- 2.46.0