- Add a missing spin lock release in a failure case
- Fix incomplete copying of NDIS 5.1 miniport characteristics

svn path=/trunk/; revision=49961
This commit is contained in:
Cameron Gutman 2010-12-06 04:39:57 +00:00
parent 5f879a1245
commit 3e169e3cb2

View file

@ -316,6 +316,7 @@ MiniIndicateReceivePacket(
if (!LookAheadBuffer)
{
NDIS_DbgPrint(MIN_TRACE, ("Failed to allocate lookahead buffer!\n"));
KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql);
return;
}
@ -2454,7 +2455,20 @@ NdisMRegisterMiniport(
break;
case 0x05:
MinSize = sizeof(NDIS50_MINIPORT_CHARACTERISTICS);
switch (MiniportCharacteristics->MinorNdisVersion)
{
case 0x00:
MinSize = sizeof(NDIS50_MINIPORT_CHARACTERISTICS);
break;
case 0x01:
MinSize = sizeof(NDIS51_MINIPORT_CHARACTERISTICS);
break;
default:
NDIS_DbgPrint(MIN_TRACE, ("Bad 5.x minor characteristics version.\n"));
return NDIS_STATUS_BAD_VERSION;
}
break;
default:
@ -2532,8 +2546,6 @@ NdisMRegisterMiniport(
}
}
/* TODO: verify NDIS5 and NDIS5.1 */
RtlCopyMemory(&Miniport->MiniportCharacteristics, MiniportCharacteristics, MinSize);
/*