[ros-diffs] [cgutman] 36595: - Merge aicom-network-fixes up to r36594

Author: cgutman
Date: Mon Sep 29 19:17:48 2008
New Revision: 36595

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

Modified:
    trunk/reactos/drivers/network/dd/pcnet/requests.c
    trunk/reactos/drivers/network/ndis/ndis/config.c
    trunk/reactos/drivers/network/ndis/ndis/miniport.c
    trunk/reactos/drivers/network/ndis/ndis/protocol.c

Modified: trunk/reactos/drivers/network/dd/pcnet/requests.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/pcnet/r…
==============================================================================
--- trunk/reactos/drivers/network/dd/pcnet/requests.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/dd/pcnet/requests.c [iso-8859-1] Mon Sep 29 19:17:48
2008
@@ -263,7 +263,8 @@
         {
           GenericULONG = NDIS_MAC_OPTION_COPY_LOOKAHEAD_DATA |
                          NDIS_MAC_OPTION_RECEIVE_SERIALIZED  |
-                         NDIS_MAC_OPTION_TRANSFERS_NOT_PEND;
+                         NDIS_MAC_OPTION_TRANSFERS_NOT_PEND  |
+                         NDIS_MAC_OPTION_NO_LOOPBACK;
           break;
         }
 

Modified: trunk/reactos/drivers/network/ndis/ndis/config.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/…
==============================================================================
--- trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] Mon Sep 29 19:17:48
2008
@@ -479,6 +479,15 @@
         return;
     }
 
+    MiniportResource = ExAllocatePool(PagedPool, sizeof(MINIPORT_RESOURCE));
+    if(!MiniportResource)
+    {
+       NDIS_DbgPrint(MIN_TRACE,("Insufficient resources.\n"));
+       ExFreePool(KeyInformation);
+       *Status = NDIS_STATUS_RESOURCES;
+       return;
+    }
+
     switch(ParameterType)
     {
         case NdisParameterInteger:
@@ -516,8 +525,15 @@
                 ExFreePool(*ParameterValue);
                 *ParameterValue = NULL;
                 *Status = NDIS_STATUS_FAILURE;
-            } else
-                *Status = NDIS_STATUS_SUCCESS;
+                return;
+            }
+
+            MiniportResource->ResourceType = 0;
+            MiniportResource->Resource = *ParameterValue;
+            NDIS_DbgPrint(MID_TRACE,("inserting 0x%x into the resource list\n",
MiniportResource->Resource));
+            ExInterlockedInsertTailList(&ConfigurationContext->ResourceListHead,
&MiniportResource->ListEntry, &ConfigurationContext->ResourceLock);
+
+            *Status = NDIS_STATUS_SUCCESS;
 
             return;
         }
@@ -556,18 +572,6 @@
                 return;
             }
 
-            MiniportResource = ExAllocatePool(PagedPool, sizeof(MINIPORT_RESOURCE));
-            if(!MiniportResource)
-            {
-                NDIS_DbgPrint(MIN_TRACE,("Insufficient resources.\n"));
-                ExFreePool(RegData);
-                ExFreePool(KeyInformation);
-                ExFreePool(*ParameterValue);
-                *ParameterValue = NULL;
-                *Status = NDIS_STATUS_RESOURCES;
-                return;
-            }
-
             MiniportResource->ResourceType = 0;
             MiniportResource->Resource = *ParameterValue;
             NDIS_DbgPrint(MID_TRACE,("inserting 0x%x into the resource list\n",
MiniportResource->Resource));
@@ -601,17 +605,6 @@
             {
                 NDIS_DbgPrint(MIN_TRACE,("Insufficient resources.\n"));
                 ExFreePool(KeyInformation);
-                *Status = NDIS_STATUS_RESOURCES;
-                return;
-            }
-
-            MiniportResource = ExAllocatePool(PagedPool, sizeof(MINIPORT_RESOURCE));
-            if(!MiniportResource)
-            {
-                NDIS_DbgPrint(MIN_TRACE,("Insufficient resources.\n"));
-                ExFreePool(KeyInformation);
-                ExFreePool(*ParameterValue);
-                *ParameterValue = NULL;
                 *Status = NDIS_STATUS_RESOURCES;
                 return;
             }

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] Mon Sep 29 19:17:48
2008
@@ -1636,7 +1636,7 @@
       NDIS_DbgPrint(MIN_TRACE, ("MiniportInitialize() failed for an
adapter.\n"));
       ExInterlockedRemoveEntryList( &Adapter->ListEntry, &AdapterListLock );
       if (NdisStatus == NDIS_STATUS_SUCCESS) NdisStatus = NDIS_STATUS_FAILURE;
-      return (NTSTATUS)NdisStatus;
+      return NdisStatus;
     }
 
   Adapter->NdisMiniportBlock.MediaType = MediaArray[SelectedMediumIndex];
@@ -1669,7 +1669,7 @@
         return STATUS_UNSUCCESSFUL;
     }
 
