- Merge aicom-network-fixes up to r36581

svn path=/trunk/; revision=36582
This commit is contained in:
Cameron Gutman 2008-09-28 20:19:27 +00:00
parent ec00886a23
commit 472eb91e2f
2 changed files with 5 additions and 4 deletions

View file

@ -182,8 +182,6 @@ MiniIndicateData(
AdapterBinding = CONTAINING_RECORD(CurrentEntry, ADAPTER_BINDING, AdapterListEntry); AdapterBinding = CONTAINING_RECORD(CurrentEntry, ADAPTER_BINDING, AdapterListEntry);
NDIS_DbgPrint(DEBUG_MINIPORT, ("AdapterBinding = %x\n", AdapterBinding)); NDIS_DbgPrint(DEBUG_MINIPORT, ("AdapterBinding = %x\n", AdapterBinding));
KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql);
#ifdef DBG #ifdef DBG
if(!AdapterBinding) if(!AdapterBinding)
{ {
@ -226,8 +224,6 @@ MiniIndicateData(
LookaheadBufferSize, LookaheadBufferSize,
PacketSize); PacketSize);
KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql);
CurrentEntry = CurrentEntry->Flink; CurrentEntry = CurrentEntry->Flink;
} }
} }

View file

@ -67,6 +67,7 @@ ProIndicatePacket(
{ {
UINT BufferedLength; UINT BufferedLength;
UINT PacketLength; UINT PacketLength;
KIRQL OldIrql;
NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); NDIS_DbgPrint(MAX_TRACE, ("Called.\n"));
@ -76,6 +77,8 @@ ProIndicatePacket(
NdisQueryPacket(Packet, NULL, NULL, NULL, &PacketLength); NdisQueryPacket(Packet, NULL, NULL, NULL, &PacketLength);
KeRaiseIrql(DISPATCH_LEVEL, &OldIrql);
NDIS_DbgPrint(MAX_TRACE, ("acquiring miniport block lock\n")); NDIS_DbgPrint(MAX_TRACE, ("acquiring miniport block lock\n"));
KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock);
{ {
@ -103,6 +106,8 @@ ProIndicatePacket(
} }
KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock);
KeLowerIrql(OldIrql);
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }