From d006ec695ef530dd29b0f13f72a05a2c64c383a3 Mon Sep 17 00:00:00 2001 From: Art Yerkes Date: Tue, 29 Jul 2008 21:52:09 +0000 Subject: [PATCH] Patch by Cameron Gutman (aicommander (at) gmail (dot) com) - Remove a hack from DispTdiSendDatagram - Fix a couple of bugs that resulted in clearing the wrong request svn path=/trunk/; revision=34938 --- reactos/drivers/network/afd/afd/write.c | 4 ++-- reactos/drivers/network/tcpip/tcpip/dispatch.c | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/reactos/drivers/network/afd/afd/write.c b/reactos/drivers/network/afd/afd/write.c index 19407d85169..5236a8c551b 100644 --- a/reactos/drivers/network/afd/afd/write.c +++ b/reactos/drivers/network/afd/afd/write.c @@ -41,7 +41,7 @@ static NTSTATUS NTAPI SendComplete ASSERT_IRQL(APC_LEVEL); if (Irp->Cancel) { - FCB->ReceiveIrp.InFlightRequest = NULL; + FCB->SendIrp.InFlightRequest = NULL; return STATUS_SUCCESS; } @@ -175,7 +175,7 @@ static NTSTATUS NTAPI PacketSocketSendComplete Irp->IoStatus.Information)); if (Irp->Cancel) { - FCB->ReceiveIrp.InFlightRequest = NULL; + FCB->SendIrp.InFlightRequest = NULL; return STATUS_SUCCESS; } diff --git a/reactos/drivers/network/tcpip/tcpip/dispatch.c b/reactos/drivers/network/tcpip/tcpip/dispatch.c index bee2e63c181..9c7cbeca6b5 100644 --- a/reactos/drivers/network/tcpip/tcpip/dispatch.c +++ b/reactos/drivers/network/tcpip/tcpip/dispatch.c @@ -1018,9 +1018,6 @@ NTSTATUS DispTdiSendDatagram( if (Status != STATUS_PENDING) { DispDataRequestComplete(Irp, Status, Irp->IoStatus.Information); - /* Return STATUS_PENDING because DispPrepareIrpForCancel - marks Irp as pending */ - Status = STATUS_PENDING; } else IoMarkIrpPending( Irp ); }