Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 22:43:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

- We must call MiniQueueWorkItem while holding a spin lock

Browse source 
svn path=/branches/aicom-network-fixes/; revision=36134
This commit is contained in:
Cameron Gutman 2008-09-11 09:37:54 +00:00
parent acb347a4eb
commit 4b72cb5e0f
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
drivers/network/ndis/ndis/protocol.c
View file

@ -238,7 +238,6 @@ ProSend(
*/ */
NDIS_DbgPrint(MAX_TRACE, ("acquiring miniport block lock\n")); NDIS_DbgPrint(MAX_TRACE, ("acquiring miniport block lock\n"));
KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &SpinOldIrql); KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &SpinOldIrql);
{
/* /*
* if the miniport is marked as busy, we queue the packet as a work item, * if the miniport is marked as busy, we queue the packet as a work item,
* else we send the packet directly to the miniport. Sending to the miniport * else we send the packet directly to the miniport. Sending to the miniport
@ -251,8 +250,6 @@ ProSend(
NDIS_DbgPrint(MAX_TRACE, ("Setting adapter 0x%x to busy\n")); NDIS_DbgPrint(MAX_TRACE, ("Setting adapter 0x%x to busy\n"));
Adapter->MiniportBusy = TRUE; Adapter->MiniportBusy = TRUE;
} }
}
KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, SpinOldIrql);
/* /*
* Test the packet to see if it is a MAC loopback. * Test the packet to see if it is a MAC loopback.
@ -269,9 +266,12 @@ ProSend(
if (QueueWorkItem) if (QueueWorkItem)
{ {
MiniQueueWorkItem(Adapter, NdisWorkItemSendLoopback, (PVOID)Packet); MiniQueueWorkItem(Adapter, NdisWorkItemSendLoopback, (PVOID)Packet);
KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, SpinOldIrql);
return NDIS_STATUS_PENDING; return NDIS_STATUS_PENDING;
} }
KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, SpinOldIrql);
KeRaiseIrql(DISPATCH_LEVEL, &RaiseOldIrql); KeRaiseIrql(DISPATCH_LEVEL, &RaiseOldIrql);
{ {
/* /*
@ -306,12 +306,15 @@ ProSend(
if (QueueWorkItem) if (QueueWorkItem)
{ {
MiniQueueWorkItem(Adapter, NdisWorkItemSend, (PVOID)Packet); MiniQueueWorkItem(Adapter, NdisWorkItemSend, (PVOID)Packet);
KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, SpinOldIrql);
NDIS_DbgPrint(MAX_TRACE, ("Queued a work item and returning\n")); NDIS_DbgPrint(MAX_TRACE, ("Queued a work item and returning\n"));
return NDIS_STATUS_PENDING; return NDIS_STATUS_PENDING;
} }
ASSERT(Adapter->NdisMiniportBlock.DriverHandle); ASSERT(Adapter->NdisMiniportBlock.DriverHandle);
KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, SpinOldIrql);
/* /*
* Call the appropriate send handler * Call the appropriate send handler
* *