[ros-diffs] [cgutman] 38200: - Revert r37479

[cgutman at svn.reactos.org]

Author: cgutman
Date: Sat Dec 20 14:08:53 2008
New Revision: 38200

URL: http://svn.reactos.org/svn/reactos?rev=38200&view=rev
Log:
 - Revert r37479

Modified:
    branches/aicom-network-fixes/lib/drivers/ip/network/loopback.c

Modified: branches/aicom-network-fixes/lib/drivers/ip/network/loopback.c
URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/lib/drivers/ip/network/loopback.c?rev=38200&r1=38199&r2=38200&view=diff
==============================================================================
--- branches/aicom-network-fixes/lib/drivers/ip/network/loopback.c [iso-8859-1] (original)
+++ branches/aicom-network-fixes/lib/drivers/ip/network/loopback.c [iso-8859-1] Sat Dec 20 14:08:53 2008
@@ -22,6 +22,7 @@
 KSPIN_LOCK LoopWorkLock;
 LIST_ENTRY LoopWorkList;
 WORK_QUEUE_ITEM LoopWorkItem;
+BOOLEAN LoopReceiveWorkerBusy = FALSE;
 
 VOID STDCALL LoopReceiveWorker( PVOID Context ) {
     PLIST_ENTRY ListEntry;
@@ -34,43 +35,46 @@
 
     TI_DbgPrint(DEBUG_DATALINK, ("Called.\n"));
 
-    ListEntry = ExInterlockedRemoveHeadList( &LoopWorkList, &LoopWorkLock );
-    WorkItem = CONTAINING_RECORD(ListEntry, LAN_WQ_ITEM, ListEntry);
-
-    TI_DbgPrint(DEBUG_DATALINK, ("WorkItem: %x\n", WorkItem));
-
-    Packet = WorkItem->Packet;
-    Adapter = WorkItem->Adapter;
-    BytesTransferred = WorkItem->BytesTransferred;
-
-    ExFreePool( WorkItem );
-
-    IPPacket.NdisPacket = Packet;
-
-    TI_DbgPrint(DEBUG_DATALINK, ("Packet %x Adapter %x Trans %x\n",
-                                  Packet, Adapter, BytesTransferred));
-
-    NdisGetFirstBufferFromPacket(Packet,
-                                 &NdisBuffer,
-                                 &IPPacket.Header,
-                                 &IPPacket.ContigSize,
-                                 &IPPacket.TotalSize);
-
-    IPPacket.ContigSize = IPPacket.TotalSize = BytesTransferred;
-    /* Determine which upper layer protocol that should receive
-    this packet and pass it to the correct receive handler */
-
-    TI_DbgPrint(MID_TRACE,
-	       ("ContigSize: %d, TotalSize: %d, BytesTransferred: %d\n",
-	         IPPacket.ContigSize, IPPacket.TotalSize,
-		 BytesTransferred));
-
-    IPPacket.Position = 0;
-
-    IPReceive(Loopback, &IPPacket);
-
-    FreeNdisPacket( Packet );
+    while( (ListEntry =
+	    ExInterlockedRemoveHeadList( &LoopWorkList, &LoopWorkLock )) ) {
+	WorkItem = CONTAINING_RECORD(ListEntry, LAN_WQ_ITEM, ListEntry);
+
+	TI_DbgPrint(DEBUG_DATALINK, ("WorkItem: %x\n", WorkItem));
+
+	Packet = WorkItem->Packet;
+	Adapter = WorkItem->Adapter;
+	BytesTransferred = WorkItem->BytesTransferred;
+
+	ExFreePool( WorkItem );
+
+        IPPacket.NdisPacket = Packet;
+
+        TI_DbgPrint(DEBUG_DATALINK, ("Packet %x Adapter %x Trans %x\n",
+                                     Packet, Adapter, BytesTransferred));
+
+        NdisGetFirstBufferFromPacket(Packet,
+                                     &NdisBuffer,
+                                     &IPPacket.Header,
+                                     &IPPacket.ContigSize,
+                                     &IPPacket.TotalSize);
+
+	IPPacket.ContigSize = IPPacket.TotalSize = BytesTransferred;
+        /* Determine which upper layer protocol that should receive
+           this packet and pass it to the correct receive handler */
+
+	TI_DbgPrint(MID_TRACE,
+		    ("ContigSize: %d, TotalSize: %d, BytesTransferred: %d\n",
+		     IPPacket.ContigSize, IPPacket.TotalSize,
+		     BytesTransferred));
+
+	IPPacket.Position = 0;
+
+        IPReceive(Loopback, &IPPacket);
+
+	FreeNdisPacket( Packet );
+    }
     TI_DbgPrint(DEBUG_DATALINK, ("Leaving\n"));
+    LoopReceiveWorkerBusy = FALSE;
 }
 
 VOID LoopSubmitReceiveWork(
@@ -80,19 +84,34 @@
     UINT BytesTransferred) {
     PLAN_WQ_ITEM WQItem;
     PLAN_ADAPTER Adapter = (PLAN_ADAPTER)BindingContext;
+    KIRQL OldIrql;
+
+    TcpipAcquireSpinLock( &LoopWorkLock, &OldIrql );
 
     WQItem = ExAllocatePool( NonPagedPool, sizeof(LAN_WQ_ITEM) );
-    if( !WQItem ) return;
+    if( !WQItem ) {
+	TcpipReleaseSpinLock( &LoopWorkLock, OldIrql );
+	return;
+    }
 
     WQItem->Packet = Packet;
     WQItem->Adapter = Adapter;
     WQItem->BytesTransferred = BytesTransferred;
-    ExInterlockedInsertTailList( &LoopWorkList, &WQItem->ListEntry, &LoopWorkLock );
+    InsertTailList( &LoopWorkList, &WQItem->ListEntry );
 
     TI_DbgPrint(DEBUG_DATALINK, ("Packet %x Adapter %x BytesTrans %x\n",
                                  Packet, Adapter, BytesTransferred));
 
-    ExQueueWorkItem( &LoopWorkItem, CriticalWorkQueue );
+    if( !LoopReceiveWorkerBusy ) {
+	LoopReceiveWorkerBusy = TRUE;
+	ExQueueWorkItem( &LoopWorkItem, CriticalWorkQueue );
+	TI_DbgPrint(DEBUG_DATALINK,
+		    ("Work item inserted %x %x\n", &LoopWorkItem, WQItem));
+    } else {
+        TI_DbgPrint(DEBUG_DATALINK,
+                    ("LOOP WORKER BUSY %x %x\n", &LoopWorkItem, WQItem));
+    }
+    TcpipReleaseSpinLock( &LoopWorkLock, OldIrql );
 }
 
 VOID LoopTransmit(