From fc12d8ead4a90f9314f64eb24018334dcac63a01 Mon Sep 17 00:00:00 2001 From: Thomas Faber Date: Tue, 24 Apr 2012 07:27:59 +0000 Subject: [PATCH] [AFD] - Fix broken IP address pointer arithmetic (CID 14130) [PCNET] - Fix incorrectly truncated FullDuplex BOOLEAN svn path=/trunk/; revision=56404 --- reactos/drivers/network/afd/afd/tdi.c | 4 +--- reactos/drivers/network/dd/pcnet/pcnet.c | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/reactos/drivers/network/afd/afd/tdi.c b/reactos/drivers/network/afd/afd/tdi.c index 88dadfe5ba7..bbc80096dc8 100644 --- a/reactos/drivers/network/afd/afd/tdi.c +++ b/reactos/drivers/network/afd/afd/tdi.c @@ -848,9 +848,7 @@ NTSTATUS TdiQueryAddress( if (SnmpInfo.NumAddr != 1) { /* Skip loopback address */ - PIPADDR_ENTRY IpAddressEntry = (PIPADDR_ENTRY) - ((PCHAR)IpAddress) + sizeof(IPADDR_ENTRY); - *Address = DN2H(IpAddressEntry->Addr); + *Address = DN2H(IpAddress[1].Addr); } else { /* Select the first address returned */ *Address = DN2H(IpAddress->Addr); diff --git a/reactos/drivers/network/dd/pcnet/pcnet.c b/reactos/drivers/network/dd/pcnet/pcnet.c index 457794fdadd..f7e69df95fc 100644 --- a/reactos/drivers/network/dd/pcnet/pcnet.c +++ b/reactos/drivers/network/dd/pcnet/pcnet.c @@ -1286,7 +1286,7 @@ MiGetMediaDuplex(PADAPTER Adapter) NdisRawWritePortUshort(Adapter->PortOffset + RAP, BCR5); NdisRawReadPortUshort(Adapter->PortOffset + BDP, &Data); - return Data & BCR5_LEDOUT; + return (Data & BCR5_LEDOUT) != 0; } UINT