-  if (!Success || NdisStatus != NDIS_STATUS_SUCCESS)
+  if (NdisStatus != NDIS_STATUS_SUCCESS)
     {
       NDIS_DbgPrint(MAX_TRACE, ("couldn't create filter (%x)\n",
NdisStatus));
       if (Adapter->LookaheadBuffer)
@@ -1678,8 +1678,7 @@
           Adapter->LookaheadBuffer = NULL;
         }
       ExInterlockedRemoveEntryList( &Adapter->ListEntry, &AdapterListLock );
-      if (NdisStatus == NDIS_STATUS_SUCCESS) NdisStatus = NDIS_STATUS_FAILURE;
-      return (NTSTATUS)NdisStatus;
+      return NdisStatus;
     }
 
   /* Check for a hang every two seconds if it wasn't set in MiniportInitialize */

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] Mon Sep 29 19:17:48
2008
@@ -77,15 +77,13 @@
 
   NdisQueryPacket(Packet, NULL, NULL, NULL, &PacketLength);
 
-  KeRaiseIrql(DISPATCH_LEVEL, &OldIrql);
-
   NDIS_DbgPrint(MAX_TRACE, ("acquiring miniport block lock\n"));
-  KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock);
+  KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql);
     {
       Adapter->NdisMiniportBlock.IndicatedPacket[KeGetCurrentProcessorNumber()] =
Packet;
       BufferedLength = CopyPacketToBuffer(Adapter->LookaheadBuffer, Packet, 0,
Adapter->NdisMiniportBlock.CurrentLookahead);
     }
-  KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock);
+  KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql);
 
   if (BufferedLength > Adapter->MediumHeaderSize)
     {
@@ -100,13 +98,11 @@
     }
 
   NDIS_DbgPrint(MAX_TRACE, ("acquiring miniport block lock\n"));
-  KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock);
+  KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql);
     {
       Adapter->NdisMiniportBlock.IndicatedPacket[KeGetCurrentProcessorNumber()] =
NULL;
     }
-  KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock);
-
-  KeLowerIrql(OldIrql);
+  KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql);
 
   return STATUS_SUCCESS;
 }
@@ -178,19 +174,17 @@
  *     MacBindingHandle = Adapter binding handle
  *     Packet           = Pointer to NDIS packet descriptor
  * RETURNS:
- *     NDIS_STATUS_SUCCESS always
+ *     NDIS_STATUS_SUCCESS if the packet was successfully sent
+ *     NDIS_STATUS_PENDING if the miniport was busy or a serialized miniport returned
NDIS_STATUS_RESOURCES
  * NOTES:
  * TODO:
- *     - Fix return values
- *     - Should queue packet if miniport returns NDIS_STATUS_RESOURCES
- *     - Queue packets directly on the adapters when possible (i.e.
- *       when miniports not busy)
  *     - Break this up
  */
 {
-  KIRQL SpinOldIrql;
+  KIRQL SpinOldIrql, RaiseOldIrql;
   PADAPTER_BINDING AdapterBinding;
   PLOGICAL_ADAPTER Adapter;
+  NDIS_STATUS NdisStatus;
 
   NDIS_DbgPrint(MAX_TRACE, ("Called.\n"));
 
@@ -207,9 +201,6 @@
 
   /* XXX what is this crazy black magic? */
   Packet->Reserved[0] = (ULONG_PTR)MacBindingHandle;
-
-  NDIS_DbgPrint(MAX_TRACE, ("acquiring miniport block lock\n"));
-  KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &SpinOldIrql);
 
   /*
    * Test the packet to see if it is a MAC loopback.
@@ -218,23 +209,80 @@
    * If dest MAC address of packet == MAC address of adapter,
    * this is a loopback frame.
    */
+
+  KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &SpinOldIrql);
+
   if ((Adapter->NdisMiniportBlock.MacOptions & NDIS_MAC_OPTION_NO_LOOPBACK)
&&
       MiniAdapterHasAddress(Adapter, Packet))
     {
-      NDIS_DbgPrint(MIN_TRACE, ("Queuing packet.\n"));
+      NDIS_DbgPrint(MID_TRACE, ("Queuing packet.\n"));
 
       MiniQueueWorkItem(Adapter, NdisWorkItemSendLoopback, (PVOID)Packet);
       KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, SpinOldIrql);
       return NDIS_STATUS_PENDING;
-    }
-  else
-    NDIS_DbgPrint(MID_TRACE,("Not a loopback packet\n"));
-
-  /* This is a normal send packet, not a loopback packet. */
-  MiniQueueWorkItem(Adapter, NdisWorkItemSend, (PVOID)Packet);
-  KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, SpinOldIrql);
-  NDIS_DbgPrint(MAX_TRACE, ("Queued a work item and returning\n"));
-  return NDIS_STATUS_PENDING;
+    } else {
+        if(Adapter->MiniportBusy) {
+           MiniQueueWorkItem(Adapter, NdisWorkItemSend, (PVOID)Packet);
+           KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, SpinOldIrql);
+           return NDIS_STATUS_PENDING;
+        }
+
+        KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, SpinOldIrql);
+
+       
if(Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendPacketsHandler)
+        {
+           if(Adapter->NdisMiniportBlock.Flags & NDIS_ATTRIBUTE_DESERIALIZE)
+           {
+               NDIS_DbgPrint(MAX_TRACE, ("Calling miniport's SendPackets
handler\n"));
+              
(*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendPacketsHandler)(
+                Adapter->NdisMiniportBlock.MiniportAdapterContext, &Packet, 1);
+                NdisStatus = NDIS_GET_PACKET_STATUS(Packet);
+           } else {
+               /* SendPackets is called at DISPATCH_LEVEL for all serialized miniports
*/
+               KeRaiseIrql(DISPATCH_LEVEL, &RaiseOldIrql);
+               {
+                  NDIS_DbgPrint(MAX_TRACE, ("Calling miniport's SendPackets
handler\n"));
+                 
(*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendPacketsHandler)(
+                   Adapter->NdisMiniportBlock.MiniportAdapterContext, &Packet,
1);
+               }
+               KeLowerIrql(RaiseOldIrql);
+
+               NdisStatus = NDIS_GET_PACKET_STATUS(Packet);
+               if( NdisStatus == NDIS_STATUS_RESOURCES ) {
+                   KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock,
&SpinOldIrql);
+                   MiniQueueWorkItem(Adapter, NdisWorkItemSend, Packet);
+                   KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock,
SpinOldIrql);
+                   NdisStatus = NDIS_STATUS_PENDING;
+               }
+           }
+
+           return NdisStatus;
+         } else {
+           if(Adapter->NdisMiniportBlock.Flags & NDIS_ATTRIBUTE_DESERIALIZE)
+           {
+              NDIS_DbgPrint(MAX_TRACE, ("Calling miniport's Send
handler\n"));
+              NdisStatus =
(*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendHandler)(
+                            Adapter->NdisMiniportBlock.MiniportAdapterContext, Packet,
0);
+              NDIS_DbgPrint(MAX_TRACE, ("back from miniport's send
handler\n"));
+           } else {
+              /* Send is called at DISPATCH_LEVEL for all serialized miniports */
+              KeRaiseIrql(DISPATCH_LEVEL, &RaiseOldIrql);
+              NDIS_DbgPrint(MAX_TRACE, ("Calling miniport's Send
handler\n"));
+              NdisStatus =
(*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendHandler)(
+                            Adapter->NdisMiniportBlock.MiniportAdapterContext, Packet,
0);
+              NDIS_DbgPrint(MAX_TRACE, ("back from miniport's send
handler\n"));
+              KeLowerIrql(RaiseOldIrql);
+              if( NdisStatus == NDIS_STATUS_RESOURCES ) {
+                  KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock,
&SpinOldIrql);
+                  MiniQueueWorkItem(Adapter, NdisWorkItemSend, Packet);
+                  KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock,
SpinOldIrql);
+                  NdisStatus = NDIS_STATUS_PENDING;
+              }
+           }
+
+           return NdisStatus;
+         }
+     }
 }