Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-23 08:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Never queue a DPC for MiniportHandleInterrupt regardless of what MiniportISR requests if MiniportInitialize is executing

Browse source 
- Very likely fixes CORE-6064

svn path=/trunk/; revision=58022
This commit is contained in:
Cameron Gutman 2012-12-28 00:36:28 +00:00
parent ff6c1ce972
commit be1984907c
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
reactos/drivers/network/ndis/ndis/io.c
View file

@ -62,11 +62,16 @@ BOOLEAN NTAPI ServiceRoutine(
BOOLEAN QueueMiniportHandleInterrupt = FALSE;
PNDIS_MINIPORT_INTERRUPT NdisInterrupt = ServiceContext;
PNDIS_MINIPORT_BLOCK NdisMiniportBlock = NdisInterrupt->Miniport;
BOOLEAN Initializing;
NDIS_DbgPrint(MAX_TRACE, ("Called. Interrupt (0x%X)\n", NdisInterrupt));
/* FIXME: This probably isn't the right check for MiniportInitialize, but we need to see what Windows uses here */
if ((NdisMiniportBlock->PnPDeviceState != NdisPnPDeviceStarted) || (NdisInterrupt->IsrRequested)) {
/* Certain behavior differs if MiniportInitialize is executing when the interrupt is generated */
Initializing = (NdisMiniportBlock->PnPDeviceState != NdisPnPDeviceStarted);
NDIS_DbgPrint(MAX_TRACE, ("MiniportInitialize executing: %s\n", (Initializing ? "yes" : "no")));
/* MiniportISR is always called for interrupts during MiniportInitialize */
if ((Initializing) || (NdisInterrupt->IsrRequested)) {
NDIS_DbgPrint(MAX_TRACE, ("Calling MiniportISR\n"));
(*NdisMiniportBlock->DriverHandle->MiniportCharacteristics.ISRHandler)(
&InterruptRecognized,
@ -81,8 +86,8 @@ BOOLEAN NTAPI ServiceRoutine(
InterruptRecognized = TRUE;
}
if (QueueMiniportHandleInterrupt)
/* MiniportHandleInterrupt is never called for an interrupt during MiniportInitialize */
if ((QueueMiniportHandleInterrupt) && (!Initializing))
{
NDIS_DbgPrint(MAX_TRACE, ("Queuing DPC.\n"));
KeInsertQueueDpc(&NdisInterrupt->InterruptDpc, NULL, NULL);