Commit in reactos/drivers/net/afd on MAIN
afd/connect.c+3-21.8 -> 1.9
   /tdi.c+3-31.23 -> 1.24
include/afd.h+2-31.27 -> 1.28
       /tdi_proto.h+11.5 -> 1.6
+9-8
4 modified files
I had put an IOSB on the stack in TdiConnect.  Now we use a PendingIrp
struct that associates it with an IRP.  Better.

reactos/drivers/net/afd/afd
connect.c 1.8 -> 1.9
diff -u -r1.8 -r1.9
--- connect.c	11 Dec 2004 14:59:31 -0000	1.8
+++ connect.c	13 Dec 2004 21:20:37 -0000	1.9
@@ -1,4 +1,4 @@
-/* $Id: connect.c,v 1.8 2004/12/11 14:59:31 navaraf Exp $
+/* $Id: connect.c,v 1.9 2004/12/13 21:20:37 arty Exp $
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * FILE:             drivers/net/afd/afd/connect.c
@@ -194,9 +194,10 @@
 	      &ConnectReq->RemoteAddress );
 	
 	if( TargetAddress ) {
-	    Status = TdiConnect( &FCB->PendingTdiIrp, 
+	    Status = TdiConnect( &FCB->ConnectIrp.InFlightRequest, 
 				 FCB->Connection.Object,
 				 TargetAddress,
+				 &FCB->ConnectIrp.Iosb,
 				 StreamSocketConnectComplete,
 				 FCB );
 

reactos/drivers/net/afd/afd
tdi.c 1.23 -> 1.24
diff -u -r1.23 -r1.24
--- tdi.c	4 Dec 2004 23:29:54 -0000	1.23
+++ tdi.c	13 Dec 2004 21:20:38 -0000	1.24
@@ -272,6 +272,7 @@
     PIRP *Irp,
     PFILE_OBJECT ConnectionObject,
     PTDI_CONNECTION_INFORMATION RemoteAddress,
+    PIO_STATUS_BLOCK Iosb,
     PIO_COMPLETION_ROUTINE CompletionRoutine,
     PVOID CompletionContext)
 /*
@@ -284,7 +285,6 @@
  */
 {
   PDEVICE_OBJECT DeviceObject;
-  IO_STATUS_BLOCK Iosb;
   NTSTATUS Status;
 
   AFD_DbgPrint(MAX_TRACE, ("Called\n"));
@@ -297,7 +297,7 @@
 					  DeviceObject,            /* Device object */
 					  ConnectionObject,        /* File object */
 					  NULL,                    /* Event */
-					  &Iosb);                  /* Status */
+					  Iosb);                   /* Status */
   if (!*Irp) {
     return STATUS_INSUFFICIENT_RESOURCES;
   }
@@ -311,7 +311,7 @@
                   RemoteAddress,          /* Request connection information */
                   RemoteAddress);         /* Return connection information */
 
-  Status = TdiCall(*Irp, DeviceObject, NULL, &Iosb);
+  Status = TdiCall(*Irp, DeviceObject, NULL, Iosb);
 
   return Status;
 }

reactos/drivers/net/afd/include
afd.h 1.27 -> 1.28
diff -u -r1.27 -r1.28
--- afd.h	11 Dec 2004 14:59:31 -0000	1.27
+++ afd.h	13 Dec 2004 21:20:38 -0000	1.28
@@ -1,4 +1,4 @@
-/* $Id: afd.h,v 1.27 2004/12/11 14:59:31 navaraf Exp $
+/* $Id: afd.h,v 1.28 2004/12/13 21:20:38 arty Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -133,7 +133,7 @@
     PTRANSPORT_ADDRESS LocalAddress, RemoteAddress;
     PTDI_CONNECTION_INFORMATION AddressFrom;
     AFD_TDI_OBJECT AddressFile, Connection;
-    AFD_IN_FLIGHT_REQUEST ListenIrp, ReceiveIrp, SendIrp;
+    AFD_IN_FLIGHT_REQUEST ConnectIrp, ListenIrp, ReceiveIrp, SendIrp;
     AFD_DATA_WINDOW Send, Recv;
     FAST_MUTEX Mutex;
     KEVENT StateLockedEvent;
@@ -144,7 +144,6 @@
     PVOID Context;
     DWORD PollState;
     UINT ContextSize;
-    PIRP PendingTdiIrp;
     LIST_ENTRY PendingIrpList[MAX_FUNCTIONS];
     LIST_ENTRY DatagramList;
 } AFD_FCB, *PAFD_FCB;

reactos/drivers/net/afd/include
tdi_proto.h 1.5 -> 1.6
diff -u -r1.5 -r1.6
--- tdi_proto.h	11 Dec 2004 14:59:31 -0000	1.5
+++ tdi_proto.h	13 Dec 2004 21:20:38 -0000	1.6
@@ -4,6 +4,7 @@
 NTSTATUS TdiConnect( PIRP *PendingIrp,
 		     PFILE_OBJECT ConnectionObject,
 		     PTDI_CONNECTION_INFORMATION RemoteAddress,
+		     PIO_STATUS_BLOCK Iosb,
 		     PIO_COMPLETION_ROUTINE CompletionRoutine,
 		     PVOID CompletionContext );
 
CVSspam 0.2.8