- Merge aicom-network-fixes up to r36803

svn path=/trunk/; revision=36804
This commit is contained in:
Cameron Gutman 2008-10-18 04:32:30 +00:00
parent fc86d60e95
commit 36f0316d51
2 changed files with 5 additions and 13 deletions

View file

@ -964,7 +964,6 @@ BOOLEAN BindAdapter(
IP_ADDRESS DefaultMask = { 0 };
ULONG Lookahead = LOOKAHEAD_SIZE;
NTSTATUS Status;
HANDLE RegHandle = 0;
TI_DbgPrint(DEBUG_DATALINK, ("Called.\n"));
@ -1007,16 +1006,10 @@ BOOLEAN BindAdapter(
GetName( RegistryPath, &IF->Name );
Status = OpenRegistryKey( RegistryPath, &RegHandle );
Status = FindDeviceDescForAdapter( &IF->Name, &IF->Description );
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;
}
TI_DbgPrint(DEBUG_DATALINK,("Adapter Description: %wZ\n",
&IF->Description));
DefaultMask.Type = IP_ADDRESS_V4;

View file

@ -50,13 +50,12 @@ VOID TcpipRecursiveMutexInit( PRECURSIVE_MUTEX RecMutex ) {
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 );
}