[NDIS]

[reactos.git] / reactos / drivers / network / ndis / ndis / time.c

diff --git a/reactos/drivers/network/ndis/ndis/time.c b/reactos/drivers/network/ndis/ndis/time.c
index d03acb9..eb5d005 100644 (file)
--- a/reactos/drivers/network/ndis/ndis/time.c
+++ b/reactos/drivers/network/ndis/ndis/time.c
@@ -99,7 +99,10 @@ BOOLEAN DequeueMiniportTimer(PNDIS_MINIPORT_TIMER Timer)
 {
   PNDIS_MINIPORT_TIMER CurrentTimer;
 
-  ASSERT(Timer->Miniport->TimerQueue);
+  ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL);
+
+  if (!Timer->Miniport->TimerQueue)
+      return FALSE;
 
   if (Timer->Miniport->TimerQueue == Timer)
   {
@@ -142,13 +145,21 @@ NdisMCancelTimer(
  *     - call at IRQL <= DISPATCH_LEVEL
  */
 {
+  KIRQL OldIrql;
+
   ASSERT_IRQL(DISPATCH_LEVEL);
   ASSERT(TimerCancelled);
   ASSERT(Timer);
 
   *TimerCancelled = KeCancelTimer (&Timer->Timer);
 
-  DequeueMiniportTimer(Timer);
+  if (*TimerCancelled)
+  {
+      KeAcquireSpinLock(&Timer->Miniport->Lock, &OldIrql);
+      /* If it's somebody already dequeued it, something is wrong (maybe a double-cancel?) */
+      if (!DequeueMiniportTimer(Timer)) ASSERT(FALSE);
+      KeReleaseSpinLock(&Timer->Miniport->Lock, OldIrql);
+  }
 }
 
 VOID NTAPI
@@ -159,13 +170,19 @@ MiniTimerDpcFunction(PKDPC Dpc,
 {
   PNDIS_MINIPORT_TIMER Timer = DeferredContext;
 
+  /* Only dequeue if the timer has a period of 0 */
+  if (!Timer->Timer.Period)
+  {
+      KeAcquireSpinLockAtDpcLevel(&Timer->Miniport->Lock);
+      /* If someone already dequeued it, something is wrong (borked timer implementation?) */
+      if (!DequeueMiniportTimer(Timer)) ASSERT(FALSE);
+      KeReleaseSpinLockFromDpcLevel(&Timer->Miniport->Lock);
+  }
+
   Timer->MiniportTimerFunction(Dpc,
                                Timer->MiniportTimerContext,
                                SystemArgument1,
                                SystemArgument2);
-
-  /* Only dequeue if the timer has a period of 0 */
-  if (!Timer->Timer.Period) DequeueMiniportTimer(Timer);
 }
 
 \f
@@ -223,6 +240,7 @@ NdisMSetPeriodicTimer(
  */
 {
   LARGE_INTEGER Timeout;
+  KIRQL OldIrql;
 
   ASSERT_IRQL(DISPATCH_LEVEL);
   ASSERT(Timer);
@@ -230,14 +248,15 @@ NdisMSetPeriodicTimer(
   /* relative delays are negative, absolute are positive; resolution is 100ns */
   Timeout.QuadPart = Int32x32To64(MillisecondsPeriod, -10000);
 
-  /* Dequeue the timer if it is queued already */
-  DequeueMiniportTimer(Timer);
-
-  /* Add the timer at the head of the timer queue */
-  Timer->NextDeferredTimer = Timer->Miniport->TimerQueue;
-  Timer->Miniport->TimerQueue = Timer;
-
-  KeSetTimerEx (&Timer->Timer, Timeout, MillisecondsPeriod, &Timer->Dpc);
+  KeAcquireSpinLock(&Timer->Miniport->Lock, &OldIrql);
+  /* If KeSetTimer(Ex) returns FALSE then the timer is not in the system's queue (and not in ours either) */
+  if (!KeSetTimerEx(&Timer->Timer, Timeout, MillisecondsPeriod, &Timer->Dpc))
+  {
+      /* Add the timer at the head of the timer queue */
+      Timer->NextDeferredTimer = Timer->Miniport->TimerQueue;
+      Timer->Miniport->TimerQueue = Timer;
+  }
+  KeReleaseSpinLock(&Timer->Miniport->Lock, OldIrql);
 }
 
 \f
@@ -261,6 +280,7 @@ NdisMSetTimer(
  */
 {
   LARGE_INTEGER Timeout;
+  KIRQL OldIrql;
 
   ASSERT_IRQL(DISPATCH_LEVEL);
   ASSERT(Timer);
@@ -268,14 +288,15 @@ NdisMSetTimer(
   /* relative delays are negative, absolute are positive; resolution is 100ns */
   Timeout.QuadPart = Int32x32To64(MillisecondsToDelay, -10000);
 
-  /* Dequeue the timer if it is queued already */
-  DequeueMiniportTimer(Timer);
-
-  /* Add the timer at the head of the timer queue */
-  Timer->NextDeferredTimer = Timer->Miniport->TimerQueue;
-  Timer->Miniport->TimerQueue = Timer;
-
-  KeSetTimer (&Timer->Timer, Timeout, &Timer->Dpc);
+  KeAcquireSpinLock(&Timer->Miniport->Lock, &OldIrql);
+  /* If KeSetTimer(Ex) returns FALSE then the timer is not in the system's queue (and not in ours either) */
+  if (!KeSetTimer(&Timer->Timer, Timeout, &Timer->Dpc))
+  {
+      /* Add the timer at the head of the timer queue */
+      Timer->NextDeferredTimer = Timer->Miniport->TimerQueue;
+      Timer->Miniport->TimerQueue = Timer;
+  }
+  KeReleaseSpinLock(&Timer->Miniport->Lock, OldIrql);
 }
 
 \f