[spetreolle] 48971: Merge 48968 to 0.3.12 branch.

Author: spetreolle
Date: Sun Oct  3 21:33:31 2010
New Revision: 48971

URL: http://svn.reactos.org/svn/reactos?rev=48971&view=rev
Log:
Merge 48968 to 0.3.12 branch.

Modified:
    branches/ros-branch-0_3_12/reactos/drivers/network/ndis/ndis/time.c

Modified: branches/ros-branch-0_3_12/reactos/drivers/network/ndis/ndis/time.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_12/reactos/driver...
==============================================================================
--- branches/ros-branch-0_3_12/reactos/drivers/network/ndis/ndis/time.c [iso-8859-1] (original)
+++ branches/ros-branch-0_3_12/reactos/drivers/network/ndis/ndis/time.c [iso-8859-1] Sun Oct  3 21:33:31 2010
@@ -145,7 +145,7 @@
  *     - call at IRQL <= DISPATCH_LEVEL
  */
 {
-  KIRQL OldIrql;
+  //KIRQL OldIrql;

ASSERT_IRQL(DISPATCH_LEVEL);
   ASSERT(TimerCancelled);
@@ -153,6 +153,7 @@

*TimerCancelled = KeCancelTimer (&Timer->Timer);

+#if 0
   if (*TimerCancelled)
   {
       KeAcquireSpinLock(&Timer->Miniport->Lock, &OldIrql);
@@ -160,6 +161,7 @@
       if (!DequeueMiniportTimer(Timer)) ASSERT(FALSE);
       KeReleaseSpinLock(&Timer->Miniport->Lock, OldIrql);
   }
+#endif
 }

VOID NTAPI
@@ -170,6 +172,7 @@
 {
   PNDIS_MINIPORT_TIMER Timer = DeferredContext;

+#if 0
   /* Only dequeue if the timer has a period of 0 */
   if (!Timer->Timer.Period)
   {
@@ -178,6 +181,7 @@
       if (!DequeueMiniportTimer(Timer)) ASSERT(FALSE);
       KeReleaseSpinLockFromDpcLevel(&Timer->Miniport->Lock);
   }
+#endif

Timer->MiniportTimerFunction(Dpc,
                                Timer->MiniportTimerContext,
@@ -240,14 +244,15 @@
  */
 {
   LARGE_INTEGER Timeout;
-  KIRQL OldIrql;
+  //KIRQL OldIrql;

ASSERT_IRQL(DISPATCH_LEVEL);
   ASSERT(Timer);

/* relative delays are negative, absolute are positive; resolution is 100ns */
   Timeout.QuadPart = Int32x32To64(MillisecondsPeriod, -10000);
-    
+
+#if 0
   /* Lock the miniport block */
   KeAcquireSpinLock(&Timer->Miniport->Lock, &OldIrql);

@@ -260,6 +265,7 @@

/* Unlock the miniport block */
   KeReleaseSpinLock(&Timer->Miniport->Lock, OldIrql);
+#endif

KeSetTimerEx(&Timer->Timer, Timeout, MillisecondsPeriod, &Timer->Dpc);
 }
@@ -285,7 +291,7 @@
  */
 {
   LARGE_INTEGER Timeout;
-  KIRQL OldIrql;
+  //KIRQL OldIrql;

ASSERT_IRQL(DISPATCH_LEVEL);
   ASSERT(Timer);
@@ -293,6 +299,7 @@
   /* relative delays are negative, absolute are positive; resolution is 100ns */
   Timeout.QuadPart = Int32x32To64(MillisecondsToDelay, -10000);

+#if 0
   /* Lock the miniport block */
   KeAcquireSpinLock(&Timer->Miniport->Lock, &OldIrql);

@@ -305,6 +312,7 @@

/* Unlock the miniport block */
   KeReleaseSpinLock(&Timer->Miniport->Lock, OldIrql);
+#endif

KeSetTimer(&Timer->Timer, Timeout, &Timer->Dpc);
 }