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

diff --git a/reactos/drivers/network/afd/afd/write.c b/reactos/drivers/network/afd/afd/write.c
index 19407d8..5236a8c 100644 (file)
--- 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 bee2e63..9c7cbec 100644 (file)
--- 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 );
     }