From e7f721b01fe63f37e9c110a0bcfea438059040fe Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Fri, 8 Jan 2010 18:36:59 +0000 Subject: [PATCH] - Remove some incorrect IRQL checks (needed for the NDIS fixes coming soon) - Change some NdisDprAcquireSpinLock/NdisDprReleaseSpinLock calls to NdisAcquireSpinLock/NdisReleaseSpinLock svn path=/branches/aicom-network-branch/; revision=45007 --- drivers/network/dd/ne2000/ne2000/main.c | 8 -------- drivers/network/dd/pcnet/pcnet.c | 2 -- drivers/network/dd/pcnet/requests.c | 12 ++++-------- 3 files changed, 4 insertions(+), 18 deletions(-) diff --git a/drivers/network/dd/ne2000/ne2000/main.c b/drivers/network/dd/ne2000/ne2000/main.c index 6ecd7bd50d9..626b5763d99 100644 --- a/drivers/network/dd/ne2000/ne2000/main.c +++ b/drivers/network/dd/ne2000/ne2000/main.c @@ -501,8 +501,6 @@ static NDIS_STATUS NTAPI MiniportQueryInformation( NDIS_MEDIUM Medium = NdisMedium802_3; PNIC_ADAPTER Adapter = (PNIC_ADAPTER)MiniportAdapterContext; - ASSERT_IRQL_EQUAL(DISPATCH_LEVEL); - NDIS_DbgPrint(MAX_TRACE, ("Called. Oid (0x%X).\n", Oid)); Status = NDIS_STATUS_SUCCESS; @@ -671,8 +669,6 @@ static NDIS_STATUS NTAPI MiniportReset( { NDIS_STATUS NdisStatus = NDIS_STATUS_SUCCESS; - ASSERT_IRQL_EQUAL(DISPATCH_LEVEL); - NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); #ifndef NOCARD @@ -752,8 +748,6 @@ static NDIS_STATUS NTAPI MiniportSetInformation( NDIS_STATUS Status = NDIS_STATUS_SUCCESS; PNIC_ADAPTER Adapter = (PNIC_ADAPTER)MiniportAdapterContext; - ASSERT_IRQL_EQUAL(DISPATCH_LEVEL); - NDIS_DbgPrint(MAX_TRACE, ("Called. Oid (0x%X).\n", Oid)); switch (Oid) { @@ -863,8 +857,6 @@ static NDIS_STATUS NTAPI MiniportTransferData( UINT RecvStop; PNIC_ADAPTER Adapter = (PNIC_ADAPTER)MiniportAdapterContext; - ASSERT_IRQL_EQUAL(DISPATCH_LEVEL); - NDIS_DbgPrint(MAX_TRACE, ("Called. Packet (0x%X) ByteOffset (0x%X) BytesToTransfer (%d).\n", Packet, ByteOffset, BytesToTransfer)); diff --git a/drivers/network/dd/pcnet/pcnet.c b/drivers/network/dd/pcnet/pcnet.c index 25965af2072..6aca85bbbf2 100644 --- a/drivers/network/dd/pcnet/pcnet.c +++ b/drivers/network/dd/pcnet/pcnet.c @@ -1101,8 +1101,6 @@ MiniportReset( { DPRINT("Called\n"); - ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); - /* MiniportReset doesn't do anything at the moment... perhaps this should be fixed. */ *AddressingReset = FALSE; diff --git a/drivers/network/dd/pcnet/requests.c b/drivers/network/dd/pcnet/requests.c index a85e9684165..43ad68f0518 100644 --- a/drivers/network/dd/pcnet/requests.c +++ b/drivers/network/dd/pcnet/requests.c @@ -118,11 +118,9 @@ MiniportQueryInformation( DPRINT("Called. OID 0x%x\n", Oid); - ASSERT_IRQL_EQUAL(DISPATCH_LEVEL); - ASSERT(Adapter); - NdisDprAcquireSpinLock(&Adapter->Lock); + NdisAcquireSpinLock(&Adapter->Lock); Status = NDIS_STATUS_SUCCESS; CopyFrom = (PVOID)&GenericULONG; @@ -369,7 +367,7 @@ MiniportQueryInformation( *BytesNeeded = 0; } - NdisDprReleaseSpinLock(&Adapter->Lock); + NdisReleaseSpinLock(&Adapter->Lock); DPRINT("Leaving. Status is 0x%x\n", Status); @@ -408,11 +406,9 @@ MiniportSetInformation( ASSERT(Adapter); - ASSERT_IRQL_EQUAL(DISPATCH_LEVEL); - DPRINT("Called, OID 0x%x\n", Oid); - NdisDprAcquireSpinLock(&Adapter->Lock); + NdisAcquireSpinLock(&Adapter->Lock); switch (Oid) { @@ -511,7 +507,7 @@ MiniportSetInformation( *BytesNeeded = 0; } - NdisDprReleaseSpinLock(&Adapter->Lock); + NdisReleaseSpinLock(&Adapter->Lock); DPRINT("Leaving. Status (0x%X).\n", Status);