[arty] 34938: 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

Author: arty
Date: Tue Jul 29 16:52:09 2008
New Revision: 34938

URL: http://svn.reactos.org/svn/reactos?rev=34938&view=rev
Log:
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

Modified:
    trunk/reactos/drivers/network/afd/afd/write.c
    trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c

Modified: trunk/reactos/drivers/network/afd/afd/write.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/wr…
==============================================================================
--- trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] Tue Jul 29 16:52:09 2008
@@ -41,7 +41,7 @@
     ASSERT_IRQL(APC_LEVEL);
 
     if (Irp->Cancel) {
-        FCB->ReceiveIrp.InFlightRequest = NULL;
+        FCB->SendIrp.InFlightRequest = NULL;
         return STATUS_SUCCESS;
     }
 
@@ -175,7 +175,7 @@
 			    Irp->IoStatus.Information));
 
     if (Irp->Cancel) {
-        FCB->ReceiveIrp.InFlightRequest = NULL;
+        FCB->SendIrp.InFlightRequest = NULL;
         return STATUS_SUCCESS;
     }
 

Modified: trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi…
==============================================================================
--- trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] Tue Jul 29 16:52:09
2008
@@ -1018,9 +1018,6 @@
 
         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 );
     }