[ros-diffs] [cgutman] 36804: - Merge aicom-network-fixes up to r36803

[cgutman at svn.reactos.org]

Author: cgutman
Date: Fri Oct 17 23:32:30 2008
New Revision: 36804

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

Removed:
    trunk/reactos/drivers/network/tcpip/transport/
Modified:
    trunk/reactos/drivers/network/tcpip/datalink/lan.c
    trunk/reactos/drivers/network/tcpip/tcpip/lock.c

Modified: trunk/reactos/drivers/network/tcpip/datalink/lan.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/datalink/lan.c?rev=36804&r1=36803&r2=36804&view=diff
==============================================================================
--- trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] Fri Oct 17 23:32:30 2008
@@ -964,7 +964,6 @@
     IP_ADDRESS DefaultMask = { 0 };
     ULONG Lookahead = LOOKAHEAD_SIZE;
     NTSTATUS Status;
-    HANDLE RegHandle = 0;
 
     TI_DbgPrint(DEBUG_DATALINK, ("Called.\n"));
 
@@ -1007,16 +1006,10 @@
 
     GetName( RegistryPath, &IF->Name );
 
-    Status = OpenRegistryKey( RegistryPath, &RegHandle );
-
-    if(NT_SUCCESS(Status)) {
-	Status = FindDeviceDescForAdapter( &IF->Name, &IF->Description );
-        TI_DbgPrint(DEBUG_DATALINK,("Adapter Description: %wZ\n",
-                    &IF->Description));
-    } else {
-	IPDestroyInterface( IF );
-	return FALSE;
-    }
+    Status = FindDeviceDescForAdapter( &IF->Name, &IF->Description );
+
+    TI_DbgPrint(DEBUG_DATALINK,("Adapter Description: %wZ\n",
+                &IF->Description));
 
     DefaultMask.Type = IP_ADDRESS_V4;
 

Modified: trunk/reactos/drivers/network/tcpip/tcpip/lock.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpip/lock.c?rev=36804&r1=36803&r2=36804&view=diff
==============================================================================
--- trunk/reactos/drivers/network/tcpip/tcpip/lock.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/tcpip/tcpip/lock.c [iso-8859-1] Fri Oct 17 23:32:30 2008
@@ -50,13 +50,12 @@
 
 UINT TcpipRecursiveMutexEnter( PRECURSIVE_MUTEX RecMutex, BOOL ToWrite ) {
     UINT Ret;
-    TI_DbgPrint(DEBUG_LOCK,("Locking\n"));
+    //TI_DbgPrint(DEBUG_LOCK,("Locking\n"));
     Ret = RecursiveMutexEnter( RecMutex, ToWrite );
-    TI_DbgPrint(DEBUG_LOCK,("Locked\n"));
     return Ret;
 }
 
 VOID TcpipRecursiveMutexLeave( PRECURSIVE_MUTEX RecMutex ) {
-    TI_DbgPrint(DEBUG_LOCK,("Unlocking\n"));
+    //TI_DbgPrint(DEBUG_LOCK,("Unlocking\n"));
     RecursiveMutexLeave( RecMutex );
 }