Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-20 07:36:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Remove some incorrect IRQL checks (needed for the NDIS fixes coming soon)

Browse source 
- Change some NdisDprAcquireSpinLock/NdisDprReleaseSpinLock calls to NdisAcquireSpinLock/NdisReleaseSpinLock

svn path=/branches/aicom-network-branch/; revision=45007
This commit is contained in:
Cameron Gutman 2010-01-08 18:36:59 +00:00
parent 7457359d5d
commit e7f721b01f
3 changed files with 4 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

8
drivers/network/dd/ne2000/ne2000/main.c
View file

@ -501,8 +501,6 @@ static NDIS_STATUS NTAPI MiniportQueryInformation(
NDIS_MEDIUM Medium = NdisMedium802_3; NDIS_MEDIUM Medium = NdisMedium802_3;
PNIC_ADAPTER Adapter = (PNIC_ADAPTER)MiniportAdapterContext; PNIC_ADAPTER Adapter = (PNIC_ADAPTER)MiniportAdapterContext;
ASSERT_IRQL_EQUAL(DISPATCH_LEVEL);
NDIS_DbgPrint(MAX_TRACE, ("Called. Oid (0x%X).\n", Oid)); NDIS_DbgPrint(MAX_TRACE, ("Called. Oid (0x%X).\n", Oid));
Status = NDIS_STATUS_SUCCESS; Status = NDIS_STATUS_SUCCESS;
@ -671,8 +669,6 @@ static NDIS_STATUS NTAPI MiniportReset(
{ {
NDIS_STATUS NdisStatus = NDIS_STATUS_SUCCESS; NDIS_STATUS NdisStatus = NDIS_STATUS_SUCCESS;
ASSERT_IRQL_EQUAL(DISPATCH_LEVEL);
NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); NDIS_DbgPrint(MAX_TRACE, ("Called.\n"));
#ifndef NOCARD #ifndef NOCARD
@ -752,8 +748,6 @@ static NDIS_STATUS NTAPI MiniportSetInformation(
NDIS_STATUS Status = NDIS_STATUS_SUCCESS; NDIS_STATUS Status = NDIS_STATUS_SUCCESS;
PNIC_ADAPTER Adapter = (PNIC_ADAPTER)MiniportAdapterContext; PNIC_ADAPTER Adapter = (PNIC_ADAPTER)MiniportAdapterContext;
ASSERT_IRQL_EQUAL(DISPATCH_LEVEL);
NDIS_DbgPrint(MAX_TRACE, ("Called. Oid (0x%X).\n", Oid)); NDIS_DbgPrint(MAX_TRACE, ("Called. Oid (0x%X).\n", Oid));
switch (Oid) { switch (Oid) {
@ -863,8 +857,6 @@ static NDIS_STATUS NTAPI MiniportTransferData(
UINT RecvStop; UINT RecvStop;
PNIC_ADAPTER Adapter = (PNIC_ADAPTER)MiniportAdapterContext; 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", NDIS_DbgPrint(MAX_TRACE, ("Called. Packet (0x%X) ByteOffset (0x%X) BytesToTransfer (%d).\n",
Packet, ByteOffset, BytesToTransfer)); Packet, ByteOffset, BytesToTransfer));

2
drivers/network/dd/pcnet/pcnet.c
View file

@ -1101,8 +1101,6 @@ MiniportReset(
{ {
DPRINT("Called\n"); DPRINT("Called\n");
ASSERT_IRQL_EQUAL(PASSIVE_LEVEL);
/* MiniportReset doesn't do anything at the moment... perhaps this should be fixed. */ /* MiniportReset doesn't do anything at the moment... perhaps this should be fixed. */
*AddressingReset = FALSE; *AddressingReset = FALSE;

12
drivers/network/dd/pcnet/requests.c
View file

@ -118,11 +118,9 @@ MiniportQueryInformation(
DPRINT("Called. OID 0x%x\n", Oid); DPRINT("Called. OID 0x%x\n", Oid);
ASSERT_IRQL_EQUAL(DISPATCH_LEVEL);
ASSERT(Adapter); ASSERT(Adapter);
NdisDprAcquireSpinLock(&Adapter->Lock); NdisAcquireSpinLock(&Adapter->Lock);
Status = NDIS_STATUS_SUCCESS; Status = NDIS_STATUS_SUCCESS;
CopyFrom = (PVOID)&GenericULONG; CopyFrom = (PVOID)&GenericULONG;
@ -369,7 +367,7 @@ MiniportQueryInformation(
*BytesNeeded = 0; *BytesNeeded = 0;
} }
NdisDprReleaseSpinLock(&Adapter->Lock); NdisReleaseSpinLock(&Adapter->Lock);
DPRINT("Leaving. Status is 0x%x\n", Status); DPRINT("Leaving. Status is 0x%x\n", Status);
@ -408,11 +406,9 @@ MiniportSetInformation(
ASSERT(Adapter); ASSERT(Adapter);
ASSERT_IRQL_EQUAL(DISPATCH_LEVEL);
DPRINT("Called, OID 0x%x\n", Oid); DPRINT("Called, OID 0x%x\n", Oid);
NdisDprAcquireSpinLock(&Adapter->Lock); NdisAcquireSpinLock(&Adapter->Lock);
switch (Oid) switch (Oid)
{ {
@ -511,7 +507,7 @@ MiniportSetInformation(
*BytesNeeded = 0; *BytesNeeded = 0;
} }
NdisDprReleaseSpinLock(&Adapter->Lock); NdisReleaseSpinLock(&Adapter->Lock);
DPRINT("Leaving. Status (0x%X).\n", Status); DPRINT("Leaving. Status (0x%X).\n", Status);