[ros-diffs] [arty] 35551: Hand merge a lost change from aicom-network-fixes.

[arty at svn.reactos.org]

Author: arty
Date: Sat Aug 23 02:39:02 2008
New Revision: 35551

URL: http://svn.reactos.org/svn/reactos?rev=35551&view=rev
Log:
Hand merge a lost change from aicom-network-fixes.

Modified:
    trunk/reactos/drivers/network/afd/afd/listen.c

Modified: trunk/reactos/drivers/network/afd/afd/listen.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/listen.c?rev=35551&r1=35550&r2=35551&view=diff
==============================================================================
--- trunk/reactos/drivers/network/afd/afd/listen.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/afd/afd/listen.c [iso-8859-1] Sat Aug 23 02:39:02 2008
@@ -216,7 +216,6 @@
 
 NTSTATUS AfdWaitForListen( PDEVICE_OBJECT DeviceObject, PIRP Irp,
 			   PIO_STACK_LOCATION IrpSp ) {
-    NTSTATUS Status = STATUS_SUCCESS;
     PFILE_OBJECT FileObject = IrpSp->FileObject;
     PAFD_FCB FCB = FileObject->FsContext;
 
@@ -239,7 +238,7 @@
         PollReeval( FCB->DeviceExt, FCB->FileObject );
 
 	SocketStateUnlock( FCB );
-	return Status;
+	return Irp->IoStatus.Status;
     } else {
 	AFD_DbgPrint(MID_TRACE,("Holding\n"));
 
@@ -328,10 +327,9 @@
 		FCB->PollState &= ~AFD_EVENT_ACCEPT;
 
 	    SocketStateUnlock( FCB );
-	    return Status;
+	    return Irp->IoStatus.Status;
 	}
     }
 
-    SocketStateUnlock( FCB );
-    return STATUS_UNSUCCESSFUL;
-}
+    return UnlockAndMaybeComplete( FCB, STATUS_UNSUCCESSFUL, Irp, 0, NULL );
+}