[ros-diffs] [cgutman] 36582: - Merge aicom-network-fixes up to r36581

Author: cgutman
Date: Sun Sep 28 15:19:27 2008
New Revision: 36582

URL: http://svn.reactos.org/svn/reactos?rev=36582&view=rev
Log:
 - Merge aicom-network-fixes up to r36581

Modified:
    trunk/reactos/drivers/network/ndis/ndis/miniport.c
    trunk/reactos/drivers/network/ndis/ndis/protocol.c

Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/…
==============================================================================
--- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Sun Sep 28 15:19:27
2008
@@ -182,8 +182,6 @@
           AdapterBinding = CONTAINING_RECORD(CurrentEntry, ADAPTER_BINDING,
AdapterListEntry);
 	  NDIS_DbgPrint(DEBUG_MINIPORT, ("AdapterBinding = %x\n", AdapterBinding));
 
-          KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql);
-
 #ifdef DBG
           if(!AdapterBinding)
             {
@@ -225,8 +223,6 @@
               LookaheadBuffer,
               LookaheadBufferSize,
               PacketSize);
-
-          KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql);
 
           CurrentEntry = CurrentEntry->Flink;
         }

Modified: trunk/reactos/drivers/network/ndis/ndis/protocol.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/…
==============================================================================
--- trunk/reactos/drivers/network/ndis/ndis/protocol.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/ndis/ndis/protocol.c [iso-8859-1] Sun Sep 28 15:19:27
2008
@@ -67,6 +67,7 @@
 {
   UINT BufferedLength;
   UINT PacketLength;
+  KIRQL OldIrql;
 
   NDIS_DbgPrint(MAX_TRACE, ("Called.\n"));
 
@@ -75,6 +76,8 @@
 #endif
 
   NdisQueryPacket(Packet, NULL, NULL, NULL, &PacketLength);
+
+  KeRaiseIrql(DISPATCH_LEVEL, &OldIrql);
 
   NDIS_DbgPrint(MAX_TRACE, ("acquiring miniport block lock\n"));
   KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock);
@@ -102,6 +105,8 @@
       Adapter->NdisMiniportBlock.IndicatedPacket[KeGetCurrentProcessorNumber()] =
NULL;
     }
   KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock);
+
+  KeLowerIrql(OldIrql);
 
   return STATUS_SUCCESS;
 }