mirror of
https://github.com/reactos/reactos.git
synced 2024-10-02 15:34:13 +00:00
[NDIS]
- Fix a critical bug in NdisMGetDmaAlignment which was causing every NIC driver calling this function to crash because we thought we were passed an NDIS_DMA_BLOCK handle when in fact we receive an NDIS_MINIPORT_BLOCK handle - Fixes RTL8169 and 3Com NICs (and probably several more) [bug 6651 and bug 4330] svn path=/trunk/; revision=54372
This commit is contained in:
parent
edc6eb9eca
commit
6735cfc56e
|
@ -831,6 +831,7 @@ EXPORT
|
||||||
NdisMReadDmaCounter(
|
NdisMReadDmaCounter(
|
||||||
IN NDIS_HANDLE MiniportDmaHandle)
|
IN NDIS_HANDLE MiniportDmaHandle)
|
||||||
{
|
{
|
||||||
|
/* NOTE: Unlike NdisMGetDmaAlignment() below, this is a handle to the DMA block */
|
||||||
PNDIS_DMA_BLOCK DmaBlock = MiniportDmaHandle;
|
PNDIS_DMA_BLOCK DmaBlock = MiniportDmaHandle;
|
||||||
PDMA_ADAPTER AdapterObject = (PDMA_ADAPTER)DmaBlock->SystemAdapterObject;
|
PDMA_ADAPTER AdapterObject = (PDMA_ADAPTER)DmaBlock->SystemAdapterObject;
|
||||||
|
|
||||||
|
@ -846,10 +847,11 @@ NdisMReadDmaCounter(
|
||||||
ULONG
|
ULONG
|
||||||
EXPORT
|
EXPORT
|
||||||
NdisMGetDmaAlignment(
|
NdisMGetDmaAlignment(
|
||||||
IN NDIS_HANDLE MiniportDmaHandle)
|
IN NDIS_HANDLE MiniportAdapterHandle)
|
||||||
{
|
{
|
||||||
PNDIS_DMA_BLOCK DmaBlock = MiniportDmaHandle;
|
/* NOTE: Unlike NdisMReadDmaCounter() above, this is a handle to the NDIS miniport block */
|
||||||
PDMA_ADAPTER AdapterObject = (PDMA_ADAPTER)DmaBlock->SystemAdapterObject;
|
PLOGICAL_ADAPTER Adapter = MiniportAdapterHandle;
|
||||||
|
PDMA_ADAPTER AdapterObject = (PDMA_ADAPTER)Adapter->NdisMiniportBlock.SystemAdapterObject;
|
||||||
|
|
||||||
NDIS_DbgPrint(MAX_TRACE, ("Called.\n"));
|
NDIS_DbgPrint(MAX_TRACE, ("Called.\n"));
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue