- Merge r35555, r35575, r35576, and r36243 into my branch

svn path=/branches/aicom-network-fixes/; revision=36248
This commit is contained in:
Cameron Gutman
2008-09-14 20:01:36 +00:00
parent 479f0c8d37
commit 20165883fc
3 changed files with 6 additions and 1 deletions
+1
View File
@@ -202,6 +202,7 @@ VOID DestroySocket( PAFD_FCB FCB ) {
if( InFlightRequest[i]->InFlightRequest ) {
AFD_DbgPrint(MID_TRACE,("Cancelling in flight irp %d (%x)\n",
i, InFlightRequest[i]->InFlightRequest));
IoCancelIrp(InFlightRequest[i]->InFlightRequest);
InFlightRequest[i]->InFlightRequest = NULL;
}
}
+1 -1
View File
@@ -900,7 +900,7 @@ VOID NTAPI MiniportDpc(
NDIS_DbgPrint(DEBUG_MINIPORT, ("Called.\n"));
NdisWorkItem = ExAllocatePool(NonPagedPool, sizeof(PNDIS_WORK_ITEM));
NdisWorkItem = ExAllocatePool(NonPagedPool, sizeof(NDIS_WORK_ITEM));
WorkItem = (PWORK_QUEUE_ITEM)NdisWorkItem->WrapperReserved;
+4
View File
@@ -179,17 +179,21 @@ VOID NTAPI DispCancelRequest(
if( !ChewCreate( &WorkItem, sizeof(DISCONNECT_TYPE),
DispDoDisconnect, &DisType ) )
ASSERT(0);
IoReleaseCancelSpinLock(Irp->CancelIrql);
return;
case TDI_SEND_DATAGRAM:
if (FileObject->FsContext2 != (PVOID)TDI_TRANSPORT_ADDRESS_FILE) {
TI_DbgPrint(MIN_TRACE, ("TDI_SEND_DATAGRAM, but no address file.\n"));
break;
}
break;
case TDI_RECEIVE_DATAGRAM:
if (FileObject->FsContext2 != (PVOID)TDI_TRANSPORT_ADDRESS_FILE) {
TI_DbgPrint(MIN_TRACE, ("TDI_RECEIVE_DATAGRAM, but no address file.\n"));
break;
}
DGRemoveIRP(TranContext->Handle.AddressHandle, Irp